bug修复

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

@@ -74,7 +74,7 @@ public class AlarmRecordServiceImpl extends ServiceImpl<AlarmRecordMapper, Alarm
     @Resource
     private RfidTagService tagService;
 
-    private static final String MSG_MATCH="==================>{},{}";
+    private static final String MSG_MATCH = "==================>{},{}";
 
     @Override
     public void getRecordInfo(List<AlarmRecordVo> recordVos) {
@@ -97,13 +97,9 @@ public class AlarmRecordServiceImpl extends ServiceImpl<AlarmRecordMapper, Alarm
     public List<AlarmRecord> getList(AlarmRecord alarmRecord) {
         LambdaQueryWrapper<AlarmRecord> queryWrapper = Wrappers.lambdaQuery(AlarmRecord.class);
         String startTime = alarmRecord.getStartTime();
-        if (StringUtils.hasLength(startTime)){
-            queryWrapper.apply("DATE_FORMAT(alarm_time,'%Y-%m-%d') >="+alarmRecord.getStartTime());
-        }
         String endTime = alarmRecord.getEndTime();
-        if (StringUtils.hasLength(endTime)){
-            queryWrapper.apply("DATE_FORMAT(alarm_time,'%Y-%m-%d') <="+alarmRecord.getEndTime());
-        }
+        queryWrapper.apply(StringUtils.hasLength(startTime), "DATE_FORMAT(alarm_time,'%Y-%m-%d') >=date_format('" + startTime + "','%Y-%m-%d')")
+                .apply(StringUtils.hasLength(startTime), "DATE_FORMAT(alarm_time,'%Y-%m-%d') <=date_format('" + endTime + "','%Y-%m-%d')");
         return list(queryWrapper);
     }
 
@@ -113,14 +109,14 @@ public class AlarmRecordServiceImpl extends ServiceImpl<AlarmRecordMapper, Alarm
         String electronicTag = tag.getEpc();
         RemoteLabHardware hardware = tag.getRemoteLabHardware();
         LambdaQueryWrapper<RfidTag> queryWrapper = Wrappers.lambdaQuery(RfidTag.class);
-        queryWrapper.eq(RfidTag::getAuthCode,electronicTag);
+        queryWrapper.eq(RfidTag::getAuthCode, electronicTag);
         RfidTag rfidTag = tagService.getOne(queryWrapper);
-        if (rfidTag==null){
-            log.info(MSG_MATCH,electronicTag,"标签未录入");
+        if (rfidTag == null) {
+            log.info(MSG_MATCH, electronicTag, "标签未录入");
             return false;
         }
         LambdaQueryWrapper<BottleStorage> wrapper = Wrappers.lambdaQuery(BottleStorage.class);
-        wrapper.eq(BottleStorage::getElectronicTag,rfidTag.getId());
+        wrapper.eq(BottleStorage::getElectronicTag, rfidTag.getId());
         BottleStorage bottleStorage = storageService.getOne(wrapper);
         if (bottleStorage != null) {
             Long id = bottleStorage.getId();
@@ -132,7 +128,7 @@ public class AlarmRecordServiceImpl extends ServiceImpl<AlarmRecordMapper, Alarm
             // 发送报警消息
             sendAlarm(bottleStorage);
             redisService.setCacheObject(key, electronicTag, 300L, TimeUnit.SECONDS);
-            AlarmRecord alarmRecord=new AlarmRecord();
+            AlarmRecord alarmRecord = new AlarmRecord();
             alarmRecord.setElectronicTag(electronicTag)
                     .setAlarmTime(Calendar.getInstance().getTime())
                     .setMasterId(id)
@@ -140,9 +136,9 @@ public class AlarmRecordServiceImpl extends ServiceImpl<AlarmRecordMapper, Alarm
                     .setProductType(1)
                     .setDeptId(bottleStorage.getDeptId());
             return save(alarmRecord);
-        }else {
-            if (hardware!=null){
-                log.info(MSG_MATCH,electronicTag,"标签未绑定气瓶");
+        } else {
+            if (hardware != null) {
+                log.info(MSG_MATCH, electronicTag, "标签未绑定气瓶");
             }
             return false;
         }
@@ -204,8 +200,8 @@ public class AlarmRecordServiceImpl extends ServiceImpl<AlarmRecordMapper, Alarm
         alarmEntrty.setTo(phones.toArray(new String[]{}));
         alarmEntrty.setText(subjectName + airName + "气瓶被违规带离，请尽快确认");
         AjaxResult result = remoteAlarmService.send(alarmEntrty);
-        if (!result.get(AjaxResult.CODE_TAG).equals(HttpStatus.SUCCESS)){
-            log.error("电话报警异常：发送实验室【{}】,实验室ID【{}】,接收用户手机号【{}】",subjectName,storage.getSubjectId(), phones);
+        if (!result.get(AjaxResult.CODE_TAG).equals(HttpStatus.SUCCESS)) {
+            log.error("电话报警异常：发送实验室【{}】,实验室ID【{}】,接收用户手机号【{}】", subjectName, storage.getSubjectId(), phones);
         }
     }
 

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

@@ -42,13 +42,9 @@ public class BottleStorageErrorServiceImpl extends ServiceImpl<BottleStorageErro
     public List<BottleStorageError> list(BottleStorageError bottleStorageError) {
         LambdaQueryWrapper<BottleStorageError> queryWrapper = Wrappers.lambdaQuery(BottleStorageError.class);
         String startTime = bottleStorageError.getStartTime();
-        if (StringUtils.hasLength(startTime)) {
-            queryWrapper.apply(StringUtils.hasLength(startTime), "DATE_FORMAT(create_time,'%Y-%m-%d') >=date_format('" + startTime + "','%Y-%m-%d')");
-        }
         String endTime = bottleStorageError.getEndTime();
-        if (StringUtils.hasLength(endTime)) {
-            queryWrapper.apply(StringUtils.hasLength(endTime), "DATE_FORMAT(create_time,'%Y-%m-%d') <=date_format('" + endTime + "','%Y-%m-%d')");
-        }
+        queryWrapper.apply(StringUtils.hasLength(startTime), "DATE_FORMAT(create_time,'%Y-%m-%d') >=date_format('" + startTime + "','%Y-%m-%d')")
+                .apply(StringUtils.hasLength(endTime), "DATE_FORMAT(create_time,'%Y-%m-%d') <=date_format('" + endTime + "','%Y-%m-%d')");
         String searchValue = bottleStorageError.getSearchValue();
         if (StringUtils.hasLength(searchValue)) {
             queryWrapper.like(BottleStorageError::getCreateBy, searchValue)
@@ -57,10 +53,10 @@ public class BottleStorageErrorServiceImpl extends ServiceImpl<BottleStorageErro
         }
 
         List<Long> ids = bottleStorageError.getIds();
-        if (ids!=null && !ids.isEmpty()){
-            queryWrapper.in(BottleStorageError::getId,ids);
+        if (ids != null && !ids.isEmpty()) {
+            queryWrapper.in(BottleStorageError::getId, ids);
         }
-        queryWrapper.orderByDesc(true,BottleStorageError::getCreateTime);
+        queryWrapper.orderByDesc(true, BottleStorageError::getCreateTime);
         return list(queryWrapper);
     }
 

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

@@ -85,7 +85,7 @@ public class UseRecordServiceImpl extends ServiceImpl<UseRecordMapper, UseRecord
         String endTime = useRecord.getEndTime();
 
         queryWrapper.apply(StringUtils.hasLength(startTime), "DATE_FORMAT(use_time,'%Y-%m-%d') >=date_format('" + startTime + "','%Y-%m-%d')")
-                .apply(StringUtils.hasLength(endTime), "DATE_FORMAT(use_time,'%Y-%m-%d') >=date_format('" + endTime + "','%Y-%m-%d')");
+                .apply(StringUtils.hasLength(endTime), "DATE_FORMAT(use_time,'%Y-%m-%d') <=date_format('" + endTime + "','%Y-%m-%d')");
         String searchValue = useRecord.getSearchValue();
         if (StringUtils.hasLength(searchValue)) {
             queryWrapper.like(UseRecord::getContacts, searchValue)
@@ -154,8 +154,8 @@ public class UseRecordServiceImpl extends ServiceImpl<UseRecordMapper, UseRecord
 
     /***
      * 查询气瓶是否归还
-     * @param storageId
-     * @return
+     * @param storageId storageId
+     * @return List
      */
     @Override
     public List<UseRecord> getListNotReturn(Long storageId) {