...

docker/mysql/update/化学品分类初始化脚本.sql

@@ -0,0 +1,2 @@
+INSERT INTO `hxp_chemical_classify` (`id`, `parent_id`, `ancestors`, `classify_name`, `hazard_level`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES (1, 0, '0', '危险化学品', 1, '超级管理员', '2022-06-16 14:13:09', '', NULL);
+INSERT INTO `hxp_chemical_classify` (`id`, `parent_id`, `ancestors`, `classify_name`, `hazard_level`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES (2, 0, '0', '普通化学品', 2, '超级管理员', '2022-06-16 14:14:43', '', NULL);

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

@@ -276,6 +276,7 @@ public class HxpCabinetServiceImpl implements IHxpCabinetService {
             // 开锁
             // 1. 执行开锁命令
             R r = remoteSubQueryService.cabinetV2OpenLock(result);
+            logger.info("柜锁开锁返回数值：" + r.getCode() + ";;;;" + r.getMsg());
             // 2. 判断执行状态
             if(r.getCode() == HttpStatus.SUCCESS){
                 success = true;
@@ -285,6 +286,7 @@ public class HxpCabinetServiceImpl implements IHxpCabinetService {
         }else if(type == 2){
             // 关锁
             R r = remoteSubQueryService.cabinetV2CloseLock(result);
+            logger.info("柜锁关锁返回数值：" + r.getCode() + ";;;;" + r.getMsg());
             // 判断执行状态
             if(r.getCode() == HttpStatus.SUCCESS){
                 success = true;

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

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