Merge branch 'master' of http://192.168.1.43:3000/git/sass-lab-distributed-java

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/HxpChemicalServiceImpl.java

@@ -513,7 +513,7 @@ public class HxpChemicalServiceImpl implements IHxpChemicalService {
         if(!list.isEmpty()){
 
             list.forEach(map -> {
-                if(BigDecimal.valueOf(1L).compareTo(BigDecimal.valueOf(Double.parseDouble(map.get("criticali")+""))) >= 0){
+                if(BigDecimal.valueOf(1L).compareTo(BigDecimal.valueOf(Double.parseDouble(map.get("criticali")+""))) < 0){
 
                     Map<String,Object> subInfo = hxpUserecordMapper.selectSubInfoById(Long.parseLong(map.get("subId") + ""));
                     String safeUserId = "";

zd-modules/zd-chemical/src/main/resources/mapper/chemical/HxpCabinetMapper.xml

@@ -179,7 +179,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select
             h.id hardwareId,
             h.relay_code relayCode,
-            h.ip_address as ipAddress,
+--             h.ip_address as ipAddress,
             h.lock_id as lockId
         from lab_hardware h
         where h.subject_id = #{subId} and lock_id = #{lockId}

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

@@ -96,6 +96,4 @@ public class DeviceRemoteController {
         }
         return R.fail();
     }
-
-
 }