Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into develop

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/EpmetHeartApplication.java

@@ -13,6 +13,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.scheduling.annotation.EnableAsync;
 
 /**
  * 模块
@@ -24,6 +25,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 @EnableDiscoveryClient
 @EnableFeignClients
 @ServletComponentScan
+@EnableAsync
 public class EpmetHeartApplication {
 
     public static void main(String[] args) {

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

@@ -30,11 +30,13 @@ import com.epmet.constant.IcCommunitySelfOrganizationConstant;
 import com.epmet.constant.UserDemandConstant;
 import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dao.IcCommunitySelfOrganizationDao;
+import com.epmet.dao.IcUserDemandRecDao;
 import com.epmet.dto.IcCommunitySelfOrganizationDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.form.demand.ServiceQueryFormDTO;
 import com.epmet.dto.result.CommunitySelfOrganizationListDTO;
 import com.epmet.dto.result.CommunitySelfOrganizationListResultDTO;
+import com.epmet.dto.result.ServicePointDTO;
 import com.epmet.dto.result.UploadImgResultDTO;
 import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.entity.IcCommunitySelfOrganizationEntity;
@@ -45,7 +47,6 @@ import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.feign.OssFeignClient;
 import com.epmet.service.IcCommunitySelfOrganizationPersonnelService;
 import com.epmet.service.IcCommunitySelfOrganizationService;
-import com.epmet.service.IcUserDemandRecService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
@@ -68,8 +69,6 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
@@ -85,13 +84,12 @@ import static com.epmet.commons.tools.utils.DateUtils.DATE_PATTERN;
  */
 @Service
 @Slf4j
-@EnableAsync
 public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCommunitySelfOrganizationDao, IcCommunitySelfOrganizationEntity> implements IcCommunitySelfOrganizationService {
 
     @Autowired
     private IcCommunitySelfOrganizationPersonnelService personnelService;
     @Autowired
-    private IcUserDemandRecService icUserDemandRecService;
+    private IcUserDemandRecDao icUserDemandRecDao;
     @Autowired
     private OssFeignClient ossFeignClient;
     @Autowired
@@ -307,7 +305,11 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
             throw new RenException(String.format("查询人员{%s}信息失败",tokenDto.getUserId()));
         }
         //获取单位积分
-        Map<String, Integer> pointMap = icUserDemandRecService.getServicePoint(tokenDto.getCustomerId(), UserDemandConstant.COMMUNITY_ORG);
+        List<ServicePointDTO> servicePointList = icUserDemandRecDao.getServicePoint(tokenDto.getCustomerId(), UserDemandConstant.COMMUNITY_ORG);
+        Map<String, Integer> pointMap = new HashMap<>();
+        if (CollectionUtils.isNotEmpty(servicePointList)){
+            pointMap = servicePointList.stream().collect(Collectors.toMap(ServicePointDTO::getServerId, ServicePointDTO::getPoint));
+        }
         formDTO.setAgencyId(staffInfo.getAgencyId());
         formDTO.setCustomerId(tokenDto.getCustomerId());
         final int[] i = {(formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize() + NumConstant.ONE};
@@ -316,11 +318,11 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
             PageInfo<CommunitySelfOrganizationListDTO> objectPageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectCommunitySelfOrganizationList(formDTO));
             result.setTotal(Integer.valueOf(String.valueOf(objectPageInfo.getTotal())));
             if (CollectionUtils.isNotEmpty(objectPageInfo.getList())){
-                objectPageInfo.getList().forEach(l -> {
+                for (CommunitySelfOrganizationListDTO l : objectPageInfo.getList()) {
                     l.setSort(i[NumConstant.ZERO]);
                     i[NumConstant.ZERO]++;
-                    l.setScore(null == pointMap.get(l.getOrgId())?NumConstant.ZERO:pointMap.get(l.getOrgId()));
-                });
+                    l.setScore(null == pointMap.get(l.getOrgId()) ? NumConstant.ZERO : pointMap.get(l.getOrgId()));
+                }
                 result.setList(objectPageInfo.getList());
             }
             return result;
@@ -329,10 +331,10 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
         if (CollectionUtils.isNotEmpty(resultDTOs)){
             result.setTotal(resultDTOs.size());
             AtomicReference<Integer> sort = new AtomicReference<>(NumConstant.ONE);
-            resultDTOs.forEach(r -> {
+            for (CommunitySelfOrganizationListDTO r : resultDTOs) {
                 r.setSort(sort.getAndSet(sort.get() + NumConstant.ONE));
-                r.setScore(null == pointMap.get(r.getOrgId())?NumConstant.ZERO:pointMap.get(r.getOrgId()));
-            });
+                r.setScore(null == pointMap.get(r.getOrgId()) ? NumConstant.ZERO : pointMap.get(r.getOrgId()));
+            }
             result.setList(resultDTOs);
         }
         return result;

epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml

@@ -30,12 +30,12 @@ spring:
       password: @spring.datasource.druid.password@
       #监控页面
       stat-view-servlet:
-        enabled: true
+        enabled: false
         #loginUsername: admin
         #loginPassword: admin
         allow:
       web-stat-filter:
-        enabled: true
+        enabled: false
       filters: stat,log4j2
   cloud:
     nacos:

epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml

@@ -30,12 +30,12 @@ spring:
       password: @spring.datasource.druid.password@
       #监控页面
       stat-view-servlet:
-        enabled: true
+        enabled: false
         #loginUsername: admin
         #loginPassword: admin
         allow:
       web-stat-filter:
-        enabled: true
+        enabled: false
       filters: stat,wall,log4j2
   # 数据迁移工具flyway
   flyway:

epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml

@@ -33,12 +33,12 @@ spring:
       password: @spring.datasource.druid.password@
       #监控页面
       stat-view-servlet:
-        enabled: true
+        enabled: false
         #loginUsername: admin
         #loginPassword: admin
         allow:
       web-stat-filter:
-        enabled: true
+        enabled: false
       filters: stat,wall,log4j2
   # 数据迁移工具flyway
   flyway:

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/ResiPartyMemberApplication.java

@@ -13,6 +13,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.scheduling.annotation.EnableAsync;
 
 /**
  * 模块
@@ -24,6 +25,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 @EnableDiscoveryClient
 @EnableFeignClients
 @ServletComponentScan
+@EnableAsync
 public class ResiPartyMemberApplication {
 
     public static void main(String[] args) {

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java

@@ -95,7 +95,6 @@ import java.util.stream.Collectors;
  */
 @Slf4j
 @Service
-@EnableAsync
 public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymemberStyleDao, IcPartymemberStyleEntity> implements IcPartymemberStyleService {
 
     @Resource

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

@@ -236,6 +236,7 @@ public class IcResiUserController implements ResultDataResolver {
         //推送MQ事件
         IcResiUserAddMQMsg mqMsg = new IcResiUserAddMQMsg();
         mqMsg.setCustomerId(tokenDto.getCustomerId());
+        log.info("customer id is {}",tokenDto.getCustomerId());
         mqMsg.setIcResiUser(resiUserId);
         SystemMsgFormDTO form = new SystemMsgFormDTO();
         form.setMessageType(SystemMessageType.IC_RESI_USER_EDIT);

epmet-user/epmet-user-server/src/main/java/com/epmet/mq/listener/ICWarnStatsEventListener.java

@@ -10,6 +10,7 @@ import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.utils.SpringContextUtils;
 import com.epmet.service.StatsResiWarnService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext;
 import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus;
@@ -27,6 +28,7 @@ import java.util.concurrent.TimeUnit;
  * @author wxz
  * @date 2021.10.13 15:21:48
 */
+@Slf4j
 public class ICWarnStatsEventListener implements MessageListenerConcurrently {
 
     private Logger logger = LoggerFactory.getLogger(getClass());
@@ -53,13 +55,14 @@ public class ICWarnStatsEventListener implements MessageListenerConcurrently {
         // msg即为消息体
         // tags为SystemMessageType.java中的项，为具体的操作，此处拿到tags，判断是创建还是变更，来做响应的后续操作即可
         String msg = new String(messageExt.getBody());
+        log.info("msg is {}",msg);
         String topic = messageExt.getTopic();
         String tags = messageExt.getTags();
         String pendingMsgLabel = messageExt.getUserProperty(MQUserPropertys.BLOCKED_MSG_LABEL);
 
         logger.info("【开放数据事件监听器】-居民信息变动-收到消息内容:{},操作:{}", msg, tags);
         IcResiUserAddMQMsg obj = JSON.parseObject(msg, IcResiUserAddMQMsg.class);
-
+        log.info("obj is {}",JSON.toJSONString(obj));
         DistributedLock distributedLock = null;
         RLock lock = null;
         try {