机构类型

src/main/java/com/zswl/dataservice/domain/mqtt/OperationMessage.java

@@ -46,7 +46,7 @@ public class OperationMessage extends SuperEntity {
     @Schema(description = "接收的消息是否超时")
     private Boolean isTimeOut;
 
-    @Schema(description = "处理标记")
+    @Schema(description = "处理标记，判断用那个业务方法处理")
     private String event;
 
     //------------------------关联的消息

src/main/java/com/zswl/dataservice/service/artemis/ArtemisService.java

@@ -100,6 +100,8 @@ public class ArtemisService extends SuperService {
                 isTimeOut = true;
             }
             log.info("textMessage: {}", msg);
+            String timeStr = DateUtils.paresTime(time, DateUtils.patternyyyySSS);
+            jsonObject.set("timeStr", timeStr);
             // --------------------处理业务 start------------------
             operationMessage.setMessageClass(messageClass);
             operationMessage.setData(jsonObject);

src/main/java/com/zswl/dataservice/service/artemis/OperationMessageService.java

@@ -119,9 +119,15 @@ public class OperationMessageService {
     public ResultContent addOperationMessage(OperationMessage entity) {
         entity.setTime(DateUtils.paresTime(System.currentTimeMillis(), DateUtils.patternyyyySSS));
         entity.setTtl(new Date(System.currentTimeMillis() + ttlMill));
+        if(entity.getIsTimeOut()) {
+            entity.setHandleMsg("超时不处理");
+        }
         operationMessageDao.save(entity);
-        // 处理消息
-        handleOperationMessage(entity);
+        boolean isTimeOut = entity.getIsTimeOut();
+        if(!isTimeOut) {
+            // 处理消息
+            handleOperationMessage(entity);
+        }
         return ResultContent.buildSuccess();
     }
 
@@ -132,7 +138,6 @@ public class OperationMessageService {
      * @return
      */
     public ResultContent handleOperationMessage(OperationMessage entity) {
-        boolean isTimeOut = entity.getIsTimeOut();
         String event = entity.getEvent();
         JSONObject json = (JSONObject) entity.getData();
         if (json.containsKey("data")) {

src/main/java/com/zswl/dataservice/service/payment/HxzService.java

@@ -10,22 +10,18 @@ import com.zswl.dataservice.model.hxz.ConsumTransactionsResult;
 import com.zswl.dataservice.model.payment.ServerTimeModel;
 import com.zswl.dataservice.model.payment.ServerTimeResult;
 import com.zswl.dataservice.service.base.SuperService;
-import com.zswl.dataservice.utils.CardUtil;
 import com.zswl.dataservice.utils.net.JsonUtil;
 import com.zswl.dataservice.utils.result.ResultContent;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.text.SimpleDateFormat;
 import java.time.DayOfWeek;
 import java.time.LocalDate;
 import java.util.Date;
-import java.util.LinkedHashMap;
 import java.util.Map;
-import java.util.Objects;
 
 /**
  * @author TRX