参数修正以及时间自动填充

pole-service/src/main/java/com/zksy/pole/config/MyMetaObjectHandler.java

@@ -0,0 +1,22 @@
+package com.zksy.pole.config;
+
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import org.apache.ibatis.reflection.MetaObject;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+@Component
+public class MyMetaObjectHandler implements MetaObjectHandler {
+
+    @Override
+    public void insertFill(MetaObject metaObject) {
+        this.strictInsertFill(metaObject, "createTime", Date.class, new Date());
+        this.strictInsertFill(metaObject, "updateTime", Date.class, new Date());
+    }
+
+    @Override
+    public void updateFill(MetaObject metaObject) {
+        this.strictUpdateFill(metaObject, "updateTime", Date.class, new Date());
+    }
+}

pole-service/src/main/java/com/zksy/pole/domain/po/DgEquipmentAlarm.java

@@ -57,7 +57,7 @@ public class DgEquipmentAlarm implements Serializable {
     /**
      * 创建时间
      */
-    @TableField(value = "update_time", fill = FieldFill.INSERT)
+    @TableField(fill = FieldFill.INSERT)
     private Date createTime;
 
     /**
@@ -68,7 +68,7 @@ public class DgEquipmentAlarm implements Serializable {
     /**
      * 更新时间
      */
-    @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date updateTime;
 
     @TableField(exist = false)

pole-service/src/main/java/com/zksy/pole/domain/po/DgEquipmentStatus.java

@@ -1,9 +1,7 @@
 package com.zksy.pole.domain.po;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
+
 import java.io.Serializable;
 import java.util.Date;
 import lombok.Data;
@@ -18,7 +16,7 @@ public class DgEquipmentStatus implements Serializable {
     /**
      * 主键
      */
-    @TableId
+    @TableId(value = "id", type = IdType.ASSIGN_UUID)
     private String id;
 
     /**
@@ -44,6 +42,7 @@ public class DgEquipmentStatus implements Serializable {
     /**
      * 创建时间
      */
+    @TableField(fill = FieldFill.INSERT)
     private Date createTime;
 
     /**
@@ -54,6 +53,7 @@ public class DgEquipmentStatus implements Serializable {
     /**
      * 更新时间
      */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date updateTime;
 
     @TableField(exist = false)

pole-service/src/main/java/com/zksy/pole/domain/po/DgGatewayStrategy.java

@@ -1,9 +1,7 @@
 package com.zksy.pole.domain.po;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
+
 import java.io.Serializable;
 import java.util.Date;
 import lombok.Data;
@@ -18,7 +16,7 @@ public class DgGatewayStrategy implements Serializable {
     /**
      * 主键
      */
-    @TableId
+    @TableId(value = "id", type = IdType.ASSIGN_UUID)
     private String id;
 
     /**
@@ -49,6 +47,7 @@ public class DgGatewayStrategy implements Serializable {
     /**
      * 创建时间
      */
+    @TableField(fill = FieldFill.INSERT)
     private Date createTime;
 
     /**
@@ -59,6 +58,7 @@ public class DgGatewayStrategy implements Serializable {
     /**
      * 更新时间
      */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date updateTime;
 
     @TableField(exist = false)

pole-service/src/main/java/com/zksy/pole/domain/po/DgLampControlledHeartbeat.java

@@ -1,9 +1,7 @@
 package com.zksy.pole.domain.po;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
+
 import java.io.Serializable;
 import java.util.Date;
 import lombok.Data;
@@ -18,7 +16,7 @@ public class DgLampControlledHeartbeat implements Serializable {
     /**
      * 主键
      */
-    @TableId
+    @TableId(value = "id", type = IdType.ASSIGN_UUID)
     private String id;
 
     /**
@@ -49,6 +47,7 @@ public class DgLampControlledHeartbeat implements Serializable {
     /**
      * 创建时间
      */
+    @TableField(fill = FieldFill.INSERT)
     private Date createTime;
 
     /**
@@ -59,6 +58,7 @@ public class DgLampControlledHeartbeat implements Serializable {
     /**
      * 更新时间
      */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date updateTime;
 
     @TableField(exist = false)

pole-service/src/main/java/com/zksy/pole/domain/po/DgRelayControl.java

@@ -1,9 +1,7 @@
 package com.zksy.pole.domain.po;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
+
 import java.io.Serializable;
 import java.util.Date;
 import lombok.Data;
@@ -18,7 +16,7 @@ public class DgRelayControl implements Serializable {
     /**
      * 主键
      */
-    @TableId
+    @TableId(value = "id", type = IdType.ASSIGN_UUID)
     private String id;
 
     /**
@@ -44,6 +42,7 @@ public class DgRelayControl implements Serializable {
     /**
      * 创建时间
      */
+    @TableField(fill = FieldFill.INSERT)
     private Date createTime;
 
     /**
@@ -54,6 +53,7 @@ public class DgRelayControl implements Serializable {
     /**
      * 更新时间
      */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date updateTime;
 
     @TableField(exist = false)

pole-service/src/main/java/com/zksy/pole/domain/po/DgRelayTimingStrategy.java

@@ -1,9 +1,7 @@
 package com.zksy.pole.domain.po;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
+
 import java.io.Serializable;
 import java.util.Date;
 import lombok.Data;
@@ -18,7 +16,7 @@ public class DgRelayTimingStrategy implements Serializable {
     /**
      * 主键
      */
-    @TableId
+    @TableId(value = "id", type = IdType.ASSIGN_UUID)
     private String id;
 
     /**
@@ -49,6 +47,7 @@ public class DgRelayTimingStrategy implements Serializable {
     /**
      * 创建时间
      */
+    @TableField(fill = FieldFill.INSERT)
     private Date createTime;
 
     /**
@@ -59,6 +58,7 @@ public class DgRelayTimingStrategy implements Serializable {
     /**
      * 更新时间
      */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date updateTime;
 
     @TableField(exist = false)

pole-service/src/main/java/com/zksy/pole/domain/po/DgReportEnvironmentalData.java

@@ -18,7 +18,7 @@ public class DgReportEnvironmentalData implements Serializable {
     /**
      * 主键
      */
-    @TableId
+    @TableId(value = "id", type = IdType.ASSIGN_UUID)
     private String id;
 
     /**

pole-service/src/main/java/com/zksy/pole/domain/po/DgTimelyControl.java

@@ -1,9 +1,7 @@
 package com.zksy.pole.domain.po;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
+
 import java.io.Serializable;
 import java.util.Date;
 import lombok.Data;
@@ -18,7 +16,7 @@ public class DgTimelyControl implements Serializable {
     /**
      * 主键
      */
-    @TableId
+    @TableId(value = "id", type = IdType.ASSIGN_UUID)
     private String id;
 
     /**
@@ -49,6 +47,7 @@ public class DgTimelyControl implements Serializable {
     /**
      * 创建时间
      */
+    @TableField(fill = FieldFill.INSERT)
     private Date createTime;
 
     /**
@@ -59,6 +58,7 @@ public class DgTimelyControl implements Serializable {
     /**
      * 更新时间
      */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date updateTime;
 
     @TableField(exist = false)

pole-service/src/main/java/com/zksy/pole/factory/HandleCmdFactory.java

@@ -12,6 +12,8 @@ import com.zksy.pole.mapper.DgGatewayRegistrationMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
+
 @Component
 public class HandleCmdFactory {
     @Autowired
@@ -32,11 +34,18 @@ public class HandleCmdFactory {
     private HandleDgReportEnvironmentalDataCmd handleDgReportEnvironmentalDataCmd;
     @Autowired
     private HandleDgTimelyControlCmd handleDgTimelyControlCmd;
+
     public String HandleCmd(String data) {
         JSONObject jsonObject = JSONUtil.parseObj(data);
         int cmd = jsonObject.getInt("cmd");
-        if(jsonObject.getInt("timestamp") != null){
-            jsonObject.set("date_time", DateUtil.parseDate(jsonObject.getStr("timestamp")));
+        if (jsonObject.getInt("timestamp") != null) {
+            Long timestamp = jsonObject.getLong("timestamp") * 1000;
+            Date date = new Date(timestamp);
+            jsonObject.set("date_time", DateUtil.formatDateTime(date));
+        }
+        String[] paramNames = {"params", "params2", "params3"};
+        for (String paramName : paramNames) {
+            convertToJsonString(jsonObject, paramName);
         }
         String s;
         switch (cmd) {
@@ -68,7 +77,14 @@ public class HandleCmdFactory {
                 s = handleDgTimelyControlCmd.HandleCmdMethod(jsonObject.toBean(DgTimelyControl.class));
                 return s;
             default:
-                throw new CommonException("cmd有误或者没有对应的cmd处理", 500);
+                return null;
+//                throw new CommonException("cmd有误或者没有对应的cmd处理", 500);
+        }
+    }
+    private void convertToJsonString(JSONObject jsonObject, String paramName) {
+        Object value = jsonObject.get(paramName);
+        if (value != null) {
+            jsonObject.set(paramName, value.toString());
         }
     }
 }