From 8bb6b04f59607dcc72422d82411f143448fb7edc Mon Sep 17 00:00:00 2001
From: xuyang <748613696@qq.com>
Date: Mon, 31 Jul 2023 20:43:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E5=85=B8=E5=BD=95=E5=85=A5=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/njcn/csdevice/pojo/po/CsDataSet.java   | 9 +++++++++
 .../java/com/njcn/csdevice/pojo/po/CsDevModelPO.java     | 2 ++
 .../csdevice/service/impl/CsDevModelServiceImpl.java     | 5 +----
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDataSet.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDataSet.java
index e79e196..e5a3736 100644
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDataSet.java
+++ b/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;
 
 }
diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDevModelPO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDevModelPO.java
index 984e2eb..4510eb6 100644
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDevModelPO.java
+++ b/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;
 
     /**
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDevModelServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDevModelServiceImpl.java
index 5735394..e65fffb 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDevModelServiceImpl.java
+++ b/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);
     }