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

epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/StaffPatrolMQMsg.java

@@ -18,11 +18,4 @@ public class StaffPatrolMQMsg {
      */
     private String patrolId;
 
-    /**
-     * 操作类型
-     * SystemMessageType.USER_PATROL_START
-     * SystemMessageTypSTOP
-     */
-    private String actionType;
-
 }

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/send/SendMqMsgUtil.java

@@ -135,10 +135,10 @@ public class SendMqMsgUtil {
      * @author wxz
      * @date 2021.06.21 12:46
      */
-    public boolean sendPatrolMqMsg(StaffPatrolMQMsg msg) {
+    public boolean sendPatrolMqMsg(StaffPatrolMQMsg msg,String messageType) {
         try {
             SystemMsgFormDTO msgForm = new SystemMsgFormDTO();
-            msgForm.setMessageType(msg.getActionType());
+            msgForm.setMessageType(messageType);
             msgForm.setContent(msg);
             Result sendMsgResult = null;
             log.info("sendPatrolMqMsg param:{}",msgForm);

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/UserPatrolRecordController.java

@@ -17,8 +17,13 @@
 
 package com.epmet.opendata.controller;
 
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.opendata.dto.form.UpsertPatrolRecordForm;
 import com.epmet.opendata.service.UserPatrolRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -36,4 +41,14 @@ public class UserPatrolRecordController {
     @Autowired
     private UserPatrolRecordService userPatrolRecordService;
 
+    /**
+     * @Author sun
+     * @Description 网格员信息中间库同步
+     **/
+    @PostMapping("patrol")
+    public Result getStaffBaseInfo(@RequestBody(required = false) UpsertPatrolRecordForm formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        userPatrolRecordService.upsertPatrolRecord(formDTO);
+        return new Result();
+    }
 }

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataPatrolChangeEventListener.java

@@ -75,8 +75,7 @@ public class OpenDataPatrolChangeEventListener implements MessageListenerConcurr
             UpsertPatrolRecordForm patrolRecordForm = new UpsertPatrolRecordForm();
             patrolRecordForm.setCustomerId(msgObj.getCustomerId());
             patrolRecordForm.setPatrolId(msgObj.getPatrolId());
-            patrolRecordForm.setActionType(msgObj.getActionType());
-
+            patrolRecordForm.setActionType(tags);
             Boolean aBoolean = SpringContextUtils.getBean(UserPatrolRecordService.class).upsertPatrolRecord(patrolRecordForm);
         } catch (RenException e) {
             // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试

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

@@ -157,7 +157,7 @@ public class UserPatrolRecordServiceImpl extends BaseServiceImpl<UserPatrolRecor
         MidPatrolFormDTO midPatrolFormDTO = new MidPatrolFormDTO();
         midPatrolFormDTO.setCustomerId(patrolRecordForm.getCustomerId());
         midPatrolFormDTO.setPatrolId(patrolRecordForm.getPatrolId());
-        midPatrolFormDTO.setPageNo(0);
+        midPatrolFormDTO.setPageNo(1);
         midPatrolFormDTO.setPageSize(1);
         return midPatrolFormDTO;
     }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java

@@ -281,16 +281,15 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 
 	}
 
-	private void sendPatrolMsg(StaffPatrolRecordEntity record, String userPatrolStop) {
+	private void sendPatrolMsg(StaffPatrolRecordEntity record, String messageType) {
 		//发送巡查消息
 		StaffPatrolMQMsg staffPatrolMQMsg = new StaffPatrolMQMsg();
 		staffPatrolMQMsg.setCustomerId(record.getCustomerId());
 		staffPatrolMQMsg.setPatrolId(record.getId());
-		staffPatrolMQMsg.setActionType(userPatrolStop);
 
-		boolean b = SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendPatrolMqMsg(staffPatrolMQMsg);
+		boolean b = SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendPatrolMqMsg(staffPatrolMQMsg,messageType);
 		if (!b) {
-			log.error( "发送{}巡查消息到mq失败，patrolId:{}", userPatrolStop, record.getId());
+			log.error( "发送{}巡查消息到mq失败，patrolId:{}", messageType, record.getId());
 		}
 	}