修改bug

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;
 
     /**

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;
 
 }

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}

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上传用户

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 != '损坏'