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

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/ApplicationFailedEventListener.java

@@ -13,6 +13,7 @@ import com.dingtalk.api.DefaultDingTalkClient;
 import com.dingtalk.api.DingTalkClient;
 import com.dingtalk.api.request.OapiRobotSendRequest;
 import com.dingtalk.api.response.OapiRobotSendResponse;
+import com.epmet.commons.tools.constant.DingDingRobotConstant;
 import com.epmet.commons.tools.enums.EnvEnum;
 import com.epmet.commons.tools.utils.SpringContextUtils;
 import com.taobao.api.ApiException;
@@ -56,7 +57,7 @@ public class ApplicationFailedEventListener implements ApplicationListener<Appli
     }
 
     private void sendDingMarkDownMsg(Throwable exception) {
-        DingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/robot/send?access_token=ffd7c972b0525e249283df1a16b65a8b9d0012601f3a458dfc588c2eac497bb5");
+        DingTalkClient client = new DefaultDingTalkClient(DingDingRobotConstant.DEPLOY_ROBOT);
         OapiRobotSendRequest request = new OapiRobotSendRequest();
         request.setMsgtype("markdown");
         OapiRobotSendRequest.Markdown markdown = new OapiRobotSendRequest.Markdown();

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/ApplicationReadyEventListener.java

@@ -13,6 +13,7 @@ import com.dingtalk.api.DefaultDingTalkClient;
 import com.dingtalk.api.DingTalkClient;
 import com.dingtalk.api.request.OapiRobotSendRequest;
 import com.dingtalk.api.response.OapiRobotSendResponse;
+import com.epmet.commons.tools.constant.DingDingRobotConstant;
 import com.epmet.commons.tools.enums.EnvEnum;
 import com.epmet.commons.tools.utils.SpringContextUtils;
 import com.taobao.api.ApiException;
@@ -57,7 +58,7 @@ public class ApplicationReadyEventListener implements ApplicationListener<Applic
     }
 
     private void sendDingMarkDownMsg() {
-        DingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/robot/send?access_token=ffd7c972b0525e249283df1a16b65a8b9d0012601f3a458dfc588c2eac497bb5");
+        DingTalkClient client = new DefaultDingTalkClient(DingDingRobotConstant.DEPLOY_ROBOT);
         OapiRobotSendRequest request = new OapiRobotSendRequest();
         request.setMsgtype("markdown");
         OapiRobotSendRequest.Markdown markdown = new OapiRobotSendRequest.Markdown();

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/DingDingRobotConstant.java

@@ -12,4 +12,14 @@ public interface DingDingRobotConstant {
      */
     String V3_ROBOT_URL="https://oapi.dingtalk.com/robot/send?access_token=75e9ab857536f3018baa09009646876edbd263d07521a1a22eedfc3852623614";
     String V3_ROBOT_SECRET="SECdc8d3fb6780faa919f38fd43783f76d111255036c3b5bdcbc086dff023ee84d5";
+
+    /**
+     * 产品后端开发小组-  部署成功通知（这个已废弃）改为DEPLOY_ROBOT
+     */
+    // String BACKEND_DEV_GROUP_DEPLOY="https://oapi.dingtalk.com/robot/send?access_token=ffd7c972b0525e249283df1a16b65a8b9d0012601f3a458dfc588c2eac497bb5";
+
+    /**
+     * 开发测试-报警群的服务监控助理机器人
+     */
+    String DEPLOY_ROBOT="https://oapi.dingtalk.com/robot/send?access_token=5dfbde0c814a43d72e3e7f02385db87df1fc8231cff30728d8df1d1b58a00998";
 }

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;
@@ -91,7 +90,7 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
     @Autowired
     private IcCommunitySelfOrganizationPersonnelService personnelService;
     @Autowired
-    private IcUserDemandRecService icUserDemandRecService;
+    private IcUserDemandRecDao icUserDemandRecDao;
     @Autowired
     private OssFeignClient ossFeignClient;
     @Autowired
@@ -307,7 +306,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 +319,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 +332,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-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

@@ -232,6 +232,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 {