From 8580a2c467e6c843fef500d1f5bd56e46a7c70e0 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 13 Dec 2021 10:44:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E5=8C=96=E5=85=9A?= =?UTF-8?q?=E5=BB=BA=E5=8D=95=E4=BD=8D=E6=BB=A1=E6=84=8F=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/demand/FinishResultDTO.java | 15 ++++++++++++ .../controller/IcUserDemandRecController.java | 19 +++++++++++++-- .../epmet/service/IcUserDemandRecService.java | 3 ++- .../impl/IcUserDemandRecServiceImpl.java | 23 +++++++------------ 4 files changed, 42 insertions(+), 18 deletions(-) create mode 100644 epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/FinishResultDTO.java diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/FinishResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/FinishResultDTO.java new file mode 100644 index 0000000000..96d03b9c2d --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/FinishResultDTO.java @@ -0,0 +1,15 @@ +package com.epmet.dto.result.demand; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 完成需求时，是否需要计算 区域化党建单位的满意度 + * + */ +@Data +public class FinishResultDTO implements Serializable { + private Boolean sendCalStatisfaction; + private String partyUnitId; +} diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java index 9ce587e7b3..0d5567ad63 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java @@ -17,16 +17,21 @@ package com.epmet.controller; +import com.epmet.commons.rocketmq.messages.CalPartyUnitSatisfactionFormDTO; 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.Result; import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.constant.SystemMessageType; import com.epmet.constant.UserDemandConstant; +import com.epmet.dto.form.SystemMsgFormDTO; import com.epmet.dto.form.demand.*; import com.epmet.dto.result.demand.DemandRecResultDTO; +import com.epmet.dto.result.demand.FinishResultDTO; import com.epmet.dto.result.demand.IcResiUserReportDemandRes; import com.epmet.dto.result.demand.OptionDTO; +import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.service.*; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -59,7 +64,8 @@ public class IcUserDemandRecController { private IcCommunitySelfOrganizationService icCommunitySelfOrganizationService; @Autowired private IcPartyUnitService icPartyUnitService; - + @Autowired + private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient; /** * 根据服务方类型查询 下拉框 @@ -178,7 +184,16 @@ public class IcUserDemandRecController { formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setUserId(tokenDto.getUserId()); ValidatorUtils.validateEntity(formDTO,FinishStaffFromDTO.AddUserShowGroup.class,FinishStaffFromDTO.AddUserInternalGroup.class); - icUserDemandRecService.finish(formDTO); + FinishResultDTO finishResultDTO=icUserDemandRecService.finish(formDTO); + if(finishResultDTO.getSendCalStatisfaction()){ + CalPartyUnitSatisfactionFormDTO mqMsg = new CalPartyUnitSatisfactionFormDTO(); + mqMsg.setCustomerId(formDTO.getCustomerId()); + mqMsg.setPartyUnitId(finishResultDTO.getPartyUnitId()); + SystemMsgFormDTO form = new SystemMsgFormDTO(); + form.setMessageType(SystemMessageType.CAL_PARTY_UNIT_SATISFACTION); + form.setContent(mqMsg); + epmetMessageOpenFeignClient.sendSystemMsgByMQ(form); + } return new Result(); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java index 0ed62b84be..87ffcaa67f 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java @@ -22,6 +22,7 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.dto.IcUserDemandRecDTO; import com.epmet.dto.form.demand.*; import com.epmet.dto.result.demand.DemandRecResultDTO; +import com.epmet.dto.result.demand.FinishResultDTO; import com.epmet.dto.result.demand.IcResiUserReportDemandRes; import com.epmet.dto.result.demand.ServiceStatDTO; import com.epmet.entity.IcUserDemandRecEntity; @@ -128,7 +129,7 @@ public interface IcUserDemandRecService extends BaseService page(Map params) { @@ -414,7 +410,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl Date: Mon, 13 Dec 2021 10:50:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=94=B9=E4=BA=86=E4=B8=AA=E9=A2=9C?= =?UTF-8?q?=E8=89=B2=E5=84=BF=F0=9F=98=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../issue/IssueProjectCategoryDictDTO.java | 2 +- .../issue/IssueProjectCategoryDictEntity.java | 2 +- .../dto/result/CategoryListResultDTO.java | 4 +-- .../result/ResiBuzzLeftPieChartResultDTO.java | 4 +-- .../IssueProjectCategoryDictEntity.java | 2 +- .../db/migration/V0.0.15__add_colour.sql | 30 +++++++++---------- .../src/main/resources/mapper/IssueDao.xml | 4 +-- .../mapper/IssueProjectCategoryDictDao.xml | 2 +- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/issue/IssueProjectCategoryDictDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/issue/IssueProjectCategoryDictDTO.java index d99c772f8b..872dbc96a2 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/issue/IssueProjectCategoryDictDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/issue/IssueProjectCategoryDictDTO.java @@ -116,6 +116,6 @@ public class IssueProjectCategoryDictDTO implements Serializable { /** * 颜色 */ - private String colour; + private String color; } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/issue/IssueProjectCategoryDictEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/issue/IssueProjectCategoryDictEntity.java index a029bb6f00..1c1afbcc08 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/issue/IssueProjectCategoryDictEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/issue/IssueProjectCategoryDictEntity.java @@ -83,6 +83,6 @@ public class IssueProjectCategoryDictEntity extends BaseEpmetEntity { /** * 颜色 */ - private String colour; + private String color; } diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/CategoryListResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/CategoryListResultDTO.java index 8f719ff94c..dea3653428 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/CategoryListResultDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/CategoryListResultDTO.java @@ -30,7 +30,7 @@ public class CategoryListResultDTO implements Serializable { /** * 颜色 */ - private String colour; + private String color; /** * 1级分类长度 @@ -42,6 +42,6 @@ public class CategoryListResultDTO implements Serializable { this.categoryName = ""; this.count = NumConstant.ZERO; this.codeLength = NumConstant.ZERO; - this.colour = ""; + this.color = ""; } } diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzLeftPieChartResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzLeftPieChartResultDTO.java index c55641f333..22ae365945 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzLeftPieChartResultDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ResiBuzzLeftPieChartResultDTO.java @@ -35,12 +35,12 @@ public class ResiBuzzLeftPieChartResultDTO implements Serializable { /** * 颜色 */ - private String colour; + private String color; public ResiBuzzLeftPieChartResultDTO() { this.count = NumConstant.ZERO; this.categoryCode = ""; this.categoryName = ""; - this.colour = ""; + this.color = ""; } } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProjectCategoryDictEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProjectCategoryDictEntity.java index 7481f4f4ed..0a05d29091 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProjectCategoryDictEntity.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProjectCategoryDictEntity.java @@ -86,6 +86,6 @@ public class IssueProjectCategoryDictEntity extends BaseEpmetEntity { /** * 颜色 */ - private String colour; + private String color; } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.15__add_colour.sql b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.15__add_colour.sql index 81473802f7..0ed1ab2b24 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.15__add_colour.sql +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db/migration/V0.0.15__add_colour.sql @@ -1,87 +1,87 @@ -alter table issue_project_category_dict add column `COLOUR` VARCHAR(20) COMMENT '颜色' AFTER `SORT`; +alter table issue_project_category_dict add column `COLOR` VARCHAR(20) COMMENT '颜色' AFTER `SORT`; UPDATE issue_project_category_dict -SET colour = '#ffba00' +SET color = '#ffba00' WHERE DEL_FLAG = '0' AND CATEGORY_TYPE = '1' AND CATEGORY_NAME = '市场监管'; UPDATE issue_project_category_dict -SET colour = '#ffd074' +SET color = '#ffd074' WHERE DEL_FLAG = '0' AND CATEGORY_TYPE = '1' AND CATEGORY_NAME = '卫生计生监督执法'; UPDATE issue_project_category_dict -SET colour = '#42cd05' +SET color = '#42cd05' WHERE DEL_FLAG = '0' AND CATEGORY_TYPE = '1' AND CATEGORY_NAME = '建设管理'; UPDATE issue_project_category_dict -SET colour = '#16d783' +SET color = '#16d783' WHERE DEL_FLAG = '0' AND CATEGORY_TYPE = '1' AND CATEGORY_NAME = '文化执法'; UPDATE issue_project_category_dict -SET colour = '#00e5ed' +SET color = '#00e5ed' WHERE DEL_FLAG = '0' AND CATEGORY_TYPE = '1' AND CATEGORY_NAME = '民政'; UPDATE issue_project_category_dict -SET colour = '#0091ed' +SET color = '#0091ed' WHERE DEL_FLAG = '0' AND CATEGORY_TYPE = '1' AND CATEGORY_NAME = '其他'; UPDATE issue_project_category_dict -SET colour = '#1b51ff' +SET color = '#1b51ff' WHERE DEL_FLAG = '0' AND CATEGORY_TYPE = '1' AND CATEGORY_NAME = '城市管理'; UPDATE issue_project_category_dict -SET colour = '#1641cc' +SET color = '#1641cc' WHERE DEL_FLAG = '0' AND CATEGORY_TYPE = '1' AND CATEGORY_NAME = '公安交通管理'; UPDATE issue_project_category_dict -SET colour = '#2a00ff' +SET color = '#2a00ff' WHERE DEL_FLAG = '0' AND CATEGORY_TYPE = '1' AND CATEGORY_NAME = '消防安全'; UPDATE issue_project_category_dict -SET colour = '#7800ff' +SET color = '#7800ff' WHERE DEL_FLAG = '0' AND CATEGORY_TYPE = '1' AND CATEGORY_NAME = '创卫复审类'; UPDATE issue_project_category_dict -SET colour = '#c600ff' +SET color = '#c600ff' WHERE DEL_FLAG = '0' AND CATEGORY_TYPE = '1' AND CATEGORY_NAME = '环境保护'; UPDATE issue_project_category_dict -SET colour = '#ff00d2' +SET color = '#ff00d2' WHERE DEL_FLAG = '0' AND CATEGORY_TYPE = '1' AND CATEGORY_NAME = '安全监管'; UPDATE issue_project_category_dict -SET colour = '#ff2a00' +SET color = '#ff2a00' WHERE DEL_FLAG = '0' AND CATEGORY_TYPE = '1' AND CATEGORY_NAME = '社会治安综治'; UPDATE issue_project_category_dict -SET colour = '#ff7800' +SET color = '#ff7800' WHERE DEL_FLAG = '0' AND CATEGORY_TYPE = '1' AND CATEGORY_NAME = '食品药品监管'; diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml index 8a81f0ab47..d955db65ef 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml @@ -637,12 +637,12 @@