dev to suda 2023-04-14

zd-model/src/main/java/com/zd/model/domain/per/PerPrefix.java

@@ -788,4 +788,42 @@ public class PerPrefix {
      * 实验室项目：灭火设备
      */
     public static final String ALGORITHM_FIREDEVICE = "algorithm:firedevice:";
+
+    /***
+     * 海康门禁
+     */
+    public static final String HAIKANG_DOOR= "haikang:door:";
+
+    /***
+     * 海康门禁用户
+     */
+    public static final String HAIKANG_USER= "haikang:user:";
+
+    /***
+     * 海康授权日志
+     */
+    public static final String HAIKANG_USERLOG= "haikang:userLog:";
+
+    /**
+     * 电子信息牌安全类目
+     */
+    public static final String LABORATORY_CLASSIFY = "laboratory:classify:";
+
+    /**
+     * 电子信息牌安全类目详情
+     */
+    public static final String LABORATORY_CLASSIFY_DET = "laboratory:classifyDet:";
+
+    /**
+     * 电子信息牌巡查
+     */
+    public static final String LABORATORY_XXP_INSPECTION = "laboratory:xxpIns:";
+    /**
+     * 电子信息牌值班
+     */
+    public static final String LABORATORY_DUTY = "laboratory:duty:";
+    /**
+     * 电子信息牌信息
+     */
+    public static final String LABORATORY_CARDINFO = "laboratory:cardInfo:";
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/XxpCardInfo.java

@@ -52,6 +52,12 @@ public class XxpCardInfo extends BaseEntity {
     @ApiModelProperty(value = "学院")
     private String college;
 
+    /**
+     * 学院Id
+     */
+    @Excel(name = "学院Id")
+    @ApiModelProperty(value = "学院Id")
+    private Long locationId;
 
     /**
      * 位置

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/mapper/XxpCardInfoMapper.java

@@ -0,0 +1,63 @@
+package com.zd.laboratory.mapper;
+
+import com.zd.laboratory.domain.XxpCardInfo;
+
+import java.util.List;
+
+/**
+ * 巡查信息 Mapper接口
+ *
+ * @author xxf
+ * @date 2023-03-22
+ */
+public interface XxpCardInfoMapper
+{
+    /**
+     * 查询
+     *
+     * @param id 主键
+     * @return 巡查信息
+     */
+    public XxpCardInfo selectXxpCardInfoById(Long id);
+
+    /**
+     * 查询列表
+     *
+     * @param xxpCardInfo 巡查信息
+     * @return 白名单集合
+     */
+    public List<XxpCardInfo> selectXxpCardInfoList(XxpCardInfo xxpCardInfo);
+
+
+    /**
+     * 新增巡查信息
+     *
+     * @param xxpCardInfo 巡查信息
+     * @return 结果
+     */
+    public int insertXxpCardInfo(XxpCardInfo xxpCardInfo);
+
+    /**
+     * 修改
+     *
+     * @param xxpCardInfo 巡查信息
+     * @return 结果
+     */
+    public int updateXxpCardInfo(XxpCardInfo xxpCardInfo);
+
+    /**
+     * 删除
+     *
+     * @param id 主键
+     * @return 结果
+     */
+    public int deleteXxpCardInfoById(Long id);
+
+    /**
+     * 批量删除
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteXxpCardInfoByIds(Long[] ids);
+}

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/XxpCardInfoMapper.xml

@@ -10,6 +10,7 @@
         <result property="cardNum" column="card_num"/>
         <result property="college" column="college"/>
         <result property="location" column="location"/>
+        <result property="locationId" column="location_id"/>
         <result property="operate" column="operate"/>
         <result property="subjectId" column="subject_id"/>
         <result property="subjectName" column="subject_name"/>
@@ -30,6 +31,7 @@
                card_num,
                college,
                location,
+               location_id,
                operate,
                subject_id,
                subject_name,
@@ -52,6 +54,7 @@
             <if test="cardNum != null and cardNum != ''">and t.card_num = #{cardNum}</if>
             <if test="college != null and college != null">and t.college = #{college}</if>
             <if test="location != null and location != '' ">and t.location = #{location}</if>
+            <if test="locationId != null ">and t.location_id = #{locationId}</if>
             <if test="operate != null ">and t.operate = #{operate}</if>
             <if test="subject_id != null ">and t.subject_id = #{subjectId}</if>
             <if test="subjectName != null ">and t.subject_name = #{subjectName}</if>
@@ -78,6 +81,7 @@
             <if test="cardNum != null">card_num,</if>
             <if test="college != null">college,</if>
             <if test="location != null">location,</if>
+            <if test="locationId != null">location_id,</if>
             <if test="operate != null">operate,</if>
             <if test="subjectId != null">subject_id,</if>
             <if test="subjectName != null">subject_name,</if>
@@ -95,6 +99,7 @@
             <if test="cardNum != null">#{cardNum},</if>
             <if test="college != null">#{college},</if>
             <if test="location != null">#{location},</if>
+            <if test="locationId != null">#{locationId},</if>
             <if test="operate != null">#{operate},</if>
             <if test="subjectId != null">#{subjectId},</if>
             <if test="subjectName != null">#{subjectName},</if>
@@ -114,9 +119,9 @@
         <trim prefix="SET" suffixOverrides=",">
             <if test="cardNum != null">card_name = #{cardNum},</if>
             <if test="cardNum != null">card_num = #{cardNum},</if>
-
             <if test="college != null">college = #{college},</if>
             <if test="location != null">location = #{location},</if>
+            <if test="locationId != null">location = #{locationId},</if>
             <if test="operate != null">operate = #{operate},</if>
             <if test="subjectId != null">subject_id = #{subjectId},</if>
             <if test="subjectName != null">subject_name = #{subjectName},</if>