Просмотр исходного кода

soc-modules-iot模块-诊断阈值、诊断任务实体createTime字段使用string类型

humingshi-7@163.com 11 месяцев назад
Родитель
Сommit
ef2e52b52b

+ 1 - 1
pom.xml

@@ -40,7 +40,7 @@
         <commons.lang3.version>3.12.0</commons.lang3.version>
         <okhttp.version>3.10.0</okhttp.version>
         <lombok.version>1.18.26</lombok.version>
-        <generator.version>3.5.1</generator.version>
+        <generator.version>3.4.1</generator.version>
         <freemarker.version>2.7.2</freemarker.version>
         <velocity.version>2.3</velocity.version>
         <knife4j.version>3.0.3</knife4j.version>

+ 1 - 2
soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/iot/domain/IotDeviceDiagnoseMission.java

@@ -2,7 +2,6 @@ package com.xunmei.common.core.domain.iot.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
@@ -52,7 +51,7 @@ public class IotDeviceDiagnoseMission implements Serializable {
 
     @ApiModelProperty(value = "创建时间")
     @TableField("create_time")
-    private LocalDateTime createTime;
+    private String createTime;
 
     @ApiModelProperty(value = "iot服务唯一编码")
     @TableField("iot_token")

+ 1 - 3
soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/iot/domain/IotDeviceDiagnoseThreshold.java

@@ -2,8 +2,6 @@ package com.xunmei.common.core.domain.iot.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
@@ -73,7 +71,7 @@ public class IotDeviceDiagnoseThreshold implements Serializable {
 
     @ApiModelProperty(value = "创建时间")
     @TableField("create_time")
-    private LocalDateTime createTime;
+    private String createTime;
 
     @ApiModelProperty(value = "绑定通道数量")
     @TableField("diagnose_number")

+ 2 - 3
soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/service/impl/DiagnoseMissionServiceImpl.java

@@ -14,6 +14,7 @@ import com.xunmei.common.core.domain.iot.domain.IotDeviceDiagnoseThreshold;
 import com.xunmei.common.core.domain.iot.domain.IotDeviceDiagnoseThresholdCh;
 import com.xunmei.common.core.enums.OrgTypeEnum;
 import com.xunmei.common.core.exception.ServiceException;
+import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.utils.IDHelper;
 import com.xunmei.common.core.utils.StringUtils;
 import com.xunmei.common.core.web.page.TableDataInfo;
@@ -34,9 +35,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
-import java.time.LocalDateTime;
 import java.util.Arrays;
-import java.util.Date;
 import java.util.List;
 import java.util.UUID;
 import java.util.stream.Collectors;
@@ -238,7 +237,7 @@ public class DiagnoseMissionServiceImpl implements DiagnoseMissionService {
 
         UUID uuid = UUID.randomUUID();
         mission.setMissionId(uuid.toString());
-        mission.setCreateTime(LocalDateTime.now());
+        mission.setCreateTime(DateUtils.getTime());
 
         mission.setName(request.getName());
         mission.setBeginTime(request.getBeginTime());

+ 3 - 5
soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/service/impl/DiagnoseThresholdServiceImpl.java

@@ -11,6 +11,7 @@ import com.xunmei.common.core.domain.iot.domain.IotDeviceDiagnoseThreshold;
 import com.xunmei.common.core.domain.iot.domain.IotDeviceDiagnoseThresholdCh;
 import com.xunmei.common.core.enums.OrgTypeEnum;
 import com.xunmei.common.core.exception.ServiceException;
+import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.utils.IDHelper;
 import com.xunmei.common.core.utils.StringUtils;
 import com.xunmei.common.core.web.page.TableDataInfo;
@@ -30,10 +31,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.DigestUtils;
-
 import javax.annotation.Resource;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -250,7 +248,7 @@ public class DiagnoseThresholdServiceImpl  implements DiagnoseThresholdService {
         threshold.setEndTime(request.getTimeRange()[1]);
 
         threshold.setThresholdCode(thresholdCode);
-        threshold.setCreateTime(LocalDateTime.now());
+        threshold.setCreateTime(DateUtils.getTime());
         threshold.setDiagnoseNumber(0);
         threshold.setType(0L);
 
@@ -285,7 +283,7 @@ public class DiagnoseThresholdServiceImpl  implements DiagnoseThresholdService {
         threshold.setEndTime(request.getTimeRange()[1]);
 
         threshold.setThresholdCode(thresholdCode);
-        threshold.setCreateTime(LocalDateTime.now());
+        threshold.setCreateTime(DateUtils.getTime());
         threshold.setType(0L);
 
         diagnoseThresholdChMapper.updateById(threshold);