From 24743f40ef2b66828a06356bbaa450127a8e748b Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Sat, 18 Apr 2020 11:39:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B9=8B=E5=89=8D=E7=9A=84?= =?UTF-8?q?=E7=83=AD=E5=BF=83=E5=B1=85=E6=B0=91=E7=94=B3=E8=AF=B7=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomerStaffGridController.java | 16 +---- .../feign/ResiPartymemberFeignClient.java | 12 ---- .../ResiPartymemberFeignClientFallBack.java | 9 --- .../service/CustomerStaffGridService.java | 12 ---- .../impl/CustomerStaffGridServiceImpl.java | 23 ------- .../form/ResiWarmheartedAuditFormDTO.java | 63 ------------------- .../ResiWarmheartedApplyController.java | 5 -- .../service/ResiWarmheartedApplyService.java | 9 --- .../impl/ResiWarmheartedApplyServiceImpl.java | 36 ----------- 9 files changed, 1 insertion(+), 184 deletions(-) delete mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedAuditFormDTO.java diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java index 752fb2b9fc..0927a6a15f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java @@ -17,19 +17,16 @@ package com.epmet.controller; -import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; -import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.CustomerStaffGridDTO; import com.epmet.excel.CustomerStaffGridExcel; -import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditFormDTO; import com.epmet.service.CustomerStaffGridService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -94,15 +91,4 @@ public class CustomerStaffGridController { ExcelUtils.exportExcelToTarget(response, null, list, CustomerStaffGridExcel.class); } - /** - * @param - * @Author sun - * @Description 政府端-热心居民申请人工审核 - **/ - @PostMapping("manageaudit") - public Result manageAudit(@LoginUser TokenDto tokenDTO, @RequestBody ResiWarmheartedAuditFormDTO formDTO) { - ValidatorUtils.validateEntity(formDTO); - return customerStaffGridService.manageAudit(tokenDTO, formDTO); - } - } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/ResiPartymemberFeignClient.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/ResiPartymemberFeignClient.java index f1e7ef4c9e..221e3270af 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/ResiPartymemberFeignClient.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/ResiPartymemberFeignClient.java @@ -1,11 +1,8 @@ package com.epmet.feign; import com.epmet.commons.tools.constant.ServiceConstant; -import com.epmet.commons.tools.utils.Result; import com.epmet.feign.fallback.ResiPartymemberFeignClientFallBack; -import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditFormDTO; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.PostMapping; /** * @Description 政府端工作人员审核 @@ -13,13 +10,4 @@ import org.springframework.web.bind.annotation.PostMapping; */ @FeignClient(name = ServiceConstant.RESI_PARTYMEMBER_SERVER, fallback = ResiPartymemberFeignClientFallBack.class) public interface ResiPartymemberFeignClient { - - /** - * @Author sun - * @Description 政府端-热心居民申请人工审核 - **/ - @PostMapping(value = "resi/partymember/resiwarmheartedapply/manageaudit") - Result manageAudit(ResiWarmheartedAuditFormDTO formDTO); - - } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/ResiPartymemberFeignClientFallBack.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/ResiPartymemberFeignClientFallBack.java index 90ddb00086..a31d520c39 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/ResiPartymemberFeignClientFallBack.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/ResiPartymemberFeignClientFallBack.java @@ -1,10 +1,6 @@ package com.epmet.feign.fallback; -import com.epmet.commons.tools.constant.ServiceConstant; -import com.epmet.commons.tools.utils.ModuleUtils; -import com.epmet.commons.tools.utils.Result; import com.epmet.feign.ResiPartymemberFeignClient; -import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditFormDTO; import org.springframework.stereotype.Component; /** @@ -13,9 +9,4 @@ import org.springframework.stereotype.Component; */ @Component public class ResiPartymemberFeignClientFallBack implements ResiPartymemberFeignClient { - - @Override - public Result manageAudit(ResiWarmheartedAuditFormDTO formDTO) { - return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "manageAudit", formDTO); - } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffGridService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffGridService.java index 8ddb524092..319d8ee5de 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffGridService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffGridService.java @@ -19,11 +19,8 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.security.dto.TokenDto; -import com.epmet.commons.tools.utils.Result; import com.epmet.dto.CustomerStaffGridDTO; import com.epmet.entity.CustomerStaffGridEntity; -import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditFormDTO; import java.util.List; import java.util.Map; @@ -96,13 +93,4 @@ public interface CustomerStaffGridService extends BaseService - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.resi.partymember.dto.warmhearted.form; - -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; - - -/** - * 政府端-人工审核热心居民申请-配置入参 - * @author sun - */ -@Data -public class ResiWarmheartedAuditFormDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 热心居民申请id - */ - @NotBlank(message = "申请ID不能为空") - private String resiWarmApplyId; - - /** - * 审核状态(0:取消驳回 1:审核通过) - */ - @NotBlank(message = "审核状态不能为空") - private String auditStatus; - - /** - * 驳回理由 - */ - private String refuseReason; - - /** - * 客户Id CUSTOMER.id - */ - @NotBlank(message = "客户ID不能为空") - private String customerId; - - /** - * 用户Id - */ - private String userId; - -} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/controller/ResiWarmheartedApplyController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/controller/ResiWarmheartedApplyController.java index cd81f768d6..5444e4ccca 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/controller/ResiWarmheartedApplyController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/controller/ResiWarmheartedApplyController.java @@ -107,11 +107,6 @@ public class ResiWarmheartedApplyController { return resiWarmheartedApplyService.submit(formDTO); } - @PostMapping("manageaudit") - public Result manageAudit(@RequestBody ResiWarmheartedAuditFormDTO formDTO) { - return resiWarmheartedApplyService.manageAudit(formDTO); - } - /** * 热心居民审核历史列表 * diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/ResiWarmheartedApplyService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/ResiWarmheartedApplyService.java index 94f05bf528..0fba6e16ff 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/ResiWarmheartedApplyService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/ResiWarmheartedApplyService.java @@ -116,15 +116,6 @@ public interface ResiWarmheartedApplyService extends BaseService NumConstant.ZERO && NumConstant.ONE_STR.equals(formDTO.getAuditStatus())) { - //查询需要添加热心居民角色的userId - ResiWarmheartedApplyEntity resiWarmheartedApplyEntity = baseDao.selectById(formDTO.getResiWarmApplyId()); - UserRoleDTO dto = new UserRoleDTO(); - dto.setCustomerId(formDTO.getCustomerId()); - dto.setUserId(resiWarmheartedApplyEntity.getUserId()); - //所属端-居民端 - dto.setApp(AppClientConstant.APP_RESI); - //角色-热心居民 - dto.setRoleKey(EpmetRoleKeyConstant.WARMHEARTED); - //角色表新增网格Id - dto.setGridId(resiWarmheartedApplyEntity.getGridId()); - result = epmetUserFeignClient.saveUserRole(dto); - } - return result; - } - @Override public Result> audited(ResiWarmheartedAuditedFromDTO formDTO) { Result> result = new Result<>();