Merge remote-tracking branch 'origin/master'

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/devicecert/vo/QhseDeviceCertRespVO.java

@@ -66,4 +66,7 @@ public class QhseDeviceCertRespVO {
     private Boolean alertWarn;
     @Schema(description = "过期")
     private Boolean expired;
+
+    @Schema(description = "设备编码")
+    private String deviceCode;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/emergency/vo/QhseEmergencyBookPageReqVO.java

@@ -53,5 +53,6 @@ public class QhseEmergencyBookPageReqVO extends PageParam {
 
     @Schema(description = "部门名称", example = "芋艿")
     private String deptName;
-
+    @Schema(description = "是否录入证书")
+    private Boolean ifCert;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/emergency/vo/QhseEmergencyBookRespVO.java

@@ -63,4 +63,6 @@ public class QhseEmergencyBookRespVO {
     @ExcelProperty("部门名称")
     private String deptName;
 
+    @Schema(description = "是否录入证书")
+    private Boolean ifCert;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/emergency/vo/QhseEmergencyBookSaveReqVO.java

@@ -48,4 +48,6 @@ public class QhseEmergencyBookSaveReqVO {
     @Schema(description = "部门名称", example = "芋艿")
     private String deptName;
 
+    @Schema(description = "是否录入证书")
+    private Boolean ifCert;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/measure/IotMeasureBookController.java

@@ -14,6 +14,7 @@ import cn.iocoder.yudao.module.pms.controller.admin.qhse.measure.vo.IotMeasureBo
 import cn.iocoder.yudao.module.pms.controller.admin.stat.DeptUtil;
 import cn.iocoder.yudao.module.pms.dal.dataobject.qhse.measure.IotMeasureBookDO;
 import cn.iocoder.yudao.module.pms.dal.mysql.qhse.measure.IotMeasureBookMapper;
+import cn.iocoder.yudao.module.pms.dal.mysql.qhse.measure.IotMeasureDetectMapper;
 import cn.iocoder.yudao.module.pms.service.qhse.ChineseLetterUtil;
 import cn.iocoder.yudao.module.pms.service.qhse.measure.IotMeasureBookService;
 import cn.iocoder.yudao.module.system.api.dept.DeptApi;
@@ -67,6 +68,8 @@ public class IotMeasureBookController {
     private DeptApi deptApi;
     @Autowired
     private DeptUtil deptUtil;
+    @Autowired
+    private IotMeasureDetectMapper iotMeasureDetectMapper;
 
     @PostMapping("/create")
     @Operation(summary = "创建计量器具台账")
@@ -106,6 +109,7 @@ public class IotMeasureBookController {
     @PreAuthorize("@ss.hasPermission('rq:iot-measure-book:delete')")
     public CommonResult<Boolean> deleteIotMeasureBook(@RequestParam("id") Long id) {
         iotMeasureBookService.deleteIotMeasureBook(id);
+        iotMeasureDetectMapper.deleteByMap(ImmutableMap.of("measure_id", id));
         return success(true);
     }
 

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/measure/IotMeasureDetectController.java

@@ -108,6 +108,7 @@ public class IotMeasureDetectController {
                 if (Objects.nonNull(iotMeasureBook)) {
                     iotMeasureDetectRespVO.setMeasureName(iotMeasureBook.getMeasureName());
                     iotMeasureDetectRespVO.setMeasureCode(iotMeasureBook.getMeasureCode());
+                    iotMeasureDetectRespVO.setSerialNo(iotMeasureBook.getSerialNo());
                 }
             }
             if (Objects.nonNull(iotMeasureDetectRespVO.getDeptId())) {

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/measure/vo/IotMeasureDetectRespVO.java

@@ -57,4 +57,6 @@ public class IotMeasureDetectRespVO {
 
     @Schema(description = "检测附件")
     private String file;
+
+    private String serialNo;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/qhse/emergency/QhseEmergencyBookDO.java

@@ -71,4 +71,8 @@ public class QhseEmergencyBookDO extends BaseDO {
      */
     private String deptName;
 
+    /**
+     * 是否证书
+     */
+    private Boolean ifCert;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/qhse/measure/IotMeasureBookMapper.java

@@ -26,6 +26,7 @@ public interface IotMeasureBookMapper extends BaseMapperX<IotMeasureBookDO> {
                 .eqIfPresent(IotMeasureBookDO::getDutyPerson, reqVO.getDutyPerson())
                 .betweenIfPresent(IotMeasureBookDO::getBuyDate, reqVO.getBuyDate())
                 .eqIfPresent(IotMeasureBookDO::getBrand, reqVO.getBrand())
+                .likeIfPresent(IotMeasureBookDO::getSerialNo, reqVO.getSerialNo())
                 .likeIfPresent(IotMeasureBookDO::getModelName, reqVO.getModelName())
                 .betweenIfPresent(IotMeasureBookDO::getLastTime, reqVO.getLastTime())
                 .eqIfPresent(IotMeasureBookDO::getMeasureUnit, reqVO.getMeasureUnit())

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/qhse/measure/IotMeasureDetectServiceImpl.java

@@ -86,6 +86,8 @@ public class IotMeasureDetectServiceImpl implements IotMeasureDetectService {
         if (validityPeriod.isAfter(LocalDateTime.now()) && ChronoUnit.DAYS.between(LocalDateTime.now(), validityPeriod) < 90) {
             iotMeasureBookDO.setAlertWarn(true);
             iotMeasureBookDO.setExpired(false);
+        } else {
+            iotMeasureBookDO.setAlertWarn(false);
         }
         iotMeasureBookMapper.updateById(iotMeasureBookDO);
         iotMeasureDetectMapper.updateById(updateObj);