字典录入调整

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDataSet.java

@@ -60,5 +60,14 @@ public class CsDataSet extends BaseEntity {
      */
     private Integer storeFlag;
 
+    /**
+     * 逻辑子设备id(从模板获取,主设备此字段没有值)
+     */
+    private String clDev;
+
+    /**
+     * 数据集类型(0:主设备 1:模块 2:监测设备)
+     */
+    private Integer type;
 
 }

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDevModelPO.java

@@ -4,6 +4,7 @@ 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.fasterxml.jackson.annotation.JsonFormat;
 import com.njcn.db.bo.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -57,6 +58,7 @@ public class CsDevModelPO extends BaseEntity {
      * 版本日期
      */
     @TableField(value = "version_date")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date versionDate;
 
     /**

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDevModelServiceImpl.java

@@ -1,6 +1,5 @@
 package com.njcn.csdevice.service.impl;
 
-import cn.hutool.core.date.DatePattern;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -18,8 +17,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.sql.Date;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 
 /**
  * 
@@ -73,7 +70,7 @@ public class CsDevModelServiceImpl extends ServiceImpl<CsDevModelMapper, CsDevMo
         LambdaQueryWrapper<CsDevModelPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(CsDevModelPO::getDevTypeName,devType)
                 .eq(CsDevModelPO::getVersionNo,version)
-                .eq(CsDevModelPO::getVersionDate, LocalDateTime.parse(time, DateTimeFormatter.ofPattern(DatePattern.NORM_DATETIME_PATTERN)))
+                .eq(CsDevModelPO::getVersionDate, Date.valueOf(time))
                 .eq(CsDevModelPO::getStatus,1);
         return this.baseMapper.selectOne(lambdaQueryWrapper);
     }