fix："心跳上传增加PLC版本，优化参数推送功能"

src/main/java/com/szwl/controller/ApkInfoController.java

@@ -28,7 +28,7 @@ import java.util.List;
  * Controller - apk信息
  */
 @Controller("appApkInfoController")
-@RequestMapping("api/appApkInfo")
+@RequestMapping("/api/appApkInfo")
 public class ApkInfoController {
     @Autowired
     TApkInfoService tApkInfoService;
@@ -51,9 +51,11 @@ public class ApkInfoController {
         query.eq(TApkInfo::getModel, model);
         query.orderByDesc(TApkInfo::getVersion);
         List<TApkInfo> list = tApkInfoService.list(query);
-        TApkInfo info = list.get(0);
-        if (info != null) {
-            return JSONObject.toJSONString(info);
+        if (list.size() > 0) {
+            TApkInfo info = list.get(0);
+            if (info != null) {
+                return JSONObject.toJSONString(info);
+            }
         }
         return "没有版本数据";
     }

src/main/java/com/szwl/controller/TEquipmentController.java

@@ -25,6 +25,7 @@ import com.szwl.constant.ResponseCodesEnum;
 import com.szwl.exception.BizException;
 import com.szwl.manager.TokenManager;
 import com.szwl.model.bean.*;
+import com.szwl.model.bo.ParamBo;
 import com.szwl.model.bo.R;
 import com.szwl.model.bo.ResponseModel;
 import com.szwl.model.bo.UserDetailBO;
@@ -1572,7 +1573,12 @@ public class TEquipmentController {
             String clientId = equipment.getClientId();
             String name = commonParamVo.getName();
             String val = commonParamVo.getVal();
-            String message = PushUtils.buildJson(OperationType.PARAM.getCode(), name + ":" + val).toString();
+            String code = commonParamVo.getCode();
+            ParamBo paramBo = new ParamBo();
+            paramBo.setName(name);
+            paramBo.setVal(val);
+            paramBo.setStatus(code);
+            String message = PushUtils.buildJson(OperationType.PARAM.getCode(), JSON.toJSONString(paramBo)).toString();
             tEquipmentService.sendRemoteMessage(clientId, OperationType.PARAM, message, adminId);
             // MQ消息
             tEquipmentService.sentMessage(clientId, PushUtils.buildJson("Param", name + ":" + val).toString());
@@ -1594,6 +1600,7 @@ public class TEquipmentController {
             String clientId = equipment.getClientId();
             String name = commonParamVo.getName();
             String val = commonParamVo.getVal();
+
             String message = PushUtils.buildJson(OperationType.HUMIDITY_PARAMETERS.getCode(), name + ":" + val).toString();
             tEquipmentService.sendRemoteMessage(clientId, OperationType.HUMIDITY_PARAMETERS, message, adminId);
             // MQ消息

src/main/java/com/szwl/handle/response/HeartProcessor.java

@@ -97,6 +97,8 @@ public class HeartProcessor implements ResponseProcessor {
                     equipment.setApkVersion(heartParam.getApkVersion());
                 }
 
+
+                equipment.setPlcVersion(heartParam.getPlcVersion());
                 equipment.setGtClientId(heartParam.getGtClientId());
                 equipment.setLatitude(heartParam.getLatitude());
                 equipment.setLongitude(heartParam.getLongitude());

src/main/java/com/szwl/model/bo/ParamBo.java

@@ -0,0 +1,17 @@
+package com.szwl.model.bo;
+
+import com.szwl.model.bean.CommonParamVo;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ParamBo {
+
+    private String name;
+
+    private String val;
+
+    private String status;
+
+}

src/main/java/com/szwl/model/jsonParm/HeartParam.java

@@ -37,6 +37,9 @@ public class HeartParam {
     @JsonProperty("gtClientId")
     private String gtClientId;
 
+    @JsonProperty("plcVersion")
+    private String plcVersion;
+
     @JsonProperty("is_sleep")
     private boolean isSleep;