qhse调整

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/devicegroup/IotDeviceGroupController.java

@@ -17,6 +17,7 @@ import cn.iocoder.yudao.module.pms.dal.dataobject.IotDeviceDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.devicegroup.IotDeviceGroupDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.devicegroup.IotDeviceGroupDetailDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotprojecttask.IotProjectTaskDO;
+import cn.iocoder.yudao.module.pms.dal.mysql.IotDeviceMapper;
 import cn.iocoder.yudao.module.pms.dal.mysql.iotdevicerunlog.IotDeviceRunLogMapper;
 import cn.iocoder.yudao.module.pms.dal.mysql.tdparams.IotTdParamsMapper;
 import cn.iocoder.yudao.module.pms.service.IotDeviceService;
@@ -84,6 +85,8 @@ public class IotDeviceGroupController {
             "五级排气压力", "冷却水温度", "冷却水进口压力", "冷却水出口压力", "润滑油压力", "润滑油温度",
             "轴瓦温度1", "轴瓦温度2", "轴瓦温度3", "轴瓦温度4", "轴瓦温度5", "轴瓦温度6",
             "氮气纯度", "瞬时流量", "累计流量", "油压", "套压", "表套", "二套", "振动", "无油1#", "无油2#", "曲轴油位", "油泵状态", "风机状态", "急停状态"};
+    @Autowired
+    private IotDeviceMapper iotDeviceMapper;
 
     @PostMapping("/create")
     @Operation(summary = "创建PMS成套")
@@ -134,6 +137,10 @@ public class IotDeviceGroupController {
                 bean.setDeptName(dept.getName());
             }
             bean.setDetails(iotDeviceGroupDetailListByGroupId);
+            List<Long> deviceIds = iotDeviceGroupDetailListByGroupId.stream().map(IotDeviceGroupDetailDO::getDeviceId).collect(Collectors.toList());
+            List<IotDeviceDO> iotDeviceDOS = iotDeviceMapper.selectByIds(deviceIds);
+            boolean b = iotDeviceDOS.stream().anyMatch(f -> Objects.nonNull(f.getIfInline())&&3 == f.getIfInline());
+            bean.setIfOnline(b);
             return bean;
         }).collect(Collectors.toList());
         return success(new PageResult<>(collect, pageResult.getTotal()));

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/devicegroup/IotDeviceGroupRespVO.java

@@ -42,4 +42,6 @@ public class IotDeviceGroupRespVO {
     private String deptName;
 
     private List<IotDeviceGroupDetailDO> details;
+    @Schema(description = "是否在线")
+    private Boolean ifOnline;
 }

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

@@ -37,9 +37,6 @@ public class IotMeasureBookPageReqVO extends PageParam {
     @Schema(description = "规格型号", example = "芋艿")
     private String modelName;
 
-    @Schema(description = "有效期")
-    private LocalDateTime validity;
-
     @Schema(description = "上次检验/校准日期")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private String[] lastTime;
@@ -62,6 +59,4 @@ public class IotMeasureBookPageReqVO extends PageParam {
 
     @Schema(description = "部门id", example = "26945")
     private Long deptId;
-
-    private String measureCertNo;
 }

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

@@ -44,10 +44,6 @@ public class IotMeasureBookRespVO {
     @ExcelProperty("规格型号")
     private String modelName;
 
-    @Schema(description = "有效期")
-    @ExcelProperty("有效期")
-    private LocalDateTime validity;
-
     @Schema(description = "上次检验/校准日期")
     @ExcelProperty("上次检验/校准日期")
     private String lastTime;
@@ -75,5 +71,4 @@ public class IotMeasureBookRespVO {
     @Schema(description = "部门id", example = "26945")
     @ExcelProperty("部门id")
     private Long deptId;
-    private String measureCertNo;
 }

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

@@ -40,9 +40,6 @@ public class IotMeasureBookSaveReqVO {
     @Schema(description = "规格型号", example = "芋艿")
     private String modelName;
 
-    @Schema(description = "有效期")
-    private LocalDateTime validity;
-
     @Schema(description = "上次检验/校准日期")
     private String lastTime;
 
@@ -60,5 +57,4 @@ public class IotMeasureBookSaveReqVO {
 
     @Schema(description = "部门id", example = "26945")
     private Long deptId;
-    private String measureCertNo;
 }

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

@@ -41,4 +41,8 @@ public class IotMeasureDetectPageReqVO extends PageParam {
     @Schema(description = "部门id", example = "27536")
     private Long deptId;
 
+    @Schema(description = "证书编码")
+    private String measureCertNo;
+    @Schema(description = "检测/检验标准")
+    private String detectStandard;
 }

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

@@ -47,5 +47,8 @@ public class IotMeasureDetectRespVO {
     @Schema(description = "部门id", example = "27536")
     @ExcelProperty("部门id")
     private Long deptId;
-
+    @Schema(description = "证书编码")
+    private String measureCertNo;
+    @Schema(description = "检测/检验标准")
+    private String detectStandard;
 }

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

@@ -41,5 +41,9 @@ public class IotMeasureDetectSaveReqVO {
 
     @Schema(description = "部门id", example = "27536")
     private Long deptId;
-
+    @Schema(description = "证书编码")
+    private String measureCertNo;
+    @Schema(description = "检测/检验标准")
+    @NotEmpty(message = "检测/检验标准不能为空")
+    private String detectStandard;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/qhse/measure/IotMeasureBookDO.java

@@ -56,14 +56,6 @@ public class IotMeasureBookDO extends BaseDO {
      * 规格型号
      */
     private String modelName;
-    /**
-     * 证书编码
-     */
-    private String measureCertNo;
-    /**
-     * 有效期
-     */
-    private LocalDateTime validity;
     /**
      * 上次检验/校准日期
      */

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/qhse/measure/IotMeasureDetectDO.java

@@ -40,6 +40,10 @@ public class IotMeasureDetectDO extends BaseDO {
      * 检测/校准机构
      */
     private String detectOrg;
+    /**
+     * 检测/检验标准
+     */
+    private String detectStandard;
     /**
      * 检测/校准内容
      */
@@ -56,5 +60,8 @@ public class IotMeasureDetectDO extends BaseDO {
      * 部门id
      */
     private Long deptId;
-
+    /**
+     * 证书编码
+     */
+    private String measureCertNo;
 }

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

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

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

@@ -26,6 +26,8 @@ public interface IotMeasureDetectMapper extends BaseMapperX<IotMeasureDetectDO>
                 .eqIfPresent(IotMeasureDetectDO::getValidityPeriod, reqVO.getValidityPeriod())
                 .eqIfPresent(IotMeasureDetectDO::getDetectAmount, reqVO.getDetectAmount())
                 .betweenIfPresent(IotMeasureDetectDO::getCreateTime, reqVO.getCreateTime())
+                .likeIfPresent(IotMeasureDetectDO::getMeasureCertNo, reqVO.getMeasureCertNo())
+                .likeIfPresent(IotMeasureDetectDO::getDetectStandard, reqVO.getDetectStandard())
                 .inIfPresent(IotMeasureDetectDO::getDeptId, ids)
                 .orderByDesc(IotMeasureDetectDO::getId));
     }