Merge branch 'dev_grid_platform' into develop

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

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

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

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;

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectDataDTO.java

@@ -197,4 +197,11 @@ public class ScreenProjectDataDTO implements Serializable {
 	 */
 	private String tempGridName;
 
+	private String finishOrg;
+
+	private String finishOrgLevel;
+
+	private String orgIdPath;
+
+	private String finishOrgType;
 }

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>

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

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

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

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

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

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java

@@ -17,11 +17,11 @@
 
 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;
 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 +34,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 +65,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,14 +289,21 @@ 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) {
-        LambdaQueryWrapper<ScreenProjectDataEntity> wrapper = new LambdaQueryWrapper<>();
+        PageHelper.startPage(pageNo, pageSize);
-        wrapper.eq(StringUtils.isNotBlank(customerId), ScreenProjectDataEntity::getCustomerId, customerId);
+        return baseDao.selectProjectList(customerId, projectId);
-        wrapper.eq(StringUtils.isNotBlank(projectId), ScreenProjectDataEntity::getProjectId, projectId);
+    }
-        wrapper.ne(ScreenProjectDataEntity::getCategoryCode, null);
+
-        wrapper.ne(ScreenProjectDataEntity::getCategoryCode, "");
+    /**
-        List<ScreenProjectDataEntity> list = baseDao.selectList(wrapper);
+     * @Description 项目变更MQ
-        return ConvertUtils.sourceToTarget(list, ScreenProjectDataDTO.class);
+     * @Param msg
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2021/10/18 14:00
+     */
+    @Override
+    public void sendProjectChangeMq(DisputeProcessMQMsg msg) {
+        SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendProjectMqMsg(msg);
     }
 
 }

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,21 +206,65 @@ 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());
-		//TODO 办结方式
-		dto.setWaysOfResolving("01");
 		dto.setSuccessfulOrNo(ProjectConstant.CLOSED_CASE.equals(project.getProjectStatusCode())?"Y":"N");
-		//TODO 办结层级
+		if (ProjectConstant.CLOSED_CASE.equals(project.getProjectStatusCode())) {
-		dto.setCompleteLevel("01");
+			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) {

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>

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

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

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

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());
 

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

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;
@@ -60,6 +62,19 @@ public class BaseDisputeProcessServiceImpl extends BaseServiceImpl<BaseDisputePr
             throw new RenException(result.getInternalMsg());
         }
         List<BaseDisputeProcessDTO> list = result.getData();
+        if (CollectionUtils.isNotEmpty(list)) {
+            List<BaseDisputeProcessEntity> entityList = ConvertUtils.sourceToTarget(list, BaseDisputeProcessEntity.class);
+            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())){
@@ -68,6 +83,8 @@ public class BaseDisputeProcessServiceImpl extends BaseServiceImpl<BaseDisputePr
                     updateBatchById(entityList);
                 }
             }
+        }
+
 
     }