From eb0a132da279bb882b4fedd2d2ffb902f877d154 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Mon, 18 Oct 2021 16:54:19 +0800
Subject: [PATCH 01/12] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E5=8F=91=E9=80=81MQ=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../constants/ConsomerGroupConstants.java     |  5 +++
 .../rocketmq/constants/TopicConstants.java    |  5 +++
 .../messages/DisputeProcessMQMsg.java         | 22 +++++++++++++
 .../dto/basereport/form/EventInfoFormDTO.java |  5 ++-
 .../dto/screen/ScreenProjectDataDTO.java      |  4 +++
 .../data-statistical-server/pom.xml           |  6 ++++
 .../mq/ProjectChangedCustomListener.java      | 15 ++++++++-
 .../screen/ScreenProjectDataService.java      | 12 ++++++-
 .../impl/ScreenProjectDataServiceImpl.java    | 21 ++++++++++++-
 .../impl/DataReportingServiceImpl.java        |  3 +-
 .../com/epmet/constant/SystemMessageType.java | 10 ++++++
 .../java/com/epmet/send/SendMqMsgUtil.java    | 31 +++++++++++++++++++
 .../impl/SystemMessageServiceImpl.java        |  4 +++
 .../opendata/mq/RocketMQConsumerRegister.java |  4 +--
 .../OpenDataProjectChangeEventListener.java   |  7 +++--
 .../impl/BaseDisputeProcessServiceImpl.java   | 19 +++++++++++-
 16 files changed, 163 insertions(+), 10 deletions(-)
 create mode 100644 epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/DisputeProcessMQMsg.java

diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/ConsomerGroupConstants.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/ConsomerGroupConstants.java
index a1c61abf6b..fb5ae07412 100644
--- a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/ConsomerGroupConstants.java
+++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/ConsomerGroupConstants.java
@@ -60,4 +60,9 @@ public interface ConsomerGroupConstants {
      */
     String OPEN_DATA_PATROL_CHANGE_EVENT_LISTENER_GROUP = "open_data_patrol_change_event_listener_group";
 
+    /**
+     * 开放的对接数据(中间库) 项目变更事件监听器分组
+     */
+    String OPEN_DATA_PROJECT_CHANGE_EVENT_LISTENER_GROUP = "open_data_project_change_event_listener_group";
+
 }
diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java
index 4dfeaa3500..3f0c3066ec 100644
--- a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java
+++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java
@@ -43,4 +43,9 @@ public interface TopicConstants {
      * 巡查记录
      */
     String PATROL = "patrol";
+
+    /**
+     * 项目
+     */
+    String PROJECT = "project";
 }
diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/DisputeProcessMQMsg.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/DisputeProcessMQMsg.java
new file mode 100644
index 0000000000..30a1700054
--- /dev/null
+++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/DisputeProcessMQMsg.java
@@ -0,0 +1,22 @@
+package com.epmet.commons.rocketmq.messages;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/10/18 16:24
+ */
+@Data
+@AllArgsConstructor
+public class DisputeProcessMQMsg implements Serializable {
+    private String customerId;
+    private String projectId;
+    /**
+     * 操作类型【新增:add 修改删除:edit】
+     */
+    private String type;
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/form/EventInfoFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/form/EventInfoFormDTO.java
index dbbbe4bbf0..c8f9c78e71 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/form/EventInfoFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/form/EventInfoFormDTO.java
@@ -1,5 +1,7 @@
 package com.epmet.dto.basereport.form;
 
+import com.epmet.commons.tools.dto.form.PageFormDTO;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -10,7 +12,8 @@ import java.io.Serializable;
  * @Date 2021/10/15 10:55
  */
 @Data
-public class EventInfoFormDTO implements Serializable {
+@AllArgsConstructor
+public class EventInfoFormDTO extends PageFormDTO implements Serializable {
     private static final long serialVersionUID = 8479649048108914555L;
     private String customerId;
     private String projectId;
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectDataDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectDataDTO.java
index 180ac24fe5..d94c781d71 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectDataDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectDataDTO.java
@@ -197,4 +197,8 @@ public class ScreenProjectDataDTO implements Serializable {
 	 */
 	private String tempGridName;
 
+	private String finishOrg;
+
+	private String finishOrgLevel;
+
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml
index 4e19d8988d..cf2f0f200b 100644
--- a/epmet-module/data-statistical/data-statistical-server/pom.xml
+++ b/epmet-module/data-statistical/data-statistical-server/pom.xml
@@ -122,6 +122,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-message-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/ProjectChangedCustomListener.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/ProjectChangedCustomListener.java
index 1792654765..72e12ff5dc 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/ProjectChangedCustomListener.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/ProjectChangedCustomListener.java
@@ -2,6 +2,7 @@ package com.epmet.mq;
 
 import com.alibaba.fastjson.JSON;
 import com.epmet.commons.rocketmq.constants.MQUserPropertys;
+import com.epmet.commons.rocketmq.messages.DisputeProcessMQMsg;
 import com.epmet.commons.rocketmq.messages.ProjectChangedMQMsg;
 import com.epmet.commons.tools.distributedlock.DistributedLock;
 import com.epmet.commons.tools.exception.ExceptionUtils;
@@ -9,9 +10,11 @@ import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.utils.SpringContextUtils;
+import com.epmet.constant.SystemMessageType;
 import com.epmet.dto.extract.form.ExtractOriginFormDTO;
 import com.epmet.service.evaluationindex.extract.todata.FactOriginExtractService;
 import com.epmet.service.evaluationindex.extract.toscreen.ScreenExtractService;
+import com.epmet.service.evaluationindex.screen.ScreenProjectDataService;
 import com.epmet.util.DimIdGenerator;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -29,7 +32,6 @@ import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
 
 /**
  * @Description 项目变动-监听器
@@ -45,6 +47,7 @@ public class ProjectChangedCustomListener implements MessageListenerConcurrently
 
     private RedisUtils redisUtils;
 
+
     @Override
     public ConsumeConcurrentlyStatus consumeMessage(List<MessageExt> msgs, ConsumeConcurrentlyContext context) {
 
@@ -149,6 +152,16 @@ public class ProjectChangedCustomListener implements MessageListenerConcurrently
                 SpringContextUtils.getBean(ScreenExtractService.class).extractPartData(customerId,dateId);
             }
             logger.info("consumer projectChanged msg success,{}",aBoolean);
+
+            //发送项目数据上报的mq消息
+            String type;
+            if ("issue_shift_project".equals(msgObj.getOperation()) || "created".equals(msgObj.getOperation())) {
+                type = SystemMessageType.PROJECT_ADD;
+            } else {
+                type = SystemMessageType.PROJECT_EDIT;
+            }
+            DisputeProcessMQMsg msg = new DisputeProcessMQMsg(customerId, msgObj.getProjectId(), type);
+            SpringContextUtils.getBean(ScreenProjectDataService.class).sendProjectChangeMq(msg);
         } catch (RenException e) {
             // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试
             logger.error("【RocketMQ】消费项目变动消息失败:",e);
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectDataService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectDataService.java
index 2cf68852db..a29640a75b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectDataService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectDataService.java
@@ -18,6 +18,7 @@
 package com.epmet.service.evaluationindex.screen;
 
 import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.rocketmq.messages.DisputeProcessMQMsg;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.screen.ScreenProjectDataDTO;
 import com.epmet.dto.screen.form.ScreenProjectDataInfoFormDTO;
@@ -136,6 +137,15 @@ public interface ScreenProjectDataService extends BaseService<ScreenProjectDataE
      * @Author zhaoqifeng
      * @Date 2021/10/15 14:22
      */
-    List<ScreenProjectDataDTO> getProjectList(String customerId, String projectId);
+    List<ScreenProjectDataDTO> getProjectList(String customerId, String projectId, Integer pageNo, Integer pageSize);
+
+    /**
+     * 项目变更MQ
+     * @Param msg
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2021/10/18 15:55
+     */
+    void sendProjectChangeMq(DisputeProcessMQMsg msg);
 
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java
index 10678a2fbc..3d9d3db088 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java
@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.rocketmq.messages.DisputeProcessMQMsg;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
@@ -34,7 +35,10 @@ import com.epmet.dto.screen.form.ScreenProjectDataInfoFormDTO;
 import com.epmet.dto.screencoll.ScreenCollFormDTO;
 import com.epmet.entity.evaluationindex.screen.ScreenProjectDataEntity;
 import com.epmet.entity.evaluationindex.screen.ScreenProjectImgDataEntity;
+import com.epmet.feign.EpmetMessageOpenFeignClient;
+import com.epmet.send.SendMqMsgUtil;
 import com.epmet.service.evaluationindex.screen.ScreenProjectDataService;
+import com.github.pagehelper.PageHelper;
 import org.apache.commons.collections4.ListUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -62,6 +66,8 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
 
     @Resource
     private ScreenProjectImgDataDao screenProjectImgDataDao;
+    @Resource
+    private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
 
     @Override
     public PageData<ScreenProjectDataDTO> page(Map<String, Object> params) {
@@ -284,7 +290,8 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
      * @Date 2021/10/15 14:22
      */
     @Override
-    public List<ScreenProjectDataDTO> getProjectList(String customerId, String projectId) {
+    public List<ScreenProjectDataDTO> getProjectList(String customerId, String projectId, Integer pageNo, Integer pageSize) {
+        PageHelper.startPage(pageNo, pageSize);
         LambdaQueryWrapper<ScreenProjectDataEntity> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(customerId), ScreenProjectDataEntity::getCustomerId, customerId);
         wrapper.eq(StringUtils.isNotBlank(projectId), ScreenProjectDataEntity::getProjectId, projectId);
@@ -294,4 +301,16 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
         return ConvertUtils.sourceToTarget(list, ScreenProjectDataDTO.class);
     }
 
+    /**
+     * @Description 项目变更MQ
+     * @Param msg
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2021/10/18 14:00
+     */
+    @Override
+    public void sendProjectChangeMq(DisputeProcessMQMsg msg) {
+        SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendProjectMqMsg(msg);
+    }
+
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java
index 26b125af39..39e3f698a3 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java
@@ -148,7 +148,7 @@ public class DataReportingServiceImpl implements DataReportingService {
 	public List<BaseDisputeProcessDTO> getEventInfo(EventInfoFormDTO formDTO) {
 		List<BaseDisputeProcessDTO> list;
 		//根据入参，获取项目
-		List<ScreenProjectDataDTO> projectList = screenProjectDataService.getProjectList(formDTO.getCustomerId(), formDTO.getProjectId());
+		List<ScreenProjectDataDTO> projectList = screenProjectDataService.getProjectList(formDTO.getCustomerId(), formDTO.getProjectId(), formDTO.getPageNo(), formDTO.getPageSize());
 		//项目列表为空，返回空数组
 		if(CollectionUtils.isEmpty(projectList)) {
 			return Collections.emptyList();
@@ -206,6 +206,7 @@ public class DataReportingServiceImpl implements DataReportingService {
 				categoryCode = null;
 			}
 		}
+		dto.setEventCategory(categoryCode);
 		dto.setReportTime(project.getProjectCreateTime());
 		dto.setHappenDate(DateUtils.parseDate(DateUtils.format(project.getProjectCreateTime()), DateUtils.DATE_PATTERN));
 		dto.setEventDescription(project.getProjectContent());
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 9e502bd6ca..84580a3b4a 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,4 +75,14 @@ public interface SystemMessageType {
      */
     String USER_PATROL_STOP = "user_patrol_stop";
 
+    /**
+     * 项目变动
+     */
+    String PROJECT_ADD = "project_add";
+
+    /**
+     * 项目变动
+     */
+    String PROJECT_EDIT = "project_edit";
+
 }
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 551bb9d4ec..e232f5f635 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
@@ -182,4 +182,35 @@ public class SendMqMsgUtil {
 
     }
 
+    /**
+     * desc: 发送项目变动事件消息
+     *
+     * @param msgContent
+     * @return boolean
+     * @author LiuJanJun
+     * @date 2021/4/23 3:01 下午
+     * @remark 失败重试1次,调用端自行判断如果失败是否要继续执行
+     */
+    public boolean sendProjectMqMsg(DisputeProcessMQMsg msgContent) {
+        try {
+            SystemMsgFormDTO systemMsgFormDTO = new SystemMsgFormDTO();
+            systemMsgFormDTO.setMessageType(msgContent.getType());
+            systemMsgFormDTO.setContent(msgContent);
+            Result sendMsgResult;
+            log.info("sendProjectMqMsg param:{}",msgContent);
+            int retryTime = 0;
+            do {
+                sendMsgResult = epmetMessageOpenFeignClient.sendSystemMsgByMQ(systemMsgFormDTO);
+            } while ((sendMsgResult == null || !sendMsgResult.success()) && retryTime++ < NumConstant.TWO);
+
+            if (sendMsgResult != null && sendMsgResult.success()) {
+                return true;
+            }
+            log.error("发送(项目变动)系统消息到message服务失败:{},msg:{}", JSON.toJSONString(sendMsgResult), JSON.toJSONString(systemMsgFormDTO));
+        } catch (Exception e) {
+            log.error("sendMqMsg exception", e);
+        }
+        return false;
+    }
+
 }
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 dfd6737b57..0196a0aea7 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
@@ -183,6 +183,10 @@ public class SystemMessageServiceImpl implements SystemMessageService {
             case SystemMessageType.USER_PATROL_STOP:
                 topic = TopicConstants.PATROL;
                 break;
+            case SystemMessageType.PROJECT_ADD:
+            case SystemMessageType.PROJECT_EDIT:
+                topic = TopicConstants.PROJECT;
+                break;
         }
         return topic;
     }
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/RocketMQConsumerRegister.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/RocketMQConsumerRegister.java
index 2ffed8c3dd..3fa339bc0b 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/RocketMQConsumerRegister.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/RocketMQConsumerRegister.java
@@ -43,9 +43,9 @@ public class RocketMQConsumerRegister extends MQAbstractRegister {
                 "*",
                 new OpenDataPatrolChangeEventListener());
         register(consumerProperties,
-                ConsomerGroupConstants.PROJECT_CHANGED_COMPONENTS_GROUP,
+                ConsomerGroupConstants.OPEN_DATA_PROJECT_CHANGE_EVENT_LISTENER_GROUP,
                 MessageModel.CLUSTERING,
-                TopicConstants.PROJECT_CHANGED,
+                TopicConstants.PROJECT,
                 "*",
                 new OpenDataProjectChangeEventListener());
 
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataProjectChangeEventListener.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataProjectChangeEventListener.java
index e82e2cd8c9..c2af1cffe7 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataProjectChangeEventListener.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataProjectChangeEventListener.java
@@ -2,11 +2,13 @@ package com.epmet.opendata.mq.listener;
 
 import com.alibaba.fastjson.JSON;
 import com.epmet.commons.rocketmq.constants.MQUserPropertys;
+import com.epmet.commons.rocketmq.messages.DisputeProcessMQMsg;
 import com.epmet.commons.tools.distributedlock.DistributedLock;
 import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.redis.RedisUtils;
+import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.SpringContextUtils;
 import com.epmet.dto.basereport.form.EventInfoFormDTO;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
@@ -63,7 +65,8 @@ public class OpenDataProjectChangeEventListener implements MessageListenerConcur
         //messageExt.propert
 
         logger.info("【开放数据事件监听器】-项目信息变更-收到消息内容:{}, 操作:{}, pendingMsgLabel:{}", msg, tags, pendingMsgLabel);
-        EventInfoFormDTO obj = JSON.parseObject(msg, EventInfoFormDTO.class);
+        DisputeProcessMQMsg obj = JSON.parseObject(msg, DisputeProcessMQMsg.class);
+        EventInfoFormDTO formDTO = ConvertUtils.sourceToTarget(obj, EventInfoFormDTO.class);
 
         DistributedLock distributedLock = null;
         RLock lock = null;
@@ -71,7 +74,7 @@ public class OpenDataProjectChangeEventListener implements MessageListenerConcur
             distributedLock = SpringContextUtils.getBean(DistributedLock.class);
             lock = distributedLock.getLock(String.format("lock:open_data_project:%s", obj.getProjectId()),
                     30L, 30L, TimeUnit.SECONDS);
-            SpringContextUtils.getBean(BaseDisputeProcessService.class).getEventinfo(obj);
+            SpringContextUtils.getBean(BaseDisputeProcessService.class).getEventinfo(formDTO);
         } catch (RenException e) {
             // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试
             logger.error("【开放数据事件监听器】-项目信息变更-上报项目信息失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseDisputeProcessServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseDisputeProcessServiceImpl.java
index 0a0d18a9f0..d716762780 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseDisputeProcessServiceImpl.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseDisputeProcessServiceImpl.java
@@ -18,9 +18,11 @@
 package com.epmet.opendata.service.impl;
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.constant.SystemMessageType;
 import com.epmet.dto.basereport.form.EventInfoFormDTO;
 import com.epmet.feign.DataStatisticalOpenFeignClient;
 import com.epmet.opendata.dao.BaseDisputeProcessDao;
@@ -62,12 +64,27 @@ public class BaseDisputeProcessServiceImpl extends BaseServiceImpl<BaseDisputePr
         List<BaseDisputeProcessDTO> list = result.getData();
         if (CollectionUtils.isNotEmpty(list)) {
             List<BaseDisputeProcessEntity> entityList = ConvertUtils.sourceToTarget(list, BaseDisputeProcessEntity.class);
-            if("add".equals(formDTO.getType())){
+            if(SystemMessageType.PROJECT_ADD.equals(formDTO.getType())){
                 insertBatch(entityList);
             }else {
                 updateBatchById(entityList);
             }
         }
+        //分批次循环
+        while (CollectionUtils.isNotEmpty(list)) {
+            formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE);
+            result = dataStatisticalOpenFeignClient.getEventInfo(formDTO);
+            list = result.getData();
+            if (CollectionUtils.isNotEmpty(list)) {
+                List<BaseDisputeProcessEntity> entityList = ConvertUtils.sourceToTarget(list, BaseDisputeProcessEntity.class);
+                if("add".equals(formDTO.getType())){
+                    insertBatch(entityList);
+                }else {
+                    updateBatchById(entityList);
+                }
+            }
+        }
+
 
     }
 

From 21733738da679ca379a0c000138df62e0bb3d7f9 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Tue, 19 Oct 2021 10:50:50 +0800
Subject: [PATCH 02/12] =?UTF-8?q?=E5=8A=9E=E7=BB=93=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E5=92=8C=E5=8A=9E=E7=BB=93=E5=B1=82=E7=BA=A7=E8=AE=BE=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/screen/ScreenProjectDataDTO.java      |  3 +
 .../com/epmet/constant/OrgTypeConstant.java   | 10 +++
 .../com/epmet/constant/ProjectConstant.java   |  8 ++
 .../screen/ScreenProjectDataDao.java          |  2 +
 .../impl/ScreenProjectDataServiceImpl.java    |  9 +--
 .../impl/DataReportingServiceImpl.java        | 53 +++++++++++--
 .../screen/ScreenProjectDataDao.xml           | 78 +++++++++++++++++++
 7 files changed, 150 insertions(+), 13 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectDataDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectDataDTO.java
index d94c781d71..be5355aebc 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectDataDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectDataDTO.java
@@ -201,4 +201,7 @@ public class ScreenProjectDataDTO implements Serializable {
 
 	private String finishOrgLevel;
 
+	private String orgIdPath;
+
+	private String finishOrgType;
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/OrgTypeConstant.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/OrgTypeConstant.java
index 7c88be956c..3fa6ac0fdc 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/OrgTypeConstant.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/OrgTypeConstant.java
@@ -46,4 +46,14 @@ public interface OrgTypeConstant {
      */
     String COMMUNITY = "community";
 
+    /**
+     * 省级
+     */
+    String PROVINCE = "province";
+
+    /**
+     * 市级
+     */
+    String CITY = "city";
+
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/ProjectConstant.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/ProjectConstant.java
index e099b5f89d..6b9966b154 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/ProjectConstant.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/ProjectConstant.java
@@ -82,4 +82,12 @@ public interface ProjectConstant {
      */
     String PROJECT_ORIGIN_AGENCY="agency";
     String PROJECT_ORIGIN_EVENT="resi_event";
+    /**
+     * 自办
+     */
+    String PROJECT_SELF_CLOSED="01";
+    /**
+     * 上报
+     */
+    String PROJECT_REPORT="02";
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectDataDao.java
index 4083242997..97c85d1bc0 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectDataDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenProjectDataDao.java
@@ -66,4 +66,6 @@ public interface ScreenProjectDataDao extends BaseDao<ScreenProjectDataEntity> {
 	void deleteByProjectIds(@Param("customerId") String customerId, @Param("list") List<String> list);
 
 	int updateProjectSatisfactionScore(@Param("projectId")String projectId, @Param("score")BigDecimal score);
+
+    List<ScreenProjectDataDTO> selectProjectList(@Param("customerId") String customerId, @Param("projectId") String projectId);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java
index 3d9d3db088..f04234049e 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java
@@ -17,7 +17,6 @@
 
 package com.epmet.service.evaluationindex.screen.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
@@ -292,13 +291,7 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
     @Override
     public List<ScreenProjectDataDTO> getProjectList(String customerId, String projectId, Integer pageNo, Integer pageSize) {
         PageHelper.startPage(pageNo, pageSize);
-        LambdaQueryWrapper<ScreenProjectDataEntity> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(customerId), ScreenProjectDataEntity::getCustomerId, customerId);
-        wrapper.eq(StringUtils.isNotBlank(projectId), ScreenProjectDataEntity::getProjectId, projectId);
-        wrapper.ne(ScreenProjectDataEntity::getCategoryCode, null);
-        wrapper.ne(ScreenProjectDataEntity::getCategoryCode, "");
-        List<ScreenProjectDataEntity> list = baseDao.selectList(wrapper);
-        return ConvertUtils.sourceToTarget(list, ScreenProjectDataDTO.class);
+        return baseDao.selectProjectList(customerId, projectId);
     }
 
     /**
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java
index 39e3f698a3..721a827074 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java
@@ -210,18 +210,61 @@ public class DataReportingServiceImpl implements DataReportingService {
 		dto.setReportTime(project.getProjectCreateTime());
 		dto.setHappenDate(DateUtils.parseDate(DateUtils.format(project.getProjectCreateTime()), DateUtils.DATE_PATTERN));
 		dto.setEventDescription(project.getProjectContent());
-		//TODO 办结方式
-		dto.setWaysOfResolving("01");
 		dto.setSuccessfulOrNo(ProjectConstant.CLOSED_CASE.equals(project.getProjectStatusCode())?"Y":"N");
-		//TODO 办结层级
-		dto.setCompleteLevel("01");
+		if (ProjectConstant.CLOSED_CASE.equals(project.getProjectStatusCode())) {
+			dto.setWaysOfResolving(project.getOrgId().equals(project.getFinishOrg())?ProjectConstant.PROJECT_SELF_CLOSED:ProjectConstant.PROJECT_REPORT);
+			//办结组织是机关时，办结层级为机关的层级
+			if (OrgTypeConstant.AGENCY.equals(project.getFinishOrgType())) {
+				//如果是孔村的项目办结层级需要降一级
+				if("2fe0065f70ca0e23ce4c26fca5f1d933".equals(project.getCustomerId())) {
+					switch (project.getFinishOrgLevel()) {
+						case OrgTypeConstant.DISTRICT:
+							dto.setCompleteLevel("04");
+							break;
+						case OrgTypeConstant.STREET:
+						case OrgTypeConstant.COMMUNITY:
+							dto.setCompleteLevel("06");
+							break;
+						default:
+							break;
+					}
+				} else {
+					dto.setCompleteLevel(getCompleteLevel(project.getFinishOrgLevel()));
+				}
+			} else if (OrgTypeConstant.DEPARTMENT.equals(project.getFinishOrgType())) {
+				//办结组织是部门时，办结层级为部门所在组织的曾经
+				String[] orgIds = project.getOrgIdPath().split(StrConstant.COLON);
+				int size = orgIds.length;
+				ScreenCustomerAgencyEntity agency = screenCustomerAgencyService.getAgencyById(orgIds[size - 1]);
+				dto.setCompleteLevel(getCompleteLevel(agency.getLevel()));
+			} else {
+				//办结组织是网格时，办结层级为网格
+				dto.setCompleteLevel("07");
+			}
+		}
+
 		dto.setCompleteTime(project.getCloseCaseTime());
 		dto.setLat(project.getLatitude());
 		dto.setLng(project.getLongitude());
 		return dto;
 	}
 
-
+	private String getCompleteLevel(String level) {
+		switch (level) {
+			case OrgTypeConstant.PROVINCE:
+				return "01";
+			case OrgTypeConstant.CITY:
+				return "02";
+			case OrgTypeConstant.DISTRICT:
+				return "03";
+			case OrgTypeConstant.STREET:
+				return "04";
+			case OrgTypeConstant.COMMUNITY:
+				return "06";
+			default:
+				return null;
+		}
+	}
 
     @Override
     public List<MidPatrolRecordResult> getPatrolRecordList(MidPatrolFormDTO formDTO) {
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml
index db38763cb5..5930ae87c9 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml
@@ -191,4 +191,82 @@
         update screen_project_data set SATISFACTION_SCORE=#{score}
         where PROJECT_ID=#{projectId}
     </update>
+
+
+    <select id="selectProjectList" resultType="com.epmet.dto.screen.ScreenProjectDataDTO">
+        SELECT
+            a.ID,
+            a.CUSTOMER_ID,
+            a.ORG_TYPE,
+            a.ORG_ID,
+            a.PARENT_ID,
+            a.ORG_NAME,
+            a.PROJECT_ID,
+            a.PROJECT_TITLE,
+            a.PROJECT_CREATE_TIME,
+            a.LINK_USER_ID,
+            a.LINK_NAME,
+            a.LINK_MOBILE,
+            a.PROJECT_CONTENT,
+            a.PROJECT_LEVEL,
+            a.PROJECT_ADDRESS,
+            a.ALL_CATEGORY_NAME,
+            a.LONGITUDE,
+            a.LATITUDE,
+            a.SATISFACTION_SCORE,
+            a.PROJECT_STATUS_CODE,
+            a.CLOSE_CASE_TIME,
+            a.DATA_END_TIME,
+            a.ALL_PARENT_IDS,
+            a.ORIGIN,
+            a.CATEGORY_CODE,
+            b.HANDLER_ID AS finishOrg,
+            b.HANDLER_TYPE AS finishOrgType,
+            b.ORG_ID_PATH AS orgIdPath,
+            c.`LEVEL` AS finishOrgLevel
+        FROM
+            screen_project_data a
+            LEFT JOIN (
+            SELECT
+                spp.CUSTOMER_ID,
+                PROJECT_ID,
+                HANDLER_ID,
+                HANDLER_TYPE,
+                ORG_ID_PATH
+            FROM
+                screen_project_process spp
+            WHERE
+                ( spp.CUSTOMER_ID = '2fe0065f70ca0e23ce4c26fca5f1d933' OR spp.CUSTOMER_ID = '44876154d10d7cb7affd92000f84f833' OR spp.CUSTOMER_ID = '46c55cb862d6d5e6d05d2ab61a1cc07e' )
+                AND OPERATION = 'closed_case' UNION ALL
+            SELECT
+                spp.CUSTOMER_ID,
+                PROJECT_ID,
+                HANDLER_ID,
+                HANDLER_TYPE,
+                ORG_ID_PATH
+            FROM
+                screen_project_process spp
+            WHERE
+                ( spp.CUSTOMER_ID != '2fe0065f70ca0e23ce4c26fca5f1d933' AND spp.CUSTOMER_ID != '44876154d10d7cb7affd92000f84f833' AND spp.CUSTOMER_ID != '46c55cb862d6d5e6d05d2ab61a1cc07e' )
+                AND OPERATION = 'close'
+            ) b ON a.PROJECT_ID = b.PROJECT_ID
+            <if test='null != customerId and "" != customerId'>
+                AND b.CUSTOMER_ID = #{customerId}
+            </if>
+            <if test='null != projectId and "" != projectId'>
+                AND b.PROJECT_ID = #{projectId}
+            </if>
+            LEFT JOIN screen_customer_agency c ON b.HANDLER_ID = c.AGENCY_ID
+            WHERE a.DEL_FLAG = '0'
+            AND a.CATEGORY_CODE IS NOT NULL
+            AND a.CATEGORY_CODE != ''
+            <if test='null != customerId and "" != customerId'>
+                AND a.CUSTOMER_ID = #{customerId}
+            </if>
+            <if test='null != projectId and "" != projectId'>
+                AND a.PROJECT_ID = #{projectId}
+            </if>
+        ORDER BY
+            a.CREATED_TIME ASC
+    </select>
 </mapper>

From 4766365f75f22bc24f6bdad85bb9545dcfd95ed8 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Tue, 19 Oct 2021 15:54:37 +0800
Subject: [PATCH 03/12] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E4=B8=8A=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/basereport/form/EventInfoFormDTO.java    | 2 --
 .../screen/impl/ScreenCustomerAgencyServiceImpl.java            | 2 +-
 .../screen/impl/ScreenCustomerGridServiceImpl.java              | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/form/EventInfoFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/form/EventInfoFormDTO.java
index c8f9c78e71..ee5830567a 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/form/EventInfoFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/form/EventInfoFormDTO.java
@@ -1,7 +1,6 @@
 package com.epmet.dto.basereport.form;
 
 import com.epmet.commons.tools.dto.form.PageFormDTO;
-import lombok.AllArgsConstructor;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -12,7 +11,6 @@ import java.io.Serializable;
  * @Date 2021/10/15 10:55
  */
 @Data
-@AllArgsConstructor
 public class EventInfoFormDTO extends PageFormDTO implements Serializable {
     private static final long serialVersionUID = 8479649048108914555L;
     private String customerId;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerAgencyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerAgencyServiceImpl.java
index 972d8ef961..9f3510d049 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerAgencyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerAgencyServiceImpl.java
@@ -325,7 +325,7 @@ public class ScreenCustomerAgencyServiceImpl extends BaseServiceImpl<ScreenCusto
     @Override
     public Map<String, ScreenCustomerAgencyEntity> getAgencyList(String customerId) {
         LambdaQueryWrapper<ScreenCustomerAgencyEntity> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(customerId), ScreenCustomerAgencyEntity::getAgencyId, customerId);
+        wrapper.eq(StringUtils.isNotBlank(customerId), ScreenCustomerAgencyEntity::getCustomerId, customerId);
         List<ScreenCustomerAgencyEntity> list = baseDao.selectList(wrapper);
         if (CollectionUtils.isEmpty(list)) {
             return Collections.emptyMap();
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java
index c87c58f7fd..8c81b80bb9 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java
@@ -244,7 +244,7 @@ public class ScreenCustomerGridServiceImpl extends BaseServiceImpl<ScreenCustome
     @Override
     public Map<String, ScreenCustomerGridDTO> getGridList(String customerId) {
         LambdaQueryWrapper<ScreenCustomerGridEntity> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(customerId), ScreenCustomerGridEntity::getGridId, customerId);
+        wrapper.eq(StringUtils.isNotBlank(customerId), ScreenCustomerGridEntity::getCustomerId, customerId);
         List<ScreenCustomerGridEntity> list = baseDao.selectList(wrapper);
         return ConvertUtils.sourceToTarget(list, ScreenCustomerGridDTO.class).stream().collect(Collectors.toMap(ScreenCustomerGridDTO::getGridId, Function.identity()));
     }

From 74974212038bbd3d3d61e94ca0f9fca4df53aa5e Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Wed, 20 Oct 2021 09:07:26 +0800
Subject: [PATCH 04/12] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=83=A8=E9=97=A8=E7=BD=91=E6=A0=BCID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../opendata/dto/BaseDisputeProcessDTO.java   |   4 +
 .../com/epmet/opendata/dto/ExDeptDTO.java     |  81 +++++++++++++
 .../com/epmet/opendata/dao/ExDeptDao.java     |  33 +++++
 .../entity/BaseDisputeProcessEntity.java      |   4 +
 .../epmet/opendata/entity/ExDeptEntity.java   |  83 +++++++++++++
 .../epmet/opendata/service/ExDeptService.java |  97 +++++++++++++++
 .../impl/BaseDisputeProcessServiceImpl.java   |  11 ++
 .../service/impl/ExDeptServiceImpl.java       | 114 ++++++++++++++++++
 .../src/main/resources/mapper/ExDeptDao.xml   |  19 +++
 9 files changed, 446 insertions(+)
 create mode 100644 epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/ExDeptDTO.java
 create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/ExDeptDao.java
 create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/ExDeptEntity.java
 create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/ExDeptService.java
 create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/ExDeptServiceImpl.java
 create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/ExDeptDao.xml

diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/BaseDisputeProcessDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/BaseDisputeProcessDTO.java
index 38ab49fc12..2f377e9ac9 100644
--- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/BaseDisputeProcessDTO.java
+++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/BaseDisputeProcessDTO.java
@@ -44,6 +44,10 @@ public class BaseDisputeProcessDTO implements Serializable {
      */
 	private String customerId;
 
+    private Integer detpId;
+
+    private String reporterId;
+
     /**
      * 网格编码
      */
diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/ExDeptDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/ExDeptDTO.java
new file mode 100644
index 0000000000..cd092d52ba
--- /dev/null
+++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/ExDeptDTO.java
@@ -0,0 +1,81 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.opendata.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 部门（网格）中间表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-19
+ */
+@Data
+public class ExDeptDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * （市平台）部门id
+     */
+	private Integer deptId;
+
+    /**
+     * （市平台）父部门id
+     */
+	private Integer parentId;
+
+    /**
+     * 祖级列表
+     */
+	private String ancestors;
+
+    /**
+     * （市平台）部门/网格名称
+     */
+	private String fullName;
+
+    /**
+     * （市平台）部门/网格简称
+     */
+	private String deptName;
+
+    /**
+     * （市平台）部门/网格编码
+     */
+	private String deptCode;
+
+    /**
+     * 
+     */
+	private String gridCode;
+
+    /**
+     * （区县平台）部门id
+     */
+	private String deptIdQx;
+
+    /**
+     * （区县平台）部门/网格名称
+     */
+	private String deptNameQx;
+
+}
\ No newline at end of file
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/ExDeptDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/ExDeptDao.java
new file mode 100644
index 0000000000..23793ddf6d
--- /dev/null
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/ExDeptDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.opendata.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.opendata.entity.ExDeptEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 部门（网格）中间表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-19
+ */
+@Mapper
+public interface ExDeptDao extends BaseDao<ExDeptEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/BaseDisputeProcessEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/BaseDisputeProcessEntity.java
index c7266558ed..3f458a026a 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/BaseDisputeProcessEntity.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/BaseDisputeProcessEntity.java
@@ -44,6 +44,10 @@ public class BaseDisputeProcessEntity extends BaseEpmetEntity {
      */
 	private String customerId;
 
+	private Integer detpId;
+
+	private String reporterId;
+
     /**
      * 网格编码
      */
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/ExDeptEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/ExDeptEntity.java
new file mode 100644
index 0000000000..68bf992a26
--- /dev/null
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/ExDeptEntity.java
@@ -0,0 +1,83 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.opendata.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 部门（网格）中间表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-19
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ex_dept")
+public class ExDeptEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * （市平台）部门id
+     */
+	private Integer deptId;
+
+    /**
+     * （市平台）父部门id
+     */
+	private Integer parentId;
+
+    /**
+     * 祖级列表
+     */
+	private String ancestors;
+
+    /**
+     * （市平台）部门/网格名称
+     */
+	private String fullName;
+
+    /**
+     * （市平台）部门/网格简称
+     */
+	private String deptName;
+
+    /**
+     * （市平台）部门/网格编码
+     */
+	private String deptCode;
+
+    /**
+     * 
+     */
+	private String gridCode;
+
+    /**
+     * （区县平台）部门id
+     */
+	private String deptIdQx;
+
+    /**
+     * （区县平台）部门/网格名称
+     */
+	private String deptNameQx;
+
+}
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/ExDeptService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/ExDeptService.java
new file mode 100644
index 0000000000..644c06c673
--- /dev/null
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/ExDeptService.java
@@ -0,0 +1,97 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.opendata.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.opendata.dto.ExDeptDTO;
+import com.epmet.opendata.entity.ExDeptEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 部门（网格）中间表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-19
+ */
+public interface ExDeptService extends BaseService<ExDeptEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<ExDeptDTO>
+     * @author generator
+     * @date 2021-10-19
+     */
+    PageData<ExDeptDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<ExDeptDTO>
+     * @author generator
+     * @date 2021-10-19
+     */
+    List<ExDeptDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return ExDeptDTO
+     * @author generator
+     * @date 2021-10-19
+     */
+    ExDeptDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-10-19
+     */
+    void save(ExDeptDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-10-19
+     */
+    void update(ExDeptDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-10-19
+     */
+    void delete(String[] ids);
+
+    Map<String, Integer> getDeptMap();
+}
\ No newline at end of file
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseDisputeProcessServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseDisputeProcessServiceImpl.java
index d716762780..8068eda5cc 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseDisputeProcessServiceImpl.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseDisputeProcessServiceImpl.java
@@ -29,11 +29,13 @@ import com.epmet.opendata.dao.BaseDisputeProcessDao;
 import com.epmet.opendata.dto.BaseDisputeProcessDTO;
 import com.epmet.opendata.entity.BaseDisputeProcessEntity;
 import com.epmet.opendata.service.BaseDisputeProcessService;
+import com.epmet.opendata.service.ExDeptService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 事件信息表
@@ -45,6 +47,8 @@ import java.util.List;
 public class BaseDisputeProcessServiceImpl extends BaseServiceImpl<BaseDisputeProcessDao, BaseDisputeProcessEntity> implements BaseDisputeProcessService {
     @Resource
     private DataStatisticalOpenFeignClient dataStatisticalOpenFeignClient;
+    @Resource
+    private ExDeptService exDeptService;
 
     /**
      * 获取上报事件
@@ -61,9 +65,13 @@ public class BaseDisputeProcessServiceImpl extends BaseServiceImpl<BaseDisputePr
         if (!result.success()) {
             throw new RenException(result.getInternalMsg());
         }
+        Map<String, Integer> deptMap = exDeptService.getDeptMap();
         List<BaseDisputeProcessDTO> list = result.getData();
         if (CollectionUtils.isNotEmpty(list)) {
             List<BaseDisputeProcessEntity> entityList = ConvertUtils.sourceToTarget(list, BaseDisputeProcessEntity.class);
+            entityList.forEach(item -> {
+                item.setDetpId(deptMap.get(item.getOrgCode()));
+            });
             if(SystemMessageType.PROJECT_ADD.equals(formDTO.getType())){
                 insertBatch(entityList);
             }else {
@@ -77,6 +85,9 @@ public class BaseDisputeProcessServiceImpl extends BaseServiceImpl<BaseDisputePr
             list = result.getData();
             if (CollectionUtils.isNotEmpty(list)) {
                 List<BaseDisputeProcessEntity> entityList = ConvertUtils.sourceToTarget(list, BaseDisputeProcessEntity.class);
+                entityList.forEach(item -> {
+                    item.setDetpId(deptMap.get(item.getOrgCode()));
+                });
                 if("add".equals(formDTO.getType())){
                     insertBatch(entityList);
                 }else {
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/ExDeptServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/ExDeptServiceImpl.java
new file mode 100644
index 0000000000..a2bb40d070
--- /dev/null
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/ExDeptServiceImpl.java
@@ -0,0 +1,114 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.opendata.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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.tools.constant.FieldConstant;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.opendata.dao.ExDeptDao;
+import com.epmet.opendata.dto.ExDeptDTO;
+import com.epmet.opendata.entity.ExDeptEntity;
+import com.epmet.opendata.service.ExDeptService;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 部门（网格）中间表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-19
+ */
+@Service
+public class ExDeptServiceImpl extends BaseServiceImpl<ExDeptDao, ExDeptEntity> implements ExDeptService {
+
+
+    @Override
+    public PageData<ExDeptDTO> page(Map<String, Object> params) {
+        IPage<ExDeptEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, ExDeptDTO.class);
+    }
+
+    @Override
+    public List<ExDeptDTO> list(Map<String, Object> params) {
+        List<ExDeptEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, ExDeptDTO.class);
+    }
+
+    private QueryWrapper<ExDeptEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<ExDeptEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public ExDeptDTO get(String id) {
+        ExDeptEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, ExDeptDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(ExDeptDTO dto) {
+        ExDeptEntity entity = ConvertUtils.sourceToTarget(dto, ExDeptEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(ExDeptDTO dto) {
+        ExDeptEntity entity = ConvertUtils.sourceToTarget(dto, ExDeptEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+    @Override
+    public Map<String, Integer> getDeptMap() {
+        LambdaQueryWrapper<ExDeptEntity> wrapper = new LambdaQueryWrapper<>();
+        List<ExDeptEntity> entityList = baseDao.selectList(wrapper);
+        if (CollectionUtils.isEmpty(entityList)) {
+            return Collections.emptyMap();
+        }
+        return entityList.stream().collect(Collectors.toMap(ExDeptEntity::getGridCode, ExDeptEntity::getDeptId, (key1, key2) -> key2));
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/ExDeptDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/ExDeptDao.xml
new file mode 100644
index 0000000000..db24b07d11
--- /dev/null
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/ExDeptDao.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.opendata.dao.ExDeptDao">
+
+    <resultMap type="com.epmet.opendata.entity.ExDeptEntity" id="exDeptMap">
+        <result property="deptId" column="dept_id"/>
+        <result property="parentId" column="parent_id"/>
+        <result property="ancestors" column="ancestors"/>
+        <result property="fullName" column="full_name"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="deptCode" column="dept_code"/>
+        <result property="gridCode" column="grid_code"/>
+        <result property="deptIdQx" column="dept_id_qx"/>
+        <result property="deptNameQx" column="dept_name_qx"/>
+    </resultMap>
+
+
+</mapper>
\ No newline at end of file

From 32bd1cbde9ee7c0e32909752d3abafced662f418 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Wed, 20 Oct 2021 10:34:57 +0800
Subject: [PATCH 05/12] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=83=A8=E9=97=A8=E7=BD=91=E6=A0=BCID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-gateway/pom.xml                          | 4 ++--
 epmet-gateway/src/main/resources/bootstrap.yml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml
index 3d668a8b6f..d180c7cab9 100644
--- a/epmet-gateway/pom.xml
+++ b/epmet-gateway/pom.xml
@@ -365,8 +365,8 @@
 <!--                <gateway.routes.data-aggregator-server.url>http://127.0.0.1:8114</gateway.routes.data-aggregator-server.url>-->
 
                 <!-- 36、中间库服务 -->
-               <!-- <gateway.routes.open-data-worker-server.url>lb://open-data-worker-server</gateway.routes.open-data-worker-server.url>-->
-                <gateway.routes.open-data-worker-server.url>http://127.0.0.1:8117</gateway.routes.open-data-worker-server.url>
+                <gateway.routes.open-data-worker-server.url>lb://open-data-worker-server</gateway.routes.open-data-worker-server.url>
+<!--                <gateway.routes.open-data-worker-server.url>http://127.0.0.1:8117</gateway.routes.open-data-worker-server.url>-->
 
                 <!--宣传服务-->
                 <gateway.routes.epmet-openapi-adv-server.url>lb://epmet-openapi-adv-server</gateway.routes.epmet-openapi-adv-server.url>
diff --git a/epmet-gateway/src/main/resources/bootstrap.yml b/epmet-gateway/src/main/resources/bootstrap.yml
index 69423d078f..1f34bc71a1 100644
--- a/epmet-gateway/src/main/resources/bootstrap.yml
+++ b/epmet-gateway/src/main/resources/bootstrap.yml
@@ -1,4 +1,4 @@
-server:
+basedisputeprocessserver:
   tomcat:
     max-swallow-size: 100MB
   port: @server.port@
@@ -352,7 +352,7 @@ spring:
             - CpAuth=true
         #政府工作端议题管理
         - id: open-data-worker-server
-          uri: @gateway.routes.gov-issue-server.uri@
+          uri: @gateway.routes.open-data-worker-server.url@
           order: 38
           predicates:
             - Path=${server.servlet.context-path}/opendata/**

From 2e8f1b997f435c04f29e3190d7934f9dc31a637b Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 20 Oct 2021 17:42:27 +0800
Subject: [PATCH 06/12] =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=BD=91=E6=A0=BC?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/org/result/CustomerAgencyDTO.java     |  5 ++
 .../epmet/dto/org/result/CustomerGridDTO.java |  5 ++
 .../feign/DataStatisticalOpenFeignClient.java |  2 +-
 .../resources/mapper/org/CustomerGridDao.xml  |  5 +-
 .../mapper/org/StatsCustomerAgencyDao.xml     |  5 +-
 .../dto/form/GridBaseInfoFormDTO.java         |  2 +-
 .../com/epmet/opendata/dao/ExDeptDao.java     | 55 +++++++++++++
 .../epmet/opendata/entity/ExDeptEntity.java   | 53 ++++++++++++
 .../service/impl/BaseGridInfoServiceImpl.java | 48 ++++++++---
 .../src/main/resources/mapper/ExDeptDao.xml   | 82 +++++++++++++++++++
 10 files changed, 242 insertions(+), 20 deletions(-)
 create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/ExDeptDao.java
 create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/ExDeptEntity.java
 create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/ExDeptDao.xml

diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/org/result/CustomerAgencyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/org/result/CustomerAgencyDTO.java
index c78138e9bf..658a3e9c2d 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/org/result/CustomerAgencyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/org/result/CustomerAgencyDTO.java
@@ -78,6 +78,11 @@ public class CustomerAgencyDTO implements Serializable {
      */
 	private String areaCode;
 
+    /**
+     * 省组织编码
+     */
+	private String code;
+
     /**
      * 删除标识
      */
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/org/result/CustomerGridDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/org/result/CustomerGridDTO.java
index bcff1ea7b0..752bb721cd 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/org/result/CustomerGridDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/org/result/CustomerGridDTO.java
@@ -67,6 +67,11 @@ public class CustomerGridDTO implements Serializable {
      */
     private String areaCode;
 
+    /**
+     * 省网格编码
+     */
+    private String code;
+
     /**
      * 删除标识:0.未删除 1.已删除
      */
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java
index 50b339b697..88393ae128 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java
@@ -37,7 +37,7 @@ import java.util.List;
  */
 //url="http://localhost:8108"
 //@FeignClient(name = ServiceConstant.DATA_STATISTICAL_SERVER, fallback = DataStatisticalOpenFeignClientFallBack.class, url = "http://localhost:6666")
-@FeignClient(name = ServiceConstant.DATA_STATISTICAL_SERVER, fallbackFactory = DataStatisticalOpenFeignClientFallBackFactory.class)
+@FeignClient(name = ServiceConstant.DATA_STATISTICAL_SERVER, fallbackFactory = DataStatisticalOpenFeignClientFallBackFactory.class,url="http://localhost:8108")
 public interface DataStatisticalOpenFeignClient {
 
     /**
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerGridDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerGridDao.xml
index 5d637d31de..a3b0b4b23c 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerGridDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerGridDao.xml
@@ -131,10 +131,7 @@
             *
         FROM
             customer_grid
-        WHERE 1=1
-        <if test="orgIdList == null">
-            AND del_flag = '0'
-        </if>
+        WHERE del_flag = '0'
         AND customer_id = #{customerId}
         <if test="orgIdList != null and orgIdList.size() > 0">
             <foreach collection="orgIdList" item="gridId" open="AND id IN (" separator="," close=")">
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml
index e1e4d79131..8a7afd3d87 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml
@@ -209,10 +209,7 @@
             *
         FROM
             customer_agency
-        WHERE 1=1
-        <if test="orgIdList == null">
-            AND del_flag = '0'
-        </if>
+        WHERE del_flag = '0'
         AND customer_id = #{customerId}
         <if test="orgIdList != null and orgIdList.size() > 0">
             <foreach collection="orgIdList" item="agencyId" open="AND id IN (" separator="," close=")">
diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/GridBaseInfoFormDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/GridBaseInfoFormDTO.java
index c1952d1bcf..0b1910a2ea 100644
--- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/GridBaseInfoFormDTO.java
+++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/GridBaseInfoFormDTO.java
@@ -25,7 +25,7 @@ public class GridBaseInfoFormDTO implements Serializable {
      */
     private List<String> orgIdList;
     /**
-     * 操作类型【新增:add 修改删除:edit】
+     * 操作类型【新增:add 修改删除:edit  初始化所有数据:all】
      */
     private String type;
 
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/ExDeptDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/ExDeptDao.java
new file mode 100644
index 0000000000..fa088c958f
--- /dev/null
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/ExDeptDao.java
@@ -0,0 +1,55 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.opendata.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.opendata.entity.BaseGridInfoEntity;
+import com.epmet.opendata.entity.ExDeptEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 网格基础信息表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-15
+ */
+@Mapper
+public interface ExDeptDao extends BaseDao<ExDeptEntity> {
+
+    /**
+     * @Author sun
+     * @Description 网格基础信息批量更新部分字段
+     **/
+    int updateBatch(@Param("list") List<ExDeptEntity> entityList);
+
+    /**
+     * @Author sun
+     * @Description 网格基础信息批量更新部分字段
+     **/
+    int insertBatch(@Param("list") List<ExDeptEntity> entityList);
+
+    /**
+     * @Author sun
+     * @Description 网格基础信息批量更新部分字段
+     **/
+    int updateBatchGrid(@Param("list") List<ExDeptEntity> entityList);
+
+}
\ No newline at end of file
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/ExDeptEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/ExDeptEntity.java
new file mode 100644
index 0000000000..ecda9e6b11
--- /dev/null
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/ExDeptEntity.java
@@ -0,0 +1,53 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.opendata.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 部门（网格）中间表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-15
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ex_dept")
+public class ExDeptEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * （区县平台）部门id
+     */
+	private String deptIdQx;
+
+    /**
+     * （区县平台）部门/网格名称
+     */
+	private String deptNameQx;
+
+    /**
+     * 部门/网格编码
+     */
+	private String gridCode;
+
+}
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridInfoServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridInfoServiceImpl.java
index 1d4f4a1e17..7802dfc707 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridInfoServiceImpl.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridInfoServiceImpl.java
@@ -18,14 +18,17 @@
 package com.epmet.opendata.service.impl;
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.org.result.CustomerAgencyDTO;
 import com.epmet.dto.org.result.CustomerGridDTO;
 import com.epmet.feign.DataStatisticalOpenFeignClient;
 import com.epmet.opendata.dao.BaseGridInfoDao;
+import com.epmet.opendata.dao.ExDeptDao;
 import com.epmet.opendata.dto.form.GridBaseInfoFormDTO;
 import com.epmet.opendata.entity.BaseGridInfoEntity;
+import com.epmet.opendata.entity.ExDeptEntity;
 import com.epmet.opendata.service.BaseGridInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -44,6 +47,8 @@ import java.util.List;
 public class BaseGridInfoServiceImpl extends BaseServiceImpl<BaseGridInfoDao, BaseGridInfoEntity> implements BaseGridInfoService {
     @Autowired
     private DataStatisticalOpenFeignClient dataStatisticalOpenFeignClient;
+    @Autowired
+    private ExDeptDao exDeptDao;
 
     /**
      * @Author sun
@@ -52,13 +57,16 @@ public class BaseGridInfoServiceImpl extends BaseServiceImpl<BaseGridInfoDao, Ba
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void getAgencyBaseInfo(GridBaseInfoFormDTO formDTO) {
-        //1.查询网格基础信息
+        //1.查询组织基础信息
         Result<List<CustomerAgencyDTO>> result = dataStatisticalOpenFeignClient.getAgencyBaseInfo(formDTO);
         if (!result.success()) {
             throw new RenException(result.getInternalMsg());
         }
+        if (null == result.getData() || result.getData().size() < NumConstant.ONE) {
+            return;
+        }
         //2.中间库新增/修改数据
-        List<BaseGridInfoEntity> entityList = new ArrayList<>();
+        /*List<BaseGridInfoEntity> entityList = new ArrayList<>();
         result.getData().forEach(ag->{
             BaseGridInfoEntity entity = new BaseGridInfoEntity();
             entity.setCustomerId(ag.getCustomerId());
@@ -76,13 +84,22 @@ public class BaseGridInfoServiceImpl extends BaseServiceImpl<BaseGridInfoDao, Ba
             entity.setUpdatedBy(ag.getUpdatedBy());
             entity.setUpdatedTime(ag.getUpdatedTime());
             entityList.add(entity);
+        });*/
+        List<ExDeptEntity> ExList = new ArrayList<>();
+        result.getData().forEach(ag->{
+            ExDeptEntity entity = new ExDeptEntity();
+            entity.setDeptIdQx(ag.getId());
+            entity.setDeptNameQx(ag.getOrganizationName());
+            entity.setGridCode(ag.getCode());
+            ExList.add(entity);
         });
-        if("add".equals(formDTO.getType())){
-            insertBatch(entityList);
+        if(null!=formDTO.getType()&& "all".equals(formDTO.getType())){
+            exDeptDao.updateBatch(ExList);
         }else {
-            baseDao.updateBatch(entityList);
+            exDeptDao.insertBatch(ExList);
         }
 
+
     }
 
     /**
@@ -97,8 +114,11 @@ public class BaseGridInfoServiceImpl extends BaseServiceImpl<BaseGridInfoDao, Ba
         if (!result.success()) {
             throw new RenException(result.getInternalMsg());
         }
+        if (null == result.getData() || result.getData().size() < NumConstant.ONE) {
+            return;
+        }
         //2.中间库新增/修改数据
-        List<BaseGridInfoEntity> entityList = new ArrayList<>();
+        /*List<BaseGridInfoEntity> entityList = new ArrayList<>();
         result.getData().forEach(ag->{
             BaseGridInfoEntity entity = new BaseGridInfoEntity();
             entity.setCustomerId(ag.getCustomerId());
@@ -111,11 +131,19 @@ public class BaseGridInfoServiceImpl extends BaseServiceImpl<BaseGridInfoDao, Ba
             entity.setUpdatedBy(ag.getUpdatedBy());
             entity.setUpdatedTime(ag.getUpdatedTime());
             entityList.add(entity);
+        });*/
+        List<ExDeptEntity> ExList = new ArrayList<>();
+        result.getData().forEach(ag -> {
+            ExDeptEntity entity = new ExDeptEntity();
+            entity.setDeptIdQx(ag.getId());
+            entity.setDeptNameQx(ag.getGridName());
+            entity.setGridCode(ag.getCode());
+            ExList.add(entity);
         });
-        if("add".equals(formDTO.getType())){
-            insertBatch(entityList);
-        }else {
-            baseDao.updateBatch(entityList);
+        if (null != formDTO.getType() && "all".equals(formDTO.getType())) {
+            exDeptDao.updateBatchGrid(ExList);
+        } else {
+            exDeptDao.insertBatch(ExList);
         }
 
     }
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/ExDeptDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/ExDeptDao.xml
new file mode 100644
index 0000000000..9090a77af5
--- /dev/null
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/ExDeptDao.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.opendata.dao.ExDeptDao">
+
+    <update id="updateBatch">
+        UPDATE ex_dept
+        <trim prefix="set" suffixOverrides=",">
+
+            <trim prefix="dept_id_qx =(case" suffix="end),">
+                <foreach collection="list" item="item">
+                    <if test='null != item.deptIdQx'>
+                        when grid_code = #{item.gridCode} then #{item.deptIdQx}
+                    </if>
+                </foreach>
+            </trim>
+
+            <trim prefix="dept_name_qx =(case" suffix="end),">
+                <foreach collection="list" item="item">
+                    <if test='null != item.deptNameQx'>
+                        when grid_code = #{item.gridCode} then #{item.deptNameQx}
+                    </if>
+                </foreach>
+            </trim>
+
+        </trim>
+        WHERE
+        1=1
+        <foreach collection="list" item="item" open="AND(  " separator=" OR " index="index" close=")">
+            grid_code = #{item.gridCode}
+        </foreach>
+    </update>
+
+   <insert id="insertBatch">
+        INSERT INTO ex_dept
+        (
+            dept_id_qx,
+            dept_name_qx
+        )
+        VALUES
+        <foreach collection="list" item="i" separator=",">
+            (
+            #{i.deptIdQx},
+            #{i.deptNameQx}
+            )
+        </foreach>
+        ON DUPLICATE KEY
+        UPDATE
+            dept_id_qx = values(dept_id_qx),
+            dept_name_qx = values(dept_name_qx)
+    </insert>
+
+    <update id="updateBatchGrid">
+        UPDATE ex_dept
+        <trim prefix="set" suffixOverrides=",">
+
+            <trim prefix="dept_id_qx =(case" suffix="end),">
+                <foreach collection="list" item="item">
+                    <if test='null != item.deptIdQx'>
+                        when dept_name LIKE CONCAT(left(#{item.deptNameQx},2),'%',right(#{item.deptNameQx},2),if(LOCATE('第二', #{item.deptNameQx})>0,'%2','%1')) then #{item.deptIdQx}
+                    </if>
+                </foreach>
+            </trim>
+
+            <trim prefix="dept_name_qx =(case" suffix="end),">
+                <foreach collection="list" item="item">
+                    <if test='null != item.deptNameQx'>
+                        when dept_name LIKE CONCAT(left(#{item.deptNameQx},2),'%',right(#{item.deptNameQx},2),if(LOCATE('第二', #{item.deptNameQx})>0,'%2','%1')) then #{item.deptNameQx}
+                    </if>
+                </foreach>
+            </trim>
+
+        </trim>
+        WHERE
+        1=1
+        <foreach collection="list" item="item" open="AND(  " separator=" OR " index="index" close=")">
+            dept_name LIKE CONCAT(left(#{item.deptNameQx},2),'%',right(#{item.deptNameQx},2),if(LOCATE('第二', #{item.deptNameQx})>0,'%2','%1'))
+        </foreach>
+    </update>
+
+
+</mapper>
\ No newline at end of file

From f8eb5a6a3ec36a8ab431403cd9c1c331215d37e5 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 20 Oct 2021 17:56:50 +0800
Subject: [PATCH 07/12] ...

---
 epmet-gateway/src/main/resources/bootstrap.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-gateway/src/main/resources/bootstrap.yml b/epmet-gateway/src/main/resources/bootstrap.yml
index 1f34bc71a1..6db9fa47bb 100644
--- a/epmet-gateway/src/main/resources/bootstrap.yml
+++ b/epmet-gateway/src/main/resources/bootstrap.yml
@@ -1,4 +1,4 @@
-basedisputeprocessserver:
+server:
   tomcat:
     max-swallow-size: 100MB
   port: @server.port@

From 2ebfc657f10dc28b41544816bedd7ad9b8bd3fe7 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Wed, 20 Oct 2021 17:58:31 +0800
Subject: [PATCH 08/12] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=83=A8=E9=97=A8=E7=BD=91=E6=A0=BCID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/opendata/entity/ExDeptEntity.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/ExDeptEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/ExDeptEntity.java
index 8cc98bfc62..7a2d2e3ff8 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/ExDeptEntity.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/ExDeptEntity.java
@@ -18,7 +18,6 @@
 package com.epmet.opendata.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -31,7 +30,7 @@ import lombok.EqualsAndHashCode;
 @Data
 @EqualsAndHashCode(callSuper=false)
 @TableName("ex_dept")
-public class ExDeptEntity extends BaseEpmetEntity {
+public class ExDeptEntity {
 
 	private static final long serialVersionUID = 1L;
 

From 6a2c891acf05c6c1bfdd0a89e1642247a7673d12 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 21 Oct 2021 09:29:43 +0800
Subject: [PATCH 09/12] =?UTF-8?q?=E9=94=99=E6=8F=90url=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/feign/DataStatisticalOpenFeignClient.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java
index 88393ae128..50b339b697 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java
@@ -37,7 +37,7 @@ import java.util.List;
  */
 //url="http://localhost:8108"
 //@FeignClient(name = ServiceConstant.DATA_STATISTICAL_SERVER, fallback = DataStatisticalOpenFeignClientFallBack.class, url = "http://localhost:6666")
-@FeignClient(name = ServiceConstant.DATA_STATISTICAL_SERVER, fallbackFactory = DataStatisticalOpenFeignClientFallBackFactory.class,url="http://localhost:8108")
+@FeignClient(name = ServiceConstant.DATA_STATISTICAL_SERVER, fallbackFactory = DataStatisticalOpenFeignClientFallBackFactory.class)
 public interface DataStatisticalOpenFeignClient {
 
     /**

From c5f00e1aaca9040a508551bb8c60ce64e99c97d4 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Thu, 21 Oct 2021 14:00:00 +0800
Subject: [PATCH 10/12] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=83=A8=E9=97=A8=E7=BD=91=E6=A0=BCID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/DataReportingServiceImpl.java    | 1 +
 .../java/com/epmet/opendata/service/impl/ExDeptServiceImpl.java  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java
index 721a827074..8de94bfd77 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java
@@ -209,6 +209,7 @@ public class DataReportingServiceImpl implements DataReportingService {
 		dto.setEventCategory(categoryCode);
 		dto.setReportTime(project.getProjectCreateTime());
 		dto.setHappenDate(DateUtils.parseDate(DateUtils.format(project.getProjectCreateTime()), DateUtils.DATE_PATTERN));
+		dto.setHappenPlace(project.getProjectAddress());
 		dto.setEventDescription(project.getProjectContent());
 		dto.setSuccessfulOrNo(ProjectConstant.CLOSED_CASE.equals(project.getProjectStatusCode())?"Y":"N");
 		if (ProjectConstant.CLOSED_CASE.equals(project.getProjectStatusCode())) {
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/ExDeptServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/ExDeptServiceImpl.java
index a2bb40d070..44b519e95b 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/ExDeptServiceImpl.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/ExDeptServiceImpl.java
@@ -104,6 +104,7 @@ public class ExDeptServiceImpl extends BaseServiceImpl<ExDeptDao, ExDeptEntity>
     @Override
     public Map<String, Integer> getDeptMap() {
         LambdaQueryWrapper<ExDeptEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.ne(ExDeptEntity::getGridCode, null);
         List<ExDeptEntity> entityList = baseDao.selectList(wrapper);
         if (CollectionUtils.isEmpty(entityList)) {
             return Collections.emptyMap();

From 1cf71d92fd315b76a2e175d0687661696d0542a8 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Thu, 21 Oct 2021 15:38:17 +0800
Subject: [PATCH 11/12] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=83=A8=E9=97=A8=E7=BD=91=E6=A0=BCID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/screen/ScreenProjectDataDTO.java    | 2 ++
 .../entity/evaluationindex/screen/ScreenProjectDataEntity.java  | 2 ++
 .../extract/toscreen/impl/ScreenProjectSettleServiceImpl.java   | 1 +
 .../java/com/epmet/service/impl/DataReportingServiceImpl.java   | 1 +
 .../java/com/epmet/service/impl/SystemMessageServiceImpl.java   | 1 +
 5 files changed, 7 insertions(+)

diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectDataDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectDataDTO.java
index be5355aebc..dfd88c7e96 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectDataDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectDataDTO.java
@@ -132,6 +132,8 @@ public class ScreenProjectDataDTO implements Serializable {
      */
 	private BigDecimal latitude;
 
+	private String projectCreator;
+
     /**
      * 删除标识 0未删除；1已删除
      */
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectDataEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectDataEntity.java
index b53feaf6f6..85b81560e2 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectDataEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectDataEntity.java
@@ -160,4 +160,6 @@ public class ScreenProjectDataEntity extends BaseEpmetEntity {
 	 */
 	private BigDecimal satisfactionScore;
 
+	private String projectCreator;
+
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenProjectSettleServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenProjectSettleServiceImpl.java
index 529593abcc..744e0c61b6 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenProjectSettleServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenProjectSettleServiceImpl.java
@@ -85,6 +85,7 @@ public class ScreenProjectSettleServiceImpl implements ScreenProjectSettleServic
 					meta.setProjectCreateTime(projectInfo.getCreatedTime());
 					meta.setProjectTitle(projectInfo.getTitle());
 					meta.setOrigin(projectInfo.getOrigin());
+					meta.setProjectCreator(projectInfo.getCreatedBy());
 					if (ProjectConstant.PROJECT_ORIGIN_ISSUE.equals(projectInfo.getOrigin())) {
 
 						//来源于议题的，上面的initNewScreenProjectData，已经赋值orgType=grid, orgId:gridId
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java
index 8de94bfd77..a0b1931b29 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java
@@ -194,6 +194,7 @@ public class DataReportingServiceImpl implements DataReportingService {
 		dto.setId(project.getProjectId());
 		dto.setCustomerId(project.getCustomerId());
 		dto.setEventName(project.getProjectTitle());
+		dto.setReporterId(project.getProjectCreator());
 		String categoryCode = project.getCategoryCode().split(StrConstant.COMMA)[0];
 		//如果是孔村、榆山、锦水的项目需要关联分类字典表
 		if("2fe0065f70ca0e23ce4c26fca5f1d933".equals(project.getCustomerId()) ||
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 0196a0aea7..61373708df 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
@@ -212,6 +212,7 @@ public class SystemMessageServiceImpl implements SystemMessageService {
                 case TopicConstants.PATROL:
                 case TopicConstants.POINT:
                 case TopicConstants.STAFF:
+                case TopicConstants.PROJECT:
 
                     // 耗时较短。一个小时最多发送一次告警
                     if (l1LastAlertTime == null || (

From be0de5d61c16ceed1037dcd6329d7a3e66499fa7 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 21 Oct 2021 16:23:30 +0800
Subject: [PATCH 12/12] =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/ExDeptDao.xml                 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/ExDeptDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/ExDeptDao.xml
index 16dc58a61a..ba20d99170 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/ExDeptDao.xml
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/ExDeptDao.xml
@@ -46,13 +46,15 @@
         INSERT INTO ex_dept
         (
             dept_id_qx,
-            dept_name_qx
+            dept_name_qx,
+            grid_code
         )
         VALUES
         <foreach collection="list" item="i" separator=",">
             (
             #{i.deptIdQx},
-            #{i.deptNameQx}
+            #{i.deptNameQx},
+            #{i.gridCode}
             )
         </foreach>
         ON DUPLICATE KEY