Merge remote-tracking branch 'origin/master'

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/domain/UsegasApply.java

@@ -46,11 +46,11 @@ public class UsegasApply extends BaseBean {
     @NotNull(message = "联系方式不能为空！")
     private String phone;
 
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty("期限开始")
     private Date startTime;
 
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty("期限结束")
     @NotNull(message = "使用期限不能为空！")
     private Date endTime;

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/impl/AlarmRecordServiceImpl.java

@@ -5,11 +5,13 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.zd.bottle.domain.AlarmRecord;
 import com.zd.bottle.domain.BottleStorage;
 import com.zd.bottle.domain.RfidTag;
+import com.zd.bottle.domain.UsegasApply;
 import com.zd.bottle.mapper.AlarmRecordMapper;
 import com.zd.bottle.service.AlarmRecordService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zd.bottle.service.BottleStorageService;
 import com.zd.bottle.service.RfidTagService;
+import com.zd.bottle.service.UsegasApplyService;
 import com.zd.bottle.vo.AlarmRecordVo;
 import com.zd.bottle.vo.BottleStorageVo;
 import com.zd.common.core.constant.HttpStatus;
@@ -74,6 +76,9 @@ public class AlarmRecordServiceImpl extends ServiceImpl<AlarmRecordMapper, Alarm
     @Resource
     private RfidTagService tagService;
 
+    @Resource
+    private UsegasApplyService applyService;
+
     private static final String MSG_MATCH = "==================>{},{}";
 
     @Override
@@ -119,29 +124,36 @@ public class AlarmRecordServiceImpl extends ServiceImpl<AlarmRecordMapper, Alarm
         wrapper.eq(BottleStorage::getElectronicTag, rfidTag.getId());
         BottleStorage bottleStorage = storageService.getOne(wrapper);
         if (bottleStorage != null) {
-            Long id = bottleStorage.getId();
-            String key = FRID_CODE + electronicTag + id;
-            String frid = redisService.getCacheObject(key);
-            if (frid != null) {
-                return true;
+            String airName = bottleStorage.getAirName();
+            LambdaQueryWrapper<UsegasApply> lambdaQuery = Wrappers.lambdaQuery(UsegasApply.class);
+            lambdaQuery.eq(UsegasApply::getUseGasName,airName)
+                    .eq(UsegasApply::getEndTime,Calendar.getInstance().getTime()).eq(UsegasApply::getLeadAuditStaus,1);
+            List<UsegasApply> applies = applyService.list(lambdaQuery);
+            if (applies.isEmpty()){
+                Long id = bottleStorage.getId();
+                String key = FRID_CODE + electronicTag + id;
+                String frid = redisService.getCacheObject(key);
+                if (frid != null) {
+                    return true;
+                }
+                // 发送报警消息
+                sendAlarm(bottleStorage);
+                redisService.setCacheObject(key, electronicTag, 300L, TimeUnit.SECONDS);
+                AlarmRecord alarmRecord = new AlarmRecord();
+                alarmRecord.setElectronicTag(electronicTag)
+                        .setAlarmTime(Calendar.getInstance().getTime())
+                        .setMasterId(id)
+                        .setType(1)
+                        .setProductType(1)
+                        .setDeptId(bottleStorage.getDeptId());
+                return save(alarmRecord);
             }
-            // 发送报警消息
-            sendAlarm(bottleStorage);
-            redisService.setCacheObject(key, electronicTag, 300L, TimeUnit.SECONDS);
-            AlarmRecord alarmRecord = new AlarmRecord();
-            alarmRecord.setElectronicTag(electronicTag)
-                    .setAlarmTime(Calendar.getInstance().getTime())
-                    .setMasterId(id)
-                    .setType(1)
-                    .setProductType(1)
-                    .setDeptId(bottleStorage.getDeptId());
-            return save(alarmRecord);
         } else {
             if (hardware != null) {
                 log.info(MSG_MATCH, electronicTag, "标签未绑定气瓶");
             }
-            return false;
         }
+        return false;
     }
 
     private void sendAlarm(BottleStorage storage) {

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabSubjectManagerService.java

@@ -515,21 +515,24 @@ public class LabSubjectManagerService {
 
 
         });
-        // 实验室化学品临界量计算
-        R r = remoteChemicalService.queryCriticaliBySubId(subIds);
-        if(r.getCode() == HttpStatus.SUCCESS){
-            List<Map<String, Object>> list = (List<Map<String, Object>>) r.getData();
-            list.forEach(map -> {
-                for (LabSubjectVO s : labSubjects) {
-                    if (Objects.equals(s.getId(), Long.parseLong(map.get("subId") + ""))) {
-                        s.setRiskIndicator(map.get("criticali") + "");
-                        break;
+        try {
+            // 实验室化学品临界量计算
+            R r = remoteChemicalService.queryCriticaliBySubId(subIds);
+            if(r.getCode() == HttpStatus.SUCCESS){
+                List<Map<String, Object>> list = (List<Map<String, Object>>) r.getData();
+                list.forEach(map -> {
+                    for (LabSubjectVO s : labSubjects) {
+                        if (Objects.equals(s.getId(), Long.parseLong(map.get("subId") + ""))) {
+                            s.setRiskIndicator(map.get("criticali") + "");
+                            break;
+                        }
                     }
-                }
-            });
+                });
 
-        }
+            }
+        }catch (Exception e){
 
+        }
 
         // 2.5 页面改变，接口加分页，并拆成两部分
         return labSubjects;
@@ -908,7 +911,7 @@ public class LabSubjectManagerService {
                             return sensorFunctionStatus;
                         }
 
-                    }).collect(Collectors.toList());
+                    }).distinct().collect(Collectors.toList());
                 }).filter(a -> CollUtil.isNotEmpty(a)).flatMap(List::stream)
                 .sorted((c, d) -> NumberUtil.compare(c.getOrder(), d.getOrder()))
                 .collect(Collectors.toList());

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

@@ -108,7 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectLabHardwareVo"/>
         <where>
             <if test="ipAddress != null "> and xx.ip_address = #{ipAddress}</if>
-            <if test="deviceStatus != null "> and xx.device_status = #{deviceStatus}</if>
+            <if test="deviceStatus != null "> and xx.deviceStatus = #{deviceStatus}</if>
             <if test="subjectId != null "> and xx.subject_id = #{subjectId}</if>
             <if test="deptId != null ">
                 AND (xx.dept_id = #{deptId} OR xx.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId},