From 883c4af576841d98043d1a1334bf6c298d99a792 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Mon, 25 May 2026 14:10:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/org/jeecg/common/system/util/JwtUtil.java    | 2 +-
 .../src/main/java/com/nu/entity/CameraInfoEntity.java      | 1 +
 .../mapper/xml/ConfigMaterialCategoryMapper.xml            | 7 ++++++-
 .../com/nu/modules/tplink/camera/entity/CameraInfo.java    | 1 +
 .../modules/tplink/camera/mapper/xml/CameraInfoMapper.xml  | 3 ++-
 5 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java
index 9375e63a..5e39d1d0 100644
--- a/nursing-unit-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java
+++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java
@@ -40,7 +40,7 @@ public class JwtUtil {
 
 	/**Token有效期为7天（Token在reids中缓存时间为两倍）*/
 //	public static final long EXPIRE_TIME = (7 * 12) * 60 * 60 * 1000;
-	public static final long EXPIRE_TIME = (12) * 60 * 60 * 1000;
+	public static final long EXPIRE_TIME = 4 * 60 * 60 * 1000;
 	static final String WELL_NUMBER = SymbolConstant.WELL_NUMBER + SymbolConstant.LEFT_CURLY_BRACKET;
 
     /**
diff --git a/nursing-unit-common/src/main/java/com/nu/entity/CameraInfoEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/CameraInfoEntity.java
index a3dcd754..f8e19505 100644
--- a/nursing-unit-common/src/main/java/com/nu/entity/CameraInfoEntity.java
+++ b/nursing-unit-common/src/main/java/com/nu/entity/CameraInfoEntity.java
@@ -84,5 +84,6 @@ public class CameraInfoEntity {
     /**护理单元*/
     @ApiModelProperty(value = "护理单元ID")
     private String nuId;
+    private String sn;
 
 }
diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialCategoryMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialCategoryMapper.xml
index a1ba4469..ae2489f3 100644
--- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialCategoryMapper.xml
+++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialCategoryMapper.xml
@@ -51,7 +51,12 @@
     <select id="getCgdMaterialTreeData" resultType="com.nu.modules.ConfigMaterial.entity.ConfigMaterialCategory">
         select b.category_id, b.type_id, b.medication_id
         from nu_invoicing_cgd_info a
-                 left join nu_config_material_info b on a.wl_id = b.id
+         left join nu_config_material_info b on a.wl_id = b.id
+        <where>
+            <if test="params.nuId !=null and params.nuId !=''">
+                and a.nu_id = #{params.nuId}
+            </if>
+        </where>
 <where>
     <if test="params.cgdId != null and params.params.cgdId != ''">
         and a.cgd_id = #{params.cgdId}
diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/entity/CameraInfo.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/entity/CameraInfo.java
index e1d8b6bd..1e10392b 100644
--- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/entity/CameraInfo.java
+++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/entity/CameraInfo.java
@@ -239,6 +239,7 @@ public class CameraInfo implements Serializable {
 	@TableField(exist = false)
 	private String speed;
 
+
 	private String ftpIp; //回放视频转FTP上传IP
 	private String ftpPort; //回放视频转FTP上传端口
 	private String ftpUsername; //回放视频转FTP上传用户
diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml
index 6cea4a0b..0c2f8989 100644
--- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml
+++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml
@@ -116,7 +116,8 @@
         a.system_type as systemType,
         a.protocol as protocol,
         b.nu_id as nuId,
-        a.channel
+        a.channel,
+        b.sn
         from nu_iot_tplink_camera a
         inner join nu_iot_device_preview b on a.mac = b.sn
         where b.device_status != '损坏'