From d32f970d950f891d92fc6c6a06d9b1d5bfb41db4 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 24 Dec 2021 10:33:41 +0800
Subject: [PATCH 01/13] 12312312

---
 .../java/com/epmet/dto/form/PatrolRoutineWorkFormDTO.java   | 2 +-
 .../epmet/service/impl/PatrolRoutineWorkServiceImpl.java    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PatrolRoutineWorkFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PatrolRoutineWorkFormDTO.java
index ada4f7bf42..5a9f6d63e5 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PatrolRoutineWorkFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PatrolRoutineWorkFormDTO.java
@@ -55,7 +55,7 @@ public class PatrolRoutineWorkFormDTO implements Serializable {
     @Range(min = 0, max = 1, message = "重点人员是否在当地格式错误", groups = AddOrUpdateForm.class)
     private Integer isKeyPeopleLocate;
     /**
-     * 重点人员现状
+     * 当事件类型为【特殊人群服务与管理】时必填 重点人员现状
      */
     private String keyPeopleStatus;
     /**
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java
index fba74fcbce..61bb3d0e39 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java
@@ -116,7 +116,7 @@ public class PatrolRoutineWorkServiceImpl extends BaseServiceImpl<PatrolRoutineW
             typeEntity.setRoutineWorkId(entity.getId());
             typeEntity.setWorkTypeCode(code);
             StringBuilder pids = pidsMap.get(code);
-            typeEntity.setAllPCode(pids.length() == 0 ? NumConstant.ZERO_STR : pids.toString());
+            typeEntity.setAllPCode(pids.length() == NumConstant.ZERO ? NumConstant.ZERO_STR : pids.toString());
             workTypeList.add(typeEntity);
         });
         patrolRoutineWorkTypeService.insertBatch(workTypeList);
@@ -137,8 +137,8 @@ public class PatrolRoutineWorkServiceImpl extends BaseServiceImpl<PatrolRoutineW
         StringBuilder pidSb = result.get(pid);
         if (pidSb == null) {
             pidSb = new StringBuilder();
-        } else if (pidSb.indexOf(pid) == -1) {
-            if (pidSb.length() > 0) {
+        } else if (pidSb.indexOf(pid) == NumConstant.ONE_NEG) {
+            if (pidSb.length() > NumConstant.ZERO) {
                 pidSb.append(StrConstant.COLON);
             }
             pidSb.append(pid);

From 642cdfd4aea312a38ccad6d6214b13093ff8abf7 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 24 Dec 2021 10:34:29 +0800
Subject: [PATCH 02/13] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/ResiEventReplyServiceImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java
index 1521c76bc6..7a0b19a9fc 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventReplyServiceImpl.java
@@ -293,7 +293,7 @@ public class ResiEventReplyServiceImpl extends BaseServiceImpl<ResiEventReplyDao
         String name = "人大代表" + eventMentionEntity.getUserShowName();
         UserMessageFormDTO userMessage = new UserMessageFormDTO();
         userMessage.setApp(AppClientConstant.APP_RESI);
-        userMessage.setCustomerId(replyFormDTO.getCustomerId());
+        userMessage.setCustomerId(eventEntity.getCustomerId());
         userMessage.setGridId(eventEntity.getGridId());
         String messageContent = String.format(UserMessageConstant.REPLY_EVENT, name);
         userMessage.setMessageContent(messageContent);

From 20b31fd842d5fe02544b6d49a54f43c83c714972 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 24 Dec 2021 10:35:52 +0800
Subject: [PATCH 03/13] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=96=B9=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D=E5=90=8D=E7=A7=B0=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IcCommunitySelfOrganizationServiceImpl.java | 5 ++++-
 .../java/com/epmet/service/impl/IcPartyUnitServiceImpl.java  | 5 ++++-
 .../java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java
index 5a5cd89fe0..c73d8dff56 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java
@@ -401,7 +401,10 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
 
     @Override
     public List<IcCommunitySelfOrganizationEntity> queryListById(List<String> communityOrgIds) {
-        return baseDao.selectBatchIds(communityOrgIds);
+        if(CollectionUtils.isNotEmpty(communityOrgIds)){
+            return baseDao.selectBatchIds(communityOrgIds);
+        }
+        return Collections.EMPTY_LIST;
     }
 
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java
index 7f18773e78..4141ceb9b6 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java
@@ -454,7 +454,10 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
 
     @Override
     public List<IcPartyUnitEntity> queryListById(List<String> partyUnitIds) {
-        return baseDao.selectBatchIds(partyUnitIds);
+        if(CollectionUtils.isNotEmpty(partyUnitIds)){
+            return baseDao.selectBatchIds(partyUnitIds);
+        }
+        return Collections.EMPTY_LIST;
     }
 
     private String getServiceMatter(Map<String, String> map, String matter) {
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java
index 5827a15107..52193bb4df 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java
@@ -270,7 +270,10 @@ public class IcSocietyOrgServiceImpl extends BaseServiceImpl<IcSocietyOrgDao, Ic
 
     @Override
     public List<IcSocietyOrgEntity> queryListById(List<String> socialOrgIds) {
-        return baseDao.selectBatchIds(socialOrgIds);
+        if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(socialOrgIds)){
+            return baseDao.selectBatchIds(socialOrgIds);
+        }
+        return Collections.EMPTY_LIST;
     }
 
 }
\ No newline at end of file

From 63b99bc7c02c19280abc4ad636c54973def20fed Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 24 Dec 2021 10:42:48 +0800
Subject: [PATCH 04/13] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=AB=AF?=
 =?UTF-8?q?=E9=A2=84=E7=BA=A6=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form/AppointmentRecordMiniFormDTO.java    | 22 +++++++++++++++++++
 .../result/AppointmentRecordResultDTO.java    |  3 +++
 .../IcPartyServiceCenterController.java       | 12 ++++++++++
 .../dao/IcMatterAppointmentRecordDao.java     |  9 ++++++++
 .../service/IcPartyServiceCenterService.java  |  8 +++++++
 .../impl/IcPartyServiceCenterServiceImpl.java | 15 +++++++++++++
 .../mapper/IcMatterAppointmentRecordDao.xml   | 18 +++++++++++++++
 7 files changed, 87 insertions(+)
 create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AppointmentRecordMiniFormDTO.java

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AppointmentRecordMiniFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AppointmentRecordMiniFormDTO.java
new file mode 100644
index 0000000000..b3a14cf11b
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AppointmentRecordMiniFormDTO.java
@@ -0,0 +1,22 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/12/24 10:38 上午
+ * @DESC
+ */
+@Data
+public class AppointmentRecordMiniFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -2963684994195809536L;
+
+    public interface AppointmentRecordMiniForm{}
+
+    @NotBlank(message = "gridId不能为空",groups = AppointmentRecordMiniForm.class)
+    private String gridId;
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AppointmentRecordResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AppointmentRecordResultDTO.java
index 84813a4f47..4858babc52 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AppointmentRecordResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AppointmentRecordResultDTO.java
@@ -47,6 +47,8 @@ public class AppointmentRecordResultDTO implements Serializable {
      */
     private List<String> appointmentTime;
 
+    private String appointmentDate;
+
     @JsonIgnore
     private String timeId;
 
@@ -58,5 +60,6 @@ public class AppointmentRecordResultDTO implements Serializable {
         this.remark = "";
         this.appointmentTime = new ArrayList<>();
         this.recordId = "";
+        this.appointmentDate = "";
     }
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPartyServiceCenterController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPartyServiceCenterController.java
index 1fb82337a5..f6071938ce 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPartyServiceCenterController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPartyServiceCenterController.java
@@ -217,5 +217,17 @@ public class IcPartyServiceCenterController {
         return new Result<List<AllMattersResultDTO>>().ok(icPartyServiceCenterService.getAllMatters(formDTO));
     }
 
+    /**
+     * @Description  小程序端预约记录
+     * @param formDTO
+     * @author zxc
+     * @date 2021/12/24 10:18 上午
+     */
+    @PostMapping("appointmentrecordmini")
+    public Result<List<AppointmentRecordResultDTO>> appointmentRecordMini(@RequestBody AppointmentRecordMiniFormDTO formDTO,@LoginUser TokenDto tokenDto){
+        ValidatorUtils.validateEntity(formDTO,AppointmentRecordMiniFormDTO.AppointmentRecordMiniForm.class);
+        return new Result<List<AppointmentRecordResultDTO>>().ok(icPartyServiceCenterService.appointmentRecordMini(formDTO,tokenDto));
+    }
+
 
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcMatterAppointmentRecordDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcMatterAppointmentRecordDao.java
index 0b118216bb..d501c97389 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcMatterAppointmentRecordDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcMatterAppointmentRecordDao.java
@@ -44,6 +44,15 @@ public interface IcMatterAppointmentRecordDao extends BaseDao<IcMatterAppointmen
      */
     List<AppointmentRecordResultDTO> appointmentRecord(@Param("matterId")String matterId,@Param("date")String date);
 
+    /**
+     * @Description  小程序端预约列表
+     * @param orgId
+     * @param userId
+     * @author zxc
+     * @date 2021/12/24 10:25 上午
+     */
+    List<AppointmentRecordResultDTO> appointmentRecordMini(@Param("orgId")String orgId,@Param("userId")String userId);
+
     /**
      * @Description  查询事项是不是存在预约记录
      * @param matterIds
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPartyServiceCenterService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPartyServiceCenterService.java
index 1c0e805806..3a4cbcec4c 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPartyServiceCenterService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPartyServiceCenterService.java
@@ -175,4 +175,12 @@ public interface IcPartyServiceCenterService extends BaseService<IcPartyServiceC
      */
     List<AllMattersResultDTO> getAllMatters(AllMattersFormDTO formDTO);
 
+    /**
+     * @Description  小程序端预约记录
+     * @param tokenDto
+     * @author zxc
+     * @date 2021/12/24 10:18 上午
+     */
+    List<AppointmentRecordResultDTO> appointmentRecordMini(AppointmentRecordMiniFormDTO formDTO,TokenDto tokenDto);
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java
index c9410e55f9..bba2cb0455 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java
@@ -464,6 +464,21 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl<IcPartyServ
         return new ArrayList<>();
     }
 
+    /**
+     * @Description  小程序端预约记录
+     * @param tokenDto
+     * @author zxc
+     * @date 2021/12/24 10:18 上午
+     */
+    @Override
+    public List<AppointmentRecordResultDTO> appointmentRecordMini(AppointmentRecordMiniFormDTO formDTO,TokenDto tokenDto) {
+        List<AppointmentRecordResultDTO> result = matterAppointmentRecordDao.appointmentRecordMini(formDTO.getGridId(), tokenDto.getUserId());
+        if (CollectionUtils.isNotEmpty(result)){
+            return result;
+        }
+        return new ArrayList<>();
+    }
+
     public List<TimeDTO> getTimeList(String start,String end,Integer interval){
         List<TimeDTO> result = new ArrayList<>();
         List<String> intervalTimeList = getIntervalTimeList(start, end, interval);
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcMatterAppointmentRecordDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcMatterAppointmentRecordDao.xml
index 3b5f960894..3709847fd8 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcMatterAppointmentRecordDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcMatterAppointmentRecordDao.xml
@@ -45,4 +45,22 @@
             </foreach>
         GROUP BY matterId
     </select>
+
+    <!-- 小程序端预约列表 -->
+    <select id="appointmentRecordMini" resultType="com.epmet.dto.result.AppointmentRecordResultDTO">
+        SELECT
+            ar.APPOINTMENT_NAME,
+            ar.APPOINTMENT_PHONE,
+            ar.REMARK,
+            ar.TIME_ID,
+            cm.MATTER_NAME,
+            ar.ID AS recordId,
+            ar.APPOINTMENT_DATE
+        FROM ic_matter_appointment_record ar
+        LEFT JOIN ic_party_service_center_matter cm ON (cm.ID = ar.MATTER_ID AND cm.DEL_FLAG = 0)
+        WHERE ar.DEL_FLAG = 0
+          AND ar.ORG_ID = #{orgId}
+          AND ar.CREATED_BY = #{userId}
+          AND ar.`STATUS` = 'appointing'
+    </select>
 </mapper>
\ No newline at end of file

From e1b100367818e21d33676109729dc44d1e0851e0 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 24 Dec 2021 10:47:16 +0800
Subject: [PATCH 05/13] =?UTF-8?q?=E6=9C=80=E8=BF=91=E9=A2=84=E7=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/IcUserDemandRecServiceImpl.java    | 4 +++-
 .../src/main/resources/mapper/IcResiDemandDictDao.xml         | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
index 3b46ccb3a8..3ef872f211 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
@@ -1073,7 +1073,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         queryWrapper.orderByDesc("WANT_SERVICE_TIME");
         queryWrapper.last("limit 5");
         queryWrapper.select("DISTINCT CATEGORY_CODE");
-        return baseDao.selectList(queryWrapper).stream().map(o->o.toString()).collect(Collectors.toList());
+        return baseDao.selectObjs(queryWrapper).stream().map(o->o.toString()).collect(Collectors.toList());
     }
 
     /**
@@ -1250,6 +1250,8 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
      */
     @Override
     public DemandRecId saveOrUpdateDemand(ReportDemandFormDTO formDTO) {
+        //需求内容走内容审核
+
         Date now = new Date();
         DemandRecId resultDto = new DemandRecId();
         resultDto.setDemandRecId(formDTO.getDemandRecId());
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcResiDemandDictDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcResiDemandDictDao.xml
index 37f21845e4..0358defecc 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcResiDemandDictDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcResiDemandDictDao.xml
@@ -259,7 +259,7 @@
     <!--    查询分类信息，限制未被禁用的 -->
     <select id="selectListByCodes" parameterType="map" resultType="com.epmet.dto.result.demand.DemandCategoryResDTO">
          select
-            ID,
+            ID as categoryId,
             CATEGORY_CODE,
             PARENT_CODE,
             CATEGORY_NAME,

From 8d7a3cf2c4c454a084580e6de38613269c55dbc5 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 24 Dec 2021 11:12:19 +0800
Subject: [PATCH 06/13] =?UTF-8?q?=E6=88=91=E7=9A=84=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ResiDemandController.java      |  10 +-
 .../impl/IcUserDemandRecServiceImpl.java      | 122 +++++++++---------
 2 files changed, 69 insertions(+), 63 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiDemandController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiDemandController.java
index 39d205bdca..44d27e5793 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiDemandController.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiDemandController.java
@@ -156,14 +156,16 @@ public class ResiDemandController {
 
     /**
      * 居民端-我的需求（待处理，处理中，已完成，已取消）
-     * @param tokenDto
+     * @param tokenDto @LoginUser TokenDto tokenDto,
      * @param formDTO
      * @return
      */
     @PostMapping("mydemand")
-    public Result<List<ResiClientMyDemandResDTO>> queryMyDemand(@LoginUser TokenDto tokenDto, @RequestBody ResiClientMyDemandFormDTO formDTO){
-        formDTO.setUserId(tokenDto.getUserId());
-        formDTO.setCustomerId(tokenDto.getCustomerId());
+    public Result<List<ResiClientMyDemandResDTO>> queryMyDemand( @RequestBody ResiClientMyDemandFormDTO formDTO){
+        // formDTO.setUserId(tokenDto.getUserId());
+        // formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setUserId("cebe59b05d02715141762211bf57734f");
+        formDTO.setCustomerId("45687aa479955f9d06204d415238f7cc");
         ValidatorUtils.validateEntity(formDTO,PageFormDTO.AddUserInternalGroup.class,ResiClientMyDemandFormDTO.AddUserInternalGroup.class);
         return new Result<List<ResiClientMyDemandResDTO>>().ok(icUserDemandRecService.queryMyDemandForResiClient(formDTO));
     }
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
index 3ef872f211..8c3ade3df5 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
@@ -266,7 +266,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
             //3、查询志愿者
             // 服务方类型：志愿者：volunteer；社会组织：social_org；社区自组织：community_org；区域党建单位：party_unit；
             Map<String,String> userInfoMap=new HashMap<>();
-            Set<String> userIdList=list.stream().filter(item->item.getServiceType().equals(UserDemandConstant.VOLUNTEER)).map(DemandRecResultDTO::getServerId).collect(Collectors.toSet());
+            Set<String> userIdList=list.stream().filter(item->null!=item.getServiceType()&&item.getServiceType().equals(UserDemandConstant.VOLUNTEER)).map(DemandRecResultDTO::getServerId).collect(Collectors.toSet());
             if(CollectionUtils.isNotEmpty(userIdList)){
                 Result<List<UserBaseInfoResultDTO>> userInfoRes = epmetUserOpenFeignClient.queryUserBaseInfo(new ArrayList<>(userIdList));
                 if(!userInfoRes.success()||CollectionUtils.isEmpty(userInfoRes.getData())){
@@ -734,7 +734,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
             //3、查询志愿者
             // 服务方类型：志愿者：volunteer；社会组织：social_org；社区自组织：community_org；区域党建单位：party_unit；
             Map<String,String> userInfoMap=new HashMap<>();
-            Set<String> userIdList=list.stream().filter(item->item.getServiceType().equals(UserDemandConstant.VOLUNTEER)).map(DemandRecResultDTO::getServerId).collect(Collectors.toSet());
+            Set<String> userIdList=list.stream().filter(item->null!=item.getServiceType()&&item.getServiceType().equals(UserDemandConstant.VOLUNTEER)).map(DemandRecResultDTO::getServerId).collect(Collectors.toSet());
             if(CollectionUtils.isNotEmpty(userIdList)){
                 Result<List<UserBaseInfoResultDTO>> userInfoRes = epmetUserOpenFeignClient.queryUserBaseInfo(new ArrayList<>(userIdList));
                 if(!userInfoRes.success()||CollectionUtils.isEmpty(userInfoRes.getData())){
@@ -1091,48 +1091,50 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         List<ResiClientMyDemandResDTO> list=result.getList();
         if (CollectionUtils.isNotEmpty(list)) {
             //1、服务方（社会组织、社区自组织、区域化党建单位）单位名称，负责人姓名，负责人手机号
-            List<String> partyUnitIds = result.getList().stream().filter(l -> l.getServiceType().equals(UserDemandConstant.PARTY_UNIT)).map(ResiClientMyDemandResDTO::getServerId).collect(Collectors.toList());
+            List<String> partyUnitIds = result.getList().stream().filter(l -> null != l.getServiceType() && l.getServiceType().equals(UserDemandConstant.PARTY_UNIT)).map(ResiClientMyDemandResDTO::getServerId).collect(Collectors.toList());
             Map<String, IcPartyUnitEntity> partyUnitMap =getPartyUnitMap(partyUnitIds);
 
-            List<String> socialOrgIds = result.getList().stream().filter(l -> l.getServiceType().equals(UserDemandConstant.SOCIAL_ORG)).map(ResiClientMyDemandResDTO::getServerId).collect(Collectors.toList());
+            List<String> socialOrgIds = result.getList().stream().filter(l -> null != l.getServiceType() && l.getServiceType().equals(UserDemandConstant.SOCIAL_ORG)).map(ResiClientMyDemandResDTO::getServerId).collect(Collectors.toList());
             Map<String, IcSocietyOrgEntity> socialOrgMap=getSocialOrgMap(socialOrgIds);
 
-            List<String> communityOrgIds = result.getList().stream().filter(l -> l.getServiceType().equals(UserDemandConstant.COMMUNITY_ORG)).map(ResiClientMyDemandResDTO::getServerId).collect(Collectors.toList());
+            List<String> communityOrgIds = result.getList().stream().filter(l -> null != l.getServiceType() && l.getServiceType().equals(UserDemandConstant.COMMUNITY_ORG)).map(ResiClientMyDemandResDTO::getServerId).collect(Collectors.toList());
             Map<String, IcCommunitySelfOrganizationEntity> communityOrgMap=getCommunityOrgMap(communityOrgIds);
 
             //2、志愿者姓名、手机号
-            Set<String> userIdList=list.stream().filter(item->item.getServiceType().equals(UserDemandConstant.VOLUNTEER)).map(ResiClientMyDemandResDTO::getServerId).collect(Collectors.toSet());
+            Set<String> userIdList=list.stream().filter(item->null!=item.getServiceType()&&item.getServiceType().equals(UserDemandConstant.VOLUNTEER)).map(ResiClientMyDemandResDTO::getServerId).collect(Collectors.toSet());
             Map<String,UserBaseInfoResultDTO> userInfoMap=getVolunteerMap(userIdList);
 
             for (ResiClientMyDemandResDTO resDto : list) {
                 //3、查询分类名称
                 IcResiDemandDictEntity demandDict = demandDictService.getByCode(formDTO.getCustomerId(), resDto.getCategoryCode());
                 resDto.setCategoryName(null != demandDict ? demandDict.getCategoryName() : StrConstant.EPMETY_STR);
-                switch (resDto.getServiceType())
-                {
-                    case UserDemandConstant.PARTY_UNIT:
-                        resDto.setServiceUnitName(partyUnitMap.get(resDto.getServerId()).getUnitName());
-                        resDto.setServiceUserName(partyUnitMap.get(resDto.getServerId()).getContact());
-                        resDto.setServiceUserMobile(partyUnitMap.get(resDto.getServerId()).getContactMobile());
-                        break;
-                    case UserDemandConstant.SOCIAL_ORG:
-                        resDto.setServiceUnitName(socialOrgMap.get(resDto.getServerId()).getSocietyName());
-                        resDto.setServiceUserName(socialOrgMap.get(resDto.getServerId()).getPersonInCharge());
-                        resDto.setServiceUserMobile(socialOrgMap.get(resDto.getServerId()).getMobile());
-                        break;
-                    case UserDemandConstant.COMMUNITY_ORG:
-                        resDto.setServiceUnitName(communityOrgMap.get(resDto.getServerId()).getOrganizationName());
-                        resDto.setServiceUserName(communityOrgMap.get(resDto.getServerId()).getPrincipalName());
-                        resDto.setServiceUserMobile(communityOrgMap.get(resDto.getServerId()).getPrincipalPhone());
-                        break;
-                    case UserDemandConstant.VOLUNTEER:
-                        resDto.setServiceUnitName(StrConstant.EPMETY_STR);
-                        resDto.setServiceUserName(userInfoMap.get(resDto.getServerId()).getRealName());
-                        resDto.setServiceUserMobile(userInfoMap.get(resDto.getServerId()).getMobile());
-                        break;
-                    default:
-                        log.warn("serviceType 错误");
-                        break;
+                if(StringUtils.isNotBlank(resDto.getServiceType())){
+                    switch (resDto.getServiceType())
+                    {
+                        case UserDemandConstant.PARTY_UNIT:
+                            resDto.setServiceUnitName(partyUnitMap.get(resDto.getServerId()).getUnitName());
+                            resDto.setServiceUserName(partyUnitMap.get(resDto.getServerId()).getContact());
+                            resDto.setServiceUserMobile(partyUnitMap.get(resDto.getServerId()).getContactMobile());
+                            break;
+                        case UserDemandConstant.SOCIAL_ORG:
+                            resDto.setServiceUnitName(socialOrgMap.get(resDto.getServerId()).getSocietyName());
+                            resDto.setServiceUserName(socialOrgMap.get(resDto.getServerId()).getPersonInCharge());
+                            resDto.setServiceUserMobile(socialOrgMap.get(resDto.getServerId()).getMobile());
+                            break;
+                        case UserDemandConstant.COMMUNITY_ORG:
+                            resDto.setServiceUnitName(communityOrgMap.get(resDto.getServerId()).getOrganizationName());
+                            resDto.setServiceUserName(communityOrgMap.get(resDto.getServerId()).getPrincipalName());
+                            resDto.setServiceUserMobile(communityOrgMap.get(resDto.getServerId()).getPrincipalPhone());
+                            break;
+                        case UserDemandConstant.VOLUNTEER:
+                            resDto.setServiceUnitName(StrConstant.EPMETY_STR);
+                            resDto.setServiceUserName(userInfoMap.get(resDto.getServerId()).getRealName());
+                            resDto.setServiceUserMobile(userInfoMap.get(resDto.getServerId()).getMobile());
+                            break;
+                        default:
+                            log.warn("serviceType 错误");
+                            break;
+                    }
                 }
             }
         }
@@ -1208,34 +1210,36 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
             }
             //2、志愿者（姓名、手机号
             //3、区域化党建单位、社会组织、社区自组织 设置负责人和手机
-            switch (resDto.getServiceType()) {
-                case UserDemandConstant.PARTY_UNIT:
-                    Map<String, IcPartyUnitEntity> partyUnitMap = getPartyUnitMap(Arrays.asList(resDto.getServerId()));
-                    resDto.setServiceUnitName(partyUnitMap.get(resDto.getServerId()).getUnitName());
-                    resDto.setServiceUserName(partyUnitMap.get(resDto.getServerId()).getContact());
-                    resDto.setServiceUserMobile(partyUnitMap.get(resDto.getServerId()).getContactMobile());
-                    break;
-                case UserDemandConstant.SOCIAL_ORG:
-                    Map<String, IcSocietyOrgEntity> socialOrgMap = getSocialOrgMap(Arrays.asList(resDto.getServerId()));
-                    resDto.setServiceUnitName(socialOrgMap.get(resDto.getServerId()).getSocietyName());
-                    resDto.setServiceUserName(socialOrgMap.get(resDto.getServerId()).getPersonInCharge());
-                    resDto.setServiceUserMobile(socialOrgMap.get(resDto.getServerId()).getMobile());
-                    break;
-                case UserDemandConstant.COMMUNITY_ORG:
-                    Map<String, IcCommunitySelfOrganizationEntity> communityOrgMap = getCommunityOrgMap(Arrays.asList(resDto.getServerId()));
-                    resDto.setServiceUnitName(communityOrgMap.get(resDto.getServerId()).getOrganizationName());
-                    resDto.setServiceUserName(communityOrgMap.get(resDto.getServerId()).getPrincipalName());
-                    resDto.setServiceUserMobile(communityOrgMap.get(resDto.getServerId()).getPrincipalPhone());
-                    break;
-                case UserDemandConstant.VOLUNTEER:
-                    Map<String, UserBaseInfoResultDTO> userInfoMap = getVolunteerMap(new HashSet<>(Arrays.asList(resDto.getServerId())));
-                    resDto.setServiceUnitName(StrConstant.EPMETY_STR);
-                    resDto.setServiceUserName(userInfoMap.get(resDto.getServerId()).getRealName());
-                    resDto.setServiceUserMobile(userInfoMap.get(resDto.getServerId()).getMobile());
-                    break;
-                default:
-                    log.warn("serviceType 错误");
-                    break;
+            if(StringUtils.isNotBlank(resDto.getServiceType())){
+                switch (resDto.getServiceType()) {
+                    case UserDemandConstant.PARTY_UNIT:
+                        Map<String, IcPartyUnitEntity> partyUnitMap = getPartyUnitMap(Arrays.asList(resDto.getServerId()));
+                        resDto.setServiceUnitName(partyUnitMap.get(resDto.getServerId()).getUnitName());
+                        resDto.setServiceUserName(partyUnitMap.get(resDto.getServerId()).getContact());
+                        resDto.setServiceUserMobile(partyUnitMap.get(resDto.getServerId()).getContactMobile());
+                        break;
+                    case UserDemandConstant.SOCIAL_ORG:
+                        Map<String, IcSocietyOrgEntity> socialOrgMap = getSocialOrgMap(Arrays.asList(resDto.getServerId()));
+                        resDto.setServiceUnitName(socialOrgMap.get(resDto.getServerId()).getSocietyName());
+                        resDto.setServiceUserName(socialOrgMap.get(resDto.getServerId()).getPersonInCharge());
+                        resDto.setServiceUserMobile(socialOrgMap.get(resDto.getServerId()).getMobile());
+                        break;
+                    case UserDemandConstant.COMMUNITY_ORG:
+                        Map<String, IcCommunitySelfOrganizationEntity> communityOrgMap = getCommunityOrgMap(Arrays.asList(resDto.getServerId()));
+                        resDto.setServiceUnitName(communityOrgMap.get(resDto.getServerId()).getOrganizationName());
+                        resDto.setServiceUserName(communityOrgMap.get(resDto.getServerId()).getPrincipalName());
+                        resDto.setServiceUserMobile(communityOrgMap.get(resDto.getServerId()).getPrincipalPhone());
+                        break;
+                    case UserDemandConstant.VOLUNTEER:
+                        Map<String, UserBaseInfoResultDTO> userInfoMap = getVolunteerMap(new HashSet<>(Arrays.asList(resDto.getServerId())));
+                        resDto.setServiceUnitName(StrConstant.EPMETY_STR);
+                        resDto.setServiceUserName(userInfoMap.get(resDto.getServerId()).getRealName());
+                        resDto.setServiceUserMobile(userInfoMap.get(resDto.getServerId()).getMobile());
+                        break;
+                    default:
+                        log.warn("serviceType 错误");
+                        break;
+                }
             }
             return resDto;
         }

From c9f6bbb68001447bc21f92c6777979e9139fbf01 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 24 Dec 2021 11:13:54 +0800
Subject: [PATCH 07/13] test

---
 .../com/epmet/controller/ResiDemandController.java     | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiDemandController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiDemandController.java
index 44d27e5793..be5daf5e3e 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiDemandController.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiDemandController.java
@@ -156,16 +156,14 @@ public class ResiDemandController {
 
     /**
      * 居民端-我的需求（待处理，处理中，已完成，已取消）
-     * @param tokenDto @LoginUser TokenDto tokenDto,
+     * @param tokenDto
      * @param formDTO
      * @return
      */
     @PostMapping("mydemand")
-    public Result<List<ResiClientMyDemandResDTO>> queryMyDemand( @RequestBody ResiClientMyDemandFormDTO formDTO){
-        // formDTO.setUserId(tokenDto.getUserId());
-        // formDTO.setCustomerId(tokenDto.getCustomerId());
-        formDTO.setUserId("cebe59b05d02715141762211bf57734f");
-        formDTO.setCustomerId("45687aa479955f9d06204d415238f7cc");
+    public Result<List<ResiClientMyDemandResDTO>> queryMyDemand(@LoginUser TokenDto tokenDto,@RequestBody ResiClientMyDemandFormDTO formDTO){
+        formDTO.setUserId(tokenDto.getUserId());
+        formDTO.setCustomerId(tokenDto.getCustomerId());
         ValidatorUtils.validateEntity(formDTO,PageFormDTO.AddUserInternalGroup.class,ResiClientMyDemandFormDTO.AddUserInternalGroup.class);
         return new Result<List<ResiClientMyDemandResDTO>>().ok(icUserDemandRecService.queryMyDemandForResiClient(formDTO));
     }

From ea46728d8e7456d76a6af57f69d7ca10458232eb Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 24 Dec 2021 13:08:08 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E9=9C=80=E6=B1=82=E5=86=85=E5=AE=B9+=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E8=AF=84=E4=BB=B7=E8=BE=93=E5=85=A5=E7=9A=84=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E6=83=85=E5=86=B5=E8=B5=B0=E5=86=85=E5=AE=B9=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form/demand/EvaluateDemandFormDTO.java    |  3 ++
 .../controller/ResiDemandController.java      |  1 +
 .../impl/IcUserDemandRecServiceImpl.java      | 51 ++++++++++++++++---
 3 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/EvaluateDemandFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/EvaluateDemandFormDTO.java
index 1a0a5d28f2..ffd035954f 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/EvaluateDemandFormDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/EvaluateDemandFormDTO.java
@@ -41,4 +41,7 @@ public class EvaluateDemandFormDTO implements Serializable {
     private String userId;
     @NotBlank(message = "customerId不能为空", groups = AddUserInternalGroup.class)
     private String customerId;
+     // 政府端:gov、居民端:resi、运营端:oper
+     @NotBlank(message = "app不能为空", groups = AddUserInternalGroup.class)
+    private String app;
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiDemandController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiDemandController.java
index be5daf5e3e..48ff8d7585 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiDemandController.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiDemandController.java
@@ -117,6 +117,7 @@ public class ResiDemandController {
     public Result evaluate(@LoginUser TokenDto tokenDto, @RequestBody EvaluateDemandFormDTO formDTO) {
         formDTO.setUserId(tokenDto.getUserId());
         formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setApp(tokenDto.getApp());
         ValidatorUtils.validateEntity(formDTO, EvaluateDemandFormDTO.ShowGroup.class, EvaluateDemandFormDTO.AddUserInternalGroup.class);
         FinishResultDTO finishResultDTO = icUserDemandRecService.evaluate(formDTO);
         //如果服务方是区域化党建单位，需要实时去计算他的群众满意度=服务过的需求的评价分数相加➗ 需求的总个数。
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
index 8c3ade3df5..ac6f6ccf9f 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
@@ -27,10 +27,15 @@ import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.enums.DictTypeEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
+import com.epmet.commons.tools.scan.param.TextScanParamDTO;
+import com.epmet.commons.tools.scan.param.TextTaskDTO;
+import com.epmet.commons.tools.scan.result.SyncScanResult;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.utils.ScanContentUtils;
 import com.epmet.constant.ReadFlagConstant;
 import com.epmet.constant.UserDemandConstant;
 import com.epmet.constant.UserMessageTypeConstant;
@@ -56,6 +61,7 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -96,6 +102,11 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
     private IcCommunitySelfOrganizationService communitySelfOrganizationService;
     @Autowired
     private EpmetMessageOpenFeignClient messageOpenFeignClient;
+    @Value("${openapi.scan.server.url}")
+    private String scanApiUrl;
+    @Value("${openapi.scan.method.textSyncScan}")
+    private String textSyncScanMethod;
+
 
     @Override
     public IcUserDemandRecDTO get(String id) {
@@ -1028,19 +1039,27 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         if (!UserDemandConstant.FINISHED.equals(entity.getStatus())) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "服务未完成,不可评价", "服务未完成,不可评价");
         }
-        // todo 只有需求人才可以评价
-
+        //用户输入的完成情况，走内容审核
+        textScan(formDTO.getFinishDesc());
+        //当前操作用户是工作端用户还是居民端用户
+        String userType = "";
+        if (AppClientConstant.APP_GOV.equals(formDTO.getApp())) {
+            userType = UserDemandConstant.STAFF;
+        } else if (AppClientConstant.APP_RESI.equals(formDTO.getApp())) {
+            userType = UserDemandConstant.RESI;
+        }
         // 1、插入评价得分记录
         IcUserDemandSatisfactionEntity satisfactionEntity = ConvertUtils.sourceToTarget(formDTO, IcUserDemandSatisfactionEntity.class);
         satisfactionEntity.setEvaluateTime(new Date());
-        satisfactionEntity.setUserType(UserDemandConstant.RESI);
+        satisfactionEntity.setUserType(userType);
+        satisfactionEntity.setRemark(formDTO.getFinishDesc());
         demandSatisfactionDao.insert(satisfactionEntity);
 
         // 2、插入评价操作日志
         IcUserDemandOperateLogEntity evaluateEntity = ConvertUtils.sourceToTarget(formDTO, IcUserDemandOperateLogEntity.class);
         evaluateEntity.setActionCode(UserDemandConstant.EVALUATE);
         evaluateEntity.setOperateTime(satisfactionEntity.getEvaluateTime());
-        evaluateEntity.setUserType(UserDemandConstant.RESI);
+        evaluateEntity.setUserType(userType);
         operateLogDao.insert(evaluateEntity);
 
         // 3、更新主表已评价标识，是否解决标识。
@@ -1054,11 +1073,31 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         finishResultDTO.setServerId(serviceEntity.getServerId());
         finishResultDTO.setServiceType(serviceEntity.getServiceType());
         finishResultDTO.setAwardPoint(entity.getAwardPoint());
-        //5、我的需求-评价：如果服务方是志愿者，通知它：  您收到来自山东路-张先生的评价，请查看。
+        //5、我的需求-评价：如果服务方是志愿者，通知它：  您收到来自XXX(需求人姓名)的评价，请查看。
         sendVolunnterEvaluated(entity);
         return finishResultDTO;
     }
 
+    /**
+     * 需求内容，服务评价-完成情况走内容审核
+     * @param content
+     */
+    private void textScan(String content) {
+        TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
+        TextTaskDTO taskDTO = new TextTaskDTO();
+        taskDTO.setContent(content);
+        taskDTO.setDataId(UUID.randomUUID().toString().replace("-", ""));
+        textScanParamDTO.getTasks().add(taskDTO);
+        Result<SyncScanResult> textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO);
+        if (!textSyncScanResult.success()) {
+            throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
+        } else {
+            if (!textSyncScanResult.getData().isAllPass()) {
+                throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode(), EpmetErrorCode.TEXT_SCAN_FAILED.getMsg());
+            }
+        }
+    }
+
     /**
      * 居民端，我有需求，最近预约，显示最近预约过的五个需求，按照预约时间倒
      * 查询最近预约的5个编码
@@ -1255,7 +1294,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
     @Override
     public DemandRecId saveOrUpdateDemand(ReportDemandFormDTO formDTO) {
         //需求内容走内容审核
-
+        textScan(formDTO.getContent());
         Date now = new Date();
         DemandRecId resultDto = new DemandRecId();
         resultDto.setDemandRecId(formDTO.getDemandRecId());

From 781c85a44565530c3938f77be596aa73c8c33440 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 24 Dec 2021 13:30:31 +0800
Subject: [PATCH 09/13] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E9=9C=80=E6=B1=82=E5=86=85=E5=AE=B9+=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E8=AF=84=E4=BB=B7=E8=BE=93=E5=85=A5=E7=9A=84=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E6=83=85=E5=86=B5=E8=B5=B0=E5=86=85=E5=AE=B9=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form/demand/EvaluateDemandFormDTO.java    |  3 ++
 .../controller/ResiDemandController.java      |  1 +
 .../impl/IcUserDemandRecServiceImpl.java      | 49 ++++++++++++++++---
 3 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/EvaluateDemandFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/EvaluateDemandFormDTO.java
index 1a0a5d28f2..119061edee 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/EvaluateDemandFormDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/EvaluateDemandFormDTO.java
@@ -41,4 +41,7 @@ public class EvaluateDemandFormDTO implements Serializable {
     private String userId;
     @NotBlank(message = "customerId不能为空", groups = AddUserInternalGroup.class)
     private String customerId;
+    // 政府端:gov、居民端:resi、运营端:oper
+    @NotBlank(message = "app不能为空", groups = AddUserInternalGroup.class)
+    private String app;
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiDemandController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiDemandController.java
index be5daf5e3e..48ff8d7585 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiDemandController.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiDemandController.java
@@ -117,6 +117,7 @@ public class ResiDemandController {
     public Result evaluate(@LoginUser TokenDto tokenDto, @RequestBody EvaluateDemandFormDTO formDTO) {
         formDTO.setUserId(tokenDto.getUserId());
         formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setApp(tokenDto.getApp());
         ValidatorUtils.validateEntity(formDTO, EvaluateDemandFormDTO.ShowGroup.class, EvaluateDemandFormDTO.AddUserInternalGroup.class);
         FinishResultDTO finishResultDTO = icUserDemandRecService.evaluate(formDTO);
         //如果服务方是区域化党建单位，需要实时去计算他的群众满意度=服务过的需求的评价分数相加➗ 需求的总个数。
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
index 8c3ade3df5..7191081678 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
@@ -27,10 +27,15 @@ import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.enums.DictTypeEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
+import com.epmet.commons.tools.scan.param.TextScanParamDTO;
+import com.epmet.commons.tools.scan.param.TextTaskDTO;
+import com.epmet.commons.tools.scan.result.SyncScanResult;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.utils.ScanContentUtils;
 import com.epmet.constant.ReadFlagConstant;
 import com.epmet.constant.UserDemandConstant;
 import com.epmet.constant.UserMessageTypeConstant;
@@ -56,6 +61,7 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -96,6 +102,10 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
     private IcCommunitySelfOrganizationService communitySelfOrganizationService;
     @Autowired
     private EpmetMessageOpenFeignClient messageOpenFeignClient;
+    @Value("${openapi.scan.server.url}")
+    private String scanApiUrl;
+    @Value("${openapi.scan.method.textSyncScan}")
+    private String textSyncScanMethod;
 
     @Override
     public IcUserDemandRecDTO get(String id) {
@@ -1028,19 +1038,27 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         if (!UserDemandConstant.FINISHED.equals(entity.getStatus())) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "服务未完成,不可评价", "服务未完成,不可评价");
         }
-        // todo 只有需求人才可以评价
-
+        //用户输入的完成情况，走内容审核
+        textScan(formDTO.getFinishDesc());
+        //当前操作用户是工作端用户还是居民端用户
+        String userType = "";
+        if (AppClientConstant.APP_GOV.equals(formDTO.getApp())) {
+            userType = UserDemandConstant.STAFF;
+        } else if (AppClientConstant.APP_RESI.equals(formDTO.getApp())) {
+            userType = UserDemandConstant.RESI;
+        }
         // 1、插入评价得分记录
         IcUserDemandSatisfactionEntity satisfactionEntity = ConvertUtils.sourceToTarget(formDTO, IcUserDemandSatisfactionEntity.class);
         satisfactionEntity.setEvaluateTime(new Date());
-        satisfactionEntity.setUserType(UserDemandConstant.RESI);
+        satisfactionEntity.setUserType(userType);
+        satisfactionEntity.setRemark(formDTO.getFinishDesc());
         demandSatisfactionDao.insert(satisfactionEntity);
 
         // 2、插入评价操作日志
         IcUserDemandOperateLogEntity evaluateEntity = ConvertUtils.sourceToTarget(formDTO, IcUserDemandOperateLogEntity.class);
         evaluateEntity.setActionCode(UserDemandConstant.EVALUATE);
         evaluateEntity.setOperateTime(satisfactionEntity.getEvaluateTime());
-        evaluateEntity.setUserType(UserDemandConstant.RESI);
+        evaluateEntity.setUserType(userType);
         operateLogDao.insert(evaluateEntity);
 
         // 3、更新主表已评价标识，是否解决标识。
@@ -1054,7 +1072,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         finishResultDTO.setServerId(serviceEntity.getServerId());
         finishResultDTO.setServiceType(serviceEntity.getServiceType());
         finishResultDTO.setAwardPoint(entity.getAwardPoint());
-        //5、我的需求-评价：如果服务方是志愿者，通知它：  您收到来自山东路-张先生的评价，请查看。
+        //5、我的需求-评价：如果服务方是志愿者，通知它：  您收到来自XXX(需求人姓名)的评价，请查看。
         sendVolunnterEvaluated(entity);
         return finishResultDTO;
     }
@@ -1255,7 +1273,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
     @Override
     public DemandRecId saveOrUpdateDemand(ReportDemandFormDTO formDTO) {
         //需求内容走内容审核
-
+        textScan(formDTO.getContent());
         Date now = new Date();
         DemandRecId resultDto = new DemandRecId();
         resultDto.setDemandRecId(formDTO.getDemandRecId());
@@ -1318,6 +1336,25 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         return resultDto;
     }
 
+    /**
+     * 需求内容，服务评价-完成情况走内容审核
+     * @param content
+     */
+    private void textScan(String content) {
+        TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
+        TextTaskDTO taskDTO = new TextTaskDTO();
+        taskDTO.setContent(content);
+        taskDTO.setDataId(UUID.randomUUID().toString().replace("-", ""));
+        textScanParamDTO.getTasks().add(taskDTO);
+        Result<SyncScanResult> textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO);
+        if (!textSyncScanResult.success()) {
+            throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
+        } else {
+            if (!textSyncScanResult.getData().isAllPass()) {
+                throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode(), EpmetErrorCode.TEXT_SCAN_FAILED.getMsg());
+            }
+        }
+    }
 
     /**
      * 我的需求被抢单->您提出的需求将由青岛亿联科技有限公司为您解决，请查看。

From 9850c101523a1e96f96a97bc74326b69d1fa5782 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 24 Dec 2021 13:35:13 +0800
Subject: [PATCH 10/13] =?UTF-8?q?=E6=88=91=E7=9A=84=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/IcUserDemandRecDao.xml            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml
index 93b1423a58..9b0b0949c6 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml
@@ -476,7 +476,7 @@
         WHERE
             r.DEL_FLAG = '0'
             AND r.GRID_ID = #{gridId}
-            AND R.DEMAND_USER_ID !=#{demandUserId}
+            AND R.DEMAND_USER_ID =#{demandUserId}
             <if test="null !=type and type =='unprocessed' ">
                 AND r.`STATUS` = 'pending'
             </if>

From a46320761c23508056ba1b84cc6eb89640d13c6e Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 24 Dec 2021 13:43:25 +0800
Subject: [PATCH 11/13] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BE=8B=E8=A1=8C?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=20mq=20=E7=94=9F=E4=BA=A7=E8=80=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rocketmq/messages/BaseMQMsgDTO.java       |  24 ++++
 .../rocketmq/messages/StaffPatrolMQMsg.java   |   8 +-
 .../com/epmet/constant/SystemMessageType.java |   6 +
 .../java/com/epmet/send/SendMqMsgUtil.java    |   2 +-
 .../impl/SystemMessageServiceImpl.java        |   5 +
 .../dto/form/PatrolRoutineWorkFormDTO.java    |   2 -
 .../impl/PatrolRoutineWorkServiceImpl.java    | 110 +++++++++++-------
 7 files changed, 106 insertions(+), 51 deletions(-)
 create mode 100644 epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/BaseMQMsgDTO.java

diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/BaseMQMsgDTO.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/BaseMQMsgDTO.java
new file mode 100644
index 0000000000..a4d24560a7
--- /dev/null
+++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/BaseMQMsgDTO.java
@@ -0,0 +1,24 @@
+package com.epmet.commons.rocketmq.messages;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 基础消息体
+ * @author liujianjun
+ */
+@Data
+public class BaseMQMsgDTO implements Serializable {
+    private static final long serialVersionUID = 1019260278983535301L;
+    /**
+     * 客户Id
+     */
+    private String customerId;
+
+    /**
+     * 对象id
+     */
+    private String objectId;
+
+}
diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/StaffPatrolMQMsg.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/StaffPatrolMQMsg.java
index d8d68cac56..e6632a72ca 100644
--- a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/StaffPatrolMQMsg.java
+++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/StaffPatrolMQMsg.java
@@ -7,12 +7,8 @@ import lombok.Data;
  * @author liujianjun
  */
 @Data
-public class StaffPatrolMQMsg {
-    /**
-     * 客户Id
-     */
-    private String customerId;
-
+public class StaffPatrolMQMsg extends BaseMQMsgDTO {
+    private static final long serialVersionUID = 3039825049521866599L;
     /**
      * 巡查记录id
      */
diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java
index 284be1cb95..60230d3a10 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java
@@ -75,6 +75,11 @@ public interface SystemMessageType {
      */
     String USER_PATROL_STOP = "user_patrol_stop";
 
+    /**
+     * 添加例行工作
+     */
+    String PATROL_ROUTINE_WORK_ADD = "patrol_routine_work_add";
+
     /**
      * 项目变动
      */
@@ -104,4 +109,5 @@ public interface SystemMessageType {
      *  需求完成，如果服务方是区域化党建单位，重新计算这个单位的满意度
      */
     String CAL_PARTY_UNIT_SATISFACTION = "cal_party_unit_satisfaction";
+
 }
diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/send/SendMqMsgUtil.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/send/SendMqMsgUtil.java
index e232f5f635..fa5d21967a 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/send/SendMqMsgUtil.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/send/SendMqMsgUtil.java
@@ -132,7 +132,7 @@ public class SendMqMsgUtil {
      * @author wxz
      * @date 2021.06.21 12:46
      */
-    public boolean sendPatrolMqMsg(StaffPatrolMQMsg msg,String messageType) {
+    public boolean sendPatrolMqMsg(BaseMQMsgDTO  msg, String messageType) {
         try {
             SystemMsgFormDTO msgForm = new SystemMsgFormDTO();
             msgForm.setMessageType(messageType);
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java
index 92703db76e..ac6a1ce8ee 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java
@@ -181,6 +181,7 @@ public class SystemMessageServiceImpl implements SystemMessageService {
                 break;
             case SystemMessageType.USER_PATROL_START:
             case SystemMessageType.USER_PATROL_STOP:
+            case SystemMessageType.PATROL_ROUTINE_WORK_ADD:
                 topic = TopicConstants.PATROL;
                 break;
             case SystemMessageType.PROJECT_ADD:
@@ -195,6 +196,8 @@ public class SystemMessageServiceImpl implements SystemMessageService {
             case SystemMessageType.CAL_PARTY_UNIT_SATISFACTION:
                 topic=TopicConstants.CAL_PARTY_UNIT_SATISFACTION;
                 break;
+            default:
+                logger.info("getTopicByMsgType default topic:{}", msgType);
         }
         return topic;
     }
@@ -244,6 +247,8 @@ public class SystemMessageServiceImpl implements SystemMessageService {
                         l1LastAlertTime = now;
                     }
                     break;
+                default:
+                    logger.info("blockedMqMsgScan default topic:{}", mcb.getTopic());
             }
         }
     }
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PatrolRoutineWorkFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PatrolRoutineWorkFormDTO.java
index 5a9f6d63e5..c97e3236af 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PatrolRoutineWorkFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PatrolRoutineWorkFormDTO.java
@@ -24,8 +24,6 @@ public class PatrolRoutineWorkFormDTO implements Serializable {
     public interface AddOrUpdateForm {
     }
 
-    private String customerId;
-
     @NotBlank(message = "网格ID不能为空", groups = AddOrUpdateForm.class)
     private String gridId;
 
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java
index 61bb3d0e39..574b1be44c 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java
@@ -19,6 +19,7 @@ package com.epmet.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.rocketmq.messages.BaseMQMsgDTO;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.result.DictTreeResultDTO;
@@ -28,6 +29,7 @@ import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.constant.SystemMessageType;
 import com.epmet.dao.PatrolRoutineWorkDao;
 import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.form.CustomerGridFormDTO;
@@ -35,7 +37,9 @@ import com.epmet.dto.form.PatrolRoutineWorkFormDTO;
 import com.epmet.entity.PatrolRoutineWorkEntity;
 import com.epmet.entity.PatrolRoutineWorkTypeEntity;
 import com.epmet.feign.EpmetAdminOpenFeignClient;
+import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
+import com.epmet.send.SendMqMsgUtil;
 import com.epmet.service.PatrolRoutineWorkService;
 import com.epmet.service.PatrolRoutineWorkTypeService;
 import lombok.extern.slf4j.Slf4j;
@@ -66,7 +70,9 @@ public class PatrolRoutineWorkServiceImpl extends BaseServiceImpl<PatrolRoutineW
     @Autowired
     private LoginUserUtil loginUserUtil;
     @Autowired
-    PatrolRoutineWorkTypeService patrolRoutineWorkTypeService;
+    private PatrolRoutineWorkTypeService patrolRoutineWorkTypeService;
+    @Autowired
+    private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
 
     /**
      * @param formDTO
@@ -77,49 +83,57 @@ public class PatrolRoutineWorkServiceImpl extends BaseServiceImpl<PatrolRoutineW
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void add(PatrolRoutineWorkFormDTO formDTO) {
-        if (formDTO.getWorkTypeList().toString().contains("02")
-                && (formDTO.getIsKeyPeopleLocate() == null || StringUtils.isBlank(formDTO.getKeyPeopleStatus()))){
-            log.warn("add patrolRoutineWork fail,param is error,param:{}", JSON.toJSONString(formDTO));
-            throw new EpmetException(EpmetErrorCode.ORG_ADD_FAILED.getCode());
-        }
-        PatrolRoutineWorkEntity entity = ConvertUtils.sourceToTarget(formDTO, PatrolRoutineWorkEntity.class);
+        PatrolRoutineWorkEntity entity = null;
+        try {
+            if (formDTO.getWorkTypeList().toString().contains("02")
+                    && (formDTO.getIsKeyPeopleLocate() == null || StringUtils.isBlank(formDTO.getKeyPeopleStatus()))) {
+                log.warn("add patrolRoutineWork fail,param is error,param:{}", JSON.toJSONString(formDTO));
+                throw new EpmetException(EpmetErrorCode.ORG_ADD_FAILED.getCode());
+            }
+            entity = ConvertUtils.sourceToTarget(formDTO, PatrolRoutineWorkEntity.class);
 
-        CustomerGridFormDTO gridFormDTO = new CustomerGridFormDTO();
-        gridFormDTO.setGridId(formDTO.getGridId());
-        Result<CustomerGridDTO> gridBaseInfoData = govOrgOpenFeignClient.getGridBaseInfoByGridId(gridFormDTO);
-        if (!gridBaseInfoData.success()) {
-            throw new EpmetException("查询网格基本信息失败......");
-        }
-        CustomerGridDTO gridBaseInfo = gridBaseInfoData.getData();
-        entity.setPids(gridBaseInfo.getPids());
-        entity.setUserId(loginUserUtil.getLoginUserId());
-        entity.setCustomerId(loginUserUtil.getLoginUserCustomerId());
-
-        //entity.setUserId("loginUserUtil.getLoginUserId()");
-        //entity.setCustomerId("loginUserUtil.getLoginUserCustomerId()");
-        baseDao.insert(entity);
-
-        Result<List<DictTreeResultDTO>> mapResult = adminOpenFeignClient.dictTree(DictTypeEnum.PATROL_WORK_TYPE.getCode());
-        if (mapResult == null || !mapResult.success() || CollectionUtils.isEmpty(mapResult.getData())) {
-            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "例行工作类型字典获取失败!");
+            CustomerGridFormDTO gridFormDTO = new CustomerGridFormDTO();
+            gridFormDTO.setGridId(formDTO.getGridId());
+            Result<CustomerGridDTO> gridBaseInfoData = govOrgOpenFeignClient.getGridBaseInfoByGridId(gridFormDTO);
+            if (!gridBaseInfoData.success()) {
+                throw new EpmetException("查询网格基本信息失败......");
+            }
+            CustomerGridDTO gridBaseInfo = gridBaseInfoData.getData();
+            entity.setPids(gridBaseInfo.getPids());
+            entity.setUserId(loginUserUtil.getLoginUserId());
+            entity.setCustomerId(loginUserUtil.getLoginUserCustomerId());
+
+            //entity.setUserId("loginUserUtil.getLoginUserId()");
+            //entity.setCustomerId("loginUserUtil.getLoginUserCustomerId()");
+            baseDao.insert(entity);
+
+            Result<List<DictTreeResultDTO>> mapResult = adminOpenFeignClient.dictTree(DictTypeEnum.PATROL_WORK_TYPE.getCode());
+            if (mapResult == null || !mapResult.success() || CollectionUtils.isEmpty(mapResult.getData())) {
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "例行工作类型字典获取失败!");
+            }
+            List<DictTreeResultDTO> dictTree = mapResult.getData();
+
+            Map<String, StringBuilder> pidsMap = new HashMap<>();
+
+            dictTree.forEach(dto -> buildAllParentIdPath(pidsMap, dto));
+
+            //插入分类
+            List<PatrolRoutineWorkTypeEntity> workTypeList = new ArrayList<>();
+            for (String code : formDTO.getWorkTypeList()) {
+                PatrolRoutineWorkTypeEntity typeEntity = new PatrolRoutineWorkTypeEntity();
+                typeEntity.setCustomerId(loginUserUtil.getLoginUserCustomerId());
+                typeEntity.setRoutineWorkId(entity.getId());
+                typeEntity.setWorkTypeCode(code);
+                StringBuilder pids = pidsMap.get(code);
+                typeEntity.setAllPCode(pids.length() == NumConstant.ZERO ? NumConstant.ZERO_STR : pids.toString());
+                workTypeList.add(typeEntity);
+            }
+            patrolRoutineWorkTypeService.insertBatch(workTypeList);
+        } finally {
+            if (entity != null){
+                sendPatrolMsg(entity.getCustomerId(),entity.getId(),SystemMessageType.PATROL_ROUTINE_WORK_ADD);
+            }
         }
-        List<DictTreeResultDTO> dictTree = mapResult.getData();
-
-        Map<String, StringBuilder> pidsMap = new HashMap<>();
-
-        dictTree.forEach(dto -> buildAllParentIdPath(pidsMap, dto));
-
-        List<PatrolRoutineWorkTypeEntity> workTypeList = new ArrayList<>();
-        formDTO.getWorkTypeList().forEach(code -> {
-            PatrolRoutineWorkTypeEntity typeEntity = new PatrolRoutineWorkTypeEntity();
-            typeEntity.setCustomerId(loginUserUtil.getLoginUserCustomerId());
-            typeEntity.setRoutineWorkId(entity.getId());
-            typeEntity.setWorkTypeCode(code);
-            StringBuilder pids = pidsMap.get(code);
-            typeEntity.setAllPCode(pids.length() == NumConstant.ZERO ? NumConstant.ZERO_STR : pids.toString());
-            workTypeList.add(typeEntity);
-        });
-        patrolRoutineWorkTypeService.insertBatch(workTypeList);
 
     }
 
@@ -154,6 +168,18 @@ public class PatrolRoutineWorkServiceImpl extends BaseServiceImpl<PatrolRoutineW
         }
     }
 
+    private void sendPatrolMsg(String customerId, String id, String messageType) {
+        //发送巡查消息
+        BaseMQMsgDTO baseMQMsgDTO = new BaseMQMsgDTO();
+        baseMQMsgDTO.setCustomerId(customerId);
+        baseMQMsgDTO.setObjectId(id);
+
+        boolean b = SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendPatrolMqMsg(baseMQMsgDTO, messageType);
+        if (!b) {
+            log.error("发送{}巡查消息到mq失败，patrolId:{}", messageType, id);
+        }
+    }
+
     public static void main(String[] args) {
         String str = "[{\"id\":\"01\",\"pid\":\"0\",\"children\":[{\"id\":\"0101\",\"pid\":\"01\",\"children\":[{\"id\":\"010101\",\"pid\":\"0101\",\"children\":[],\"name\":\"出租房屋巡查\"}],\"name\":\"出租房屋巡查\"},{\"id\":\"0102\",\"pid\":\"01\",\"children\":[],\"name\":\"重点场所巡查\"},{\"id\":\"0103\",\"pid\":\"01\",\"children\":[],\"name\":\"宗教活动\"},{\"id\":\"0199\",\"pid\":\"01\",\"children\":[],\"name\":\"其他\"}],\"name\":\"重点巡查\"},{\"id\":\"02\",\"pid\":\"0\",\"children\":[{\"id\":\"0201\",\"pid\":\"02\",\"children\":[],\"name\":\"刑满释放人员\"},{\"id\":\"0202\",\"pid\":\"02\",\"children\":[],\"name\":\"社区矫正\"},{\"id\":\"0203\",\"pid\":\"02\",\"children\":[],\"name\":\"吸毒人员\"},{\"id\":\"0204\",\"pid\":\"02\",\"children\":[],\"name\":\"信访人员\"},{\"id\":\"0205\",\"pid\":\"02\",\"children\":[],\"name\":\"重点青少年\"},{\"id\":\"0206\",\"pid\":\"02\",\"children\":[],\"name\":\"精神障碍者\"}],\"name\":\"特殊人群\"},{\"id\":\"09\",\"pid\":\"0\",\"children\":[{\"id\":\"0901\",\"pid\":\"09\",\"children\":[],\"name\":\"公共服务\"},{\"id\":\"0902\",\"pid\":\"09\",\"children\":[],\"name\":\"权益保障\"},{\"id\":\"0903\",\"pid\":\"09\",\"children\":[],\"name\":\"政策宣传\"},{\"id\":\"0904\",\"pid\":\"09\",\"children\":[],\"name\":\"便利服务\"},{\"id\":\"0999\",\"pid\":\"09\",\"children\":[],\"name\":\"其他\"}],\"name\":\"为民服务\"}]";
         List<DictTreeResultDTO> dtos = JSON.parseArray(str, DictTreeResultDTO.class);

From ca4510ee16ad66a20c2ef839345c8c49f248de51 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 24 Dec 2021 14:01:30 +0800
Subject: [PATCH 12/13] =?UTF-8?q?=E6=88=91=E7=9A=84=E9=9C=80=E6=B1=82?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/result/demand/DemandDetailResDTO.java   | 11 +++++++++++
 .../epmet/dto/result/demand/DemandRecResultDTO.java   |  8 ++++++++
 .../src/main/resources/mapper/IcUserDemandRecDao.xml  |  6 +++++-
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandDetailResDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandDetailResDTO.java
index 2a829c2bb4..cad6a2c4dd 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandDetailResDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandDetailResDTO.java
@@ -56,6 +56,17 @@ public class DemandDetailResDTO implements Serializable {
      */
     private String serviceAddress;
 
+     // 服务地点，工作端指派默认居民居住房屋地址，居民端地图选择
+    private String serviceLocation;
+     // 门牌号详细地址
+    private String locationDetail;
+     // 经度,需求人是ic的居民时，取所住楼栋的中心点位
+    private String longitude;
+     // 纬度,需求人是ic的居民时，取所住楼栋的中心点位
+    private String latitude;
+
+
+
     /**
      * 实际服务开始时间
      */
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java
index 6a6c5145f1..c235915430 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java
@@ -131,4 +131,12 @@ public class DemandRecResultDTO implements Serializable {
      * 服务地点
      */
     private String serviceAddress;
+    // 服务地点，工作端指派默认居民居住房屋地址，居民端地图选择
+    private String serviceLocation;
+    // 门牌号详细地址
+    private String locationDetail;
+    // 经度,需求人是ic的居民时，取所住楼栋的中心点位
+    private String longitude;
+    // 纬度,需求人是ic的居民时，取所住楼栋的中心点位
+    private String latitude;
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml
index 9b0b0949c6..7123e44860 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml
@@ -207,7 +207,11 @@
                 END
             ) as epmetUserId,
             r.AWARD_POINT as awardPoint,
-            concat( r.SERVICE_LOCATION, r.LOCATION_DETAIL ) AS serviceAddress
+            concat( r.SERVICE_LOCATION, r.LOCATION_DETAIL ) AS serviceAddress,
+            r.SERVICE_LOCATION,
+            r.LOCATION_DETAIL,
+            r.LONGITUDE,
+            r.LATITUDE
         FROM
             ic_user_demand_rec r
             left JOIN ic_user_demand_service s ON ( r.id = s.DEMAND_REC_ID AND s.DEL_FLAG = '0' )

From e740e54d7305792fe8e08354eb0493b5a2fbb485 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 24 Dec 2021 14:30:45 +0800
Subject: [PATCH 13/13] =?UTF-8?q?=E4=BE=8B=E8=A1=8C=E5=B7=A5=E4=BD=9C=20?=
 =?UTF-8?q?=E6=BC=8F=E6=8E=89=E4=BA=86=E4=B8=80=E4=B8=AA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/entity/PatrolRoutineWorkEntity.java  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/PatrolRoutineWorkEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/PatrolRoutineWorkEntity.java
index 200462b914..7a158f9eb7 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/PatrolRoutineWorkEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/PatrolRoutineWorkEntity.java
@@ -85,6 +85,11 @@ public class PatrolRoutineWorkEntity extends BaseEpmetEntity {
 	 */
 	private String keyPeopleStatus;
 
+	/**
+	 * 发生地点
+	 */
+	private String address;
+
     /**
      * 经度
      */