Merge remote-tracking branch 'origin/dev_ic_data' into dev_ic_data

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;
 
 }

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;
 
 }

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;
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java

@@ -17,15 +17,23 @@
 
 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.ExcelUtils;
 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.*;
+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;
@@ -60,7 +68,8 @@ public class IcUserDemandRecController {
     private IcCommunitySelfOrganizationService icCommunitySelfOrganizationService;
     @Autowired
     private IcPartyUnitService icPartyUnitService;
-
+    @Autowired
+    private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
 
     /**
      * 根据服务方类型查询  下拉框
@@ -179,7 +188,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();
     }
 

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java

@@ -24,6 +24,7 @@ import com.epmet.dto.form.demand.*;
 import com.epmet.dto.result.demand.CategoryAnalysisResDTO;
 import com.epmet.dto.result.demand.DemandRecResultDTO;
 import com.epmet.dto.result.demand.DemandResearchAnalysisResultDTO;
+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;
@@ -130,7 +131,7 @@ public interface IcUserDemandRecService extends BaseService<IcUserDemandRecEntit
      * 完成并评价
      * @param formDTO
      */
-    void finish(FinishStaffFromDTO formDTO);
+    FinishResultDTO finish(FinishStaffFromDTO formDTO);
 
     /**
      * 数据分析-个人档案，居民需求列表table

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java

@@ -21,7 +21,6 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
-import com.epmet.commons.rocketmq.messages.CalPartyUnitSatisfactionFormDTO;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
@@ -34,7 +33,6 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.constant.SystemMessageType;
 import com.epmet.constant.UserDemandConstant;
 import com.epmet.dao.IcUserDemandOperateLogDao;
 import com.epmet.dao.IcUserDemandRecDao;
@@ -44,18 +42,17 @@ import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.IcUserDemandRecDTO;
 import com.epmet.dto.form.CustomerGridFormDTO;
-import com.epmet.dto.form.SystemMsgFormDTO;
 import com.epmet.dto.form.demand.*;
 import com.epmet.dto.result.AllGridsByUserIdResultDTO;
 import com.epmet.dto.result.IcResiUserBriefDTO;
 import com.epmet.dto.result.UserBaseInfoResultDTO;
 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.dto.result.demand.*;
 import com.epmet.entity.*;
 import com.epmet.feign.EpmetAdminOpenFeignClient;
-import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.service.IcResiDemandDictService;
@@ -97,8 +94,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
     @Autowired
     private EpmetAdminOpenFeignClient adminOpenFeignClient;
-    @Autowired
-    private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
+
 
     @Override
     public PageData<IcUserDemandRecDTO> page(Map<String, Object> params) {
@@ -420,7 +416,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void finish(FinishStaffFromDTO formDTO) {
+    public FinishResultDTO finish(FinishStaffFromDTO formDTO) {
         IcUserDemandRecEntity entity = baseDao.selectById(formDTO.getDemandRecId());
         if (null == entity) {
             throw new RenException(EpmetErrorCode.DEMAND_NOT_EXITS.getCode(), EpmetErrorCode.DEMAND_NOT_EXITS.getMsg());
@@ -468,18 +464,15 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         satisfactionEntity.setEvaluateTime(logEntity.getOperateTime());
         satisfactionEntity.setScore(formDTO.getScore());
         demandSatisfactionDao.insert(satisfactionEntity);
+        FinishResultDTO finishResultDTO=new FinishResultDTO();
+        finishResultDTO.setPartyUnitId(serviceEntity.getServerId());
+        finishResultDTO.setSendCalStatisfaction(false);
         //5、如果服务方区域化党建单位，需求重新计算当前这个单位的满意度。
-
         //如果服务方是区域化党建单位，需要实时去计算他的群众满意度=服务过的需求的评价分数相加➗ 需求的总个数。
         if(UserDemandConstant.PARTY_UNIT.equals(serviceEntity.getServiceType())){
-            CalPartyUnitSatisfactionFormDTO mqMsg = new CalPartyUnitSatisfactionFormDTO();
-            mqMsg.setCustomerId(formDTO.getCustomerId());
-            mqMsg.setPartyUnitId(serviceEntity.getServerId());
-            SystemMsgFormDTO form = new SystemMsgFormDTO();
-            form.setMessageType(SystemMessageType.CAL_PARTY_UNIT_SATISFACTION);
-            form.setContent(mqMsg);
-            epmetMessageOpenFeignClient.sendSystemMsgByMQ(form);
+            finishResultDTO.setSendCalStatisfaction(true);
         }
+        return finishResultDTO;
     }
 
     /**

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 = "";
     }
 }

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 = "";
     }
 }

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;
 
 }

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 = '食品药品监管';

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml

@@ -637,12 +637,12 @@
 
     <!-- 查询居民热议左侧饼图 -->
     <select id="resiBuzzLeftPieChart" resultType="com.epmet.dto.result.ResiBuzzLeftPieChartResultDTO">
-        SELECT COUNT(issueId) AS count,categoryCode,categoryName,colour FROM
+        SELECT COUNT(issueId) AS count,categoryCode,categoryName,color FROM
             (SELECT
                 i.ID AS issueId,
                 IFNULL(LEFT(ic.CATEGORY_CODE,#{length}),'') AS categoryCode,
                 IFNULL(cd.CATEGORY_NAME,'其他') AS categoryName,
-                IFNULL(cd.colour,'#0091ed') AS colour
+                IFNULL(cd.color,'#0091ed') AS color
             FROM issue i
             LEFT JOIN issue_vote_statistical s ON (s.ISSUE_ID = i.ID AND s.DEL_FLAG = '0')
             LEFT JOIN issue_category ic ON (ic.ISSUE_ID = i.ID AND ic.DEL_FLAG = '0' AND ic.CUSTOMER_ID = i.CUSTOMER_ID)

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml

@@ -251,7 +251,7 @@
             CATEGORY_CODE,
             CATEGORY_NAME,
             LENGTH(CATEGORY_CODE) AS codeLength,
-            IFNULL(colour,'') AS colour
+            IFNULL(color,'') AS colour
         FROM issue_project_category_dict
         WHERE DEL_FLAG = 0
           AND CUSTOMER_ID = #{customerId}