Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/LabSubject.java

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabXxpInspectionController.java

@@ -107,7 +107,7 @@ public class LabXxpInspectionController extends BaseController
      * @param xxpInspection
      * @return
      */
-    // @PreAuthorize(hasPermi = PerPrefix.LABORATORY_XXP_INSPECTION + PerFun.LIST)
+    @PreAuthorize(hasPermi = PerPrefix.LABORATORY_XXP_INSPECTION + PerFun.QUERY)
     @GetMapping("/listStandard")
     @ApiOperation(value = "查询巡查列表-正常")
     public TableDataInfo<XxpInspection> listStandard(XxpInspection xxpInspection)
@@ -119,11 +119,11 @@ public class LabXxpInspectionController extends BaseController
 
 
     /***
-     * 签到列表-正常
+     * 签到列表-异常
      * @param xxpDuty
      * @return
      */
-    // @PreAuthorize(hasPermi = PerPrefix.LABORATORY_XXP_INSPECTION + PerFun.LIST)
+    @PreAuthorize(hasPermi = PerPrefix.LABORATORY_XXP_INSPECTION + PerFun.QUERY)
     @GetMapping("/listAbnormal")
     @ApiOperation(value = "查询巡查列表-异常")
     public TableDataInfo<XxpDuty> listAbnormal(XxpDuty xxpDuty)

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/device/DeviceRemoteController.java

@@ -60,13 +60,16 @@ public class DeviceRemoteController {
         try {
 //            ops.write(ReUtil.hexStringToByteArray(instruct));
 //            ops.flush();
-            for (int i = 0; i < 5; i++) {
-                NettyPushMsgService.push(cabinetV2Lock.getRelayCode(), ReUtil.hexStringToByteArray(instruct));
-                logger.info("柜锁开锁指令：" + instruct);
-
-                Thread.sleep(1000);
-            }
+//            for (int i = 0; i < 5; i++) {
+//                NettyPushMsgService.push(cabinetV2Lock.getRelayCode(), ReUtil.hexStringToByteArray(instruct));
+//                logger.info("柜锁开锁指令：" + instruct);
+//
+//                Thread.sleep(1000);
+//            }
 
+            NettyPushMsgService.push(cabinetV2Lock.getRelayCode(), ReUtil.hexStringToByteArray(instruct));
+            logger.info("柜锁开锁指令：" + instruct);
+            Thread.sleep(1000);
 //            ops.write(ReUtil.hexStringToByteArray(instruct));
 //            ops.flush();
 //

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

@@ -647,40 +647,4 @@ public class LabSubject extends BaseEntity implements QCInterface {
     public void setHardwareType(Integer hardwareType) {
         this.hardwareType = hardwareType;
     }
-
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public Boolean getDel() {
-        return isDel;
-    }
-
-    public void setDel(Boolean del) {
-        isDel = del;
-    }
-
-    public Long getUserName() {
-        return userName;
-    }
-
-    public void setUserName(Long userName) {
-        this.userName = userName;
-    }
-
-    public Long getIsSubject() {
-        return isSubject;
-    }
-
-    public void setIsSubject(Long isSubject) {
-        this.isSubject = isSubject;
-    }
-
-    public Long getSubOrder() {
-        return subOrder;
-    }
-
-    public void setSubOrder(Long subOrder) {
-        this.subOrder = subOrder;
-    }
 }

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

@@ -32,7 +32,6 @@
         <result property="inspectCheckCount" column="inspect_check_count"/>
         <result property="inspectSignTime" column="inspect_sign_time"/>
         <result property="details" column="details"/>
-        <result property="hardwareType" column="hardware_type"/>
     </resultMap>
 
     <resultMap type="com.zd.laboratory.domain.vo.LabSubjectVO" id="LabSubjectResultVO">
@@ -82,7 +81,6 @@
         <result property="inspectCheckCount" column="inspect_check_count"/>
         <result property="inspectSignTime" column="inspect_sign_time"/>
         <result property="details" column="details"/>
-        <result property="hardwareType" column="hardware_type"/>
     </resultMap>
 
     <resultMap type="com.zd.laboratory.domain.vo.LabSubjectDetailVO" id="subjectAndInfoResult">
@@ -125,7 +123,6 @@
         <result property="inspectCheckCount" column="inspect_check_count"/>
         <result property="inspectSignTime" column="inspect_sign_time"/>
         <result property="details" column="details"/>
-        <result property="hardwareType" column="hardware_type"/>
 
         <collection property="hazardSubjectRelations" column="id"
                     ofType="com.zd.laboratory.domain.LabHazardSubjectRelation"
@@ -174,7 +171,6 @@
                inspect_check_count,
                inspect_sign_time,
                details,
-               hardware_type,
                (SELECT GROUP_CONCAT(ur.nick_name)
                 FROM sys_user ur
                 WHERE ur.`user_id`
@@ -260,7 +256,6 @@
                t.inspect_check_count,
                t.inspect_sign_time,
                t.details,
-               t.hardware_type,
                (select i.id from xxp_card_info i where i.subJect_id=t.id LIMIT 1)         xxpCardInfoId,
                CONCAT(su.nick_name, '@', su.phonenumber)                      AS          adminNameAndPhone,
 
@@ -316,8 +311,7 @@
                t.inspect_skipped,
                t.inspect_check_count,
                t.inspect_sign_time,
-               t.details,
-               t.hardware_type
+               t.details
         from lab_subject t
                  left join sys_user su on su.user_id = t.admin_id
                  left join sys_dept sd on sd.dept_id = t.dept_id
@@ -467,8 +461,7 @@
         t.inspect_skipped,
         t.inspect_check_count,
         t.inspect_sign_time,
-        t.details,
-        t.hardware_type
+        t.details
         from lab_subject t
         left join sys_user su on su.user_id = t.admin_id AND su.`del_flag`=0
         left join sys_dept sd on sd.dept_id = t.dept_id
@@ -591,7 +584,6 @@
             <if test="inspectCheckCount != null">inspect_check_count,</if>
             <if test="inspectSignTime != null">inspect_sign_time,</if>
             <if test="details != null">details,</if>
-            <if test="hardwareType != null">hardware_type,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -632,7 +624,6 @@
             <if test="inspectCheckCount != null">#{inspectCheckCount},</if>
             <if test="inspectSignTime != null">#{inspectSignTime},</if>
             <if test="details != null">#{details},</if>
-            <if test="hardwareType != null">#{hardwareType},</if>
         </trim>
     </insert>
 
@@ -677,7 +668,6 @@
             <if test="inspectCheckCount != null">inspect_check_count = #{inspectCheckCount},</if>
             <if test="inspectSignTime != null">inspect_sign_time = #{inspectSignTime},</if>
             <if test="details != null">details = #{details},</if>
-            <if test="hardwareType != null">hardware_type = #{hardwareType},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -58,7 +58,7 @@
                 and t.create_time <= str_to_date(#{endTime}, '%Y-%m-%d')
             </if>
         </where>
-        <if test="remark =='list' "> order by isnull(sort),sort,is_collective desc ,create_time desc</if>
+        <if test="remark =='list' "> order by isnull(sort),sort,is_collective,create_time desc</if>
     </select>
 
     <select id="selectXxpClassifyDetailedById" resultMap="XxpClassifyDetailedResult">

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

@@ -62,7 +62,9 @@
             order by t.create_time desc
         </if>
         <if test="remark == 'sort' ">
-            order by isnull(t.sort) ,t.sort
+            order by isnull(t.sort),t.sort,
+            t.is_show,
+            t.create_time desc
         </if>
     </select>