Merge remote-tracking branch 'remotes/origin/dev_grid_platform' into dev

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/ScreenProjectDataCollController.java

@@ -1,7 +1,9 @@
 package com.epmet.controller.external;
 
+import com.epmet.commons.rocketmq.messages.DisputeProcessMQMsg;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.constant.SystemMessageType;
 import com.epmet.dto.screen.*;
 import com.epmet.dto.screen.form.CategoryDictFormDTO;
 import com.epmet.dto.screen.form.ScreenProjectDataInfoFormDTO;
@@ -13,6 +15,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @Description 事件/项目采集接口入口
  * @ClassName ScreenProjectDataCollController
@@ -135,6 +140,15 @@ public class ScreenProjectDataCollController {
         param.setCustomerId(customerId);
         ValidatorUtils.validateEntity(param, ScreenCollFormDTO.CustomerIdShowGroup.class, ScreenCollFormDTO.DateIdShowGroup.class, ScreenCollFormDTO.DataListShowGroup.class);
         projectDataService.collect(param);
+
+        //发送MQ消息，上报事件
+        param.getDataList().forEach(item -> {
+            List<String> projectList = new ArrayList<>();
+            projectList.add(item.getProjectId());
+            DisputeProcessMQMsg msg = new DisputeProcessMQMsg(param.getCustomerId(), projectList, SystemMessageType.PROJECT_ADD);
+            projectDataService.sendProjectChangeMq(msg);
+        });
+
         return new Result();
     }
 

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/ExDeptEntity.java

@@ -34,6 +34,7 @@ public class ExDeptEntity {
 
 	private static final long serialVersionUID = 1L;
 
+	private String customerId;
     /**
      * （市平台）部门id
      */

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/ExDeptService.java

@@ -32,7 +32,7 @@ import java.util.Map;
 public interface ExDeptService extends BaseService<ExDeptEntity> {
 
 
-    Map<String, Integer> getDeptMap();
+    Map<String, Integer> getDeptMap(String customerId);
 
     /**
      * @Author sun

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/ExUserService.java

@@ -31,7 +31,7 @@ import java.util.Map;
  */
 public interface ExUserService extends BaseService<ExUserEntity> {
 
-    Map<String, Integer> getUserMap();
+    Map<String, Integer> getUserMap(String customerId);
 
     /**
      * @Author sun

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseDisputeProcessServiceImpl.java

@@ -74,8 +74,8 @@ public class BaseDisputeProcessServiceImpl extends BaseServiceImpl<BaseDisputePr
         if (!result.success()) {
             throw new RenException(result.getInternalMsg());
         }
-        Map<String, Integer> deptMap = exDeptService.getDeptMap();
+        Map<String, Integer> deptMap = exDeptService.getDeptMap(formDTO.getCustomerId());
-        Map<String, Integer> userMap = exUserService.getUserMap();
+        Map<String, Integer> userMap = exUserService.getUserMap(formDTO.getCustomerId());
         List<EventInfoResultDTO> list = result.getData();
         saveEvent(formDTO, deptMap, userMap, list);
         //分批次循环

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/ExDeptServiceImpl.java

@@ -54,9 +54,9 @@ public class ExDeptServiceImpl extends BaseServiceImpl<ExDeptDao, ExDeptEntity>
 
 
     @Override
-    public Map<String, Integer> getDeptMap() {
+    public Map<String, Integer> getDeptMap(String customerId) {
         LambdaQueryWrapper<ExDeptEntity> wrapper = new LambdaQueryWrapper<>();
-        wrapper.isNotNull(ExDeptEntity::getGridCode);
+        wrapper.eq(ExDeptEntity::getQxCustomerId, customerId);
         List<ExDeptEntity> entityList = baseDao.selectList(wrapper);
         if (CollectionUtils.isEmpty(entityList)) {
             return Collections.emptyMap();

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/ExUserServiceImpl.java

@@ -51,8 +51,9 @@ public class ExUserServiceImpl extends BaseServiceImpl<ExUserDao, ExUserEntity>
     private DataStatisticalOpenFeignClient dataStatisticalOpenFeignClient;
 
     @Override
-    public Map<String, Integer> getUserMap() {
+    public Map<String, Integer> getUserMap(String customerId) {
         LambdaQueryWrapper<ExUserEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(ExUserEntity::getQxCustomerId, customerId);
         List<ExUserEntity> list = baseDao.selectList(wrapper);
         if (CollectionUtils.isEmpty(list)) {
             return Collections.emptyMap();