后端上传

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

@@ -122,6 +122,17 @@ public class IotDeviceController {
         iotDeviceRespVO.setAssetClassName(Objects.nonNull(iotProductClassify)?iotProductClassify.getName():"");
 //        IotModelDO iotModel = iotModelService.getIotModel(iotDevice.getModel());
 //        iotDeviceRespVO.setModelName(Objects.nonNull(iotModel)?iotModel.getName():"");
+        List<YfDeviceDO> allDevice = yfDeviceService.getAllDevice();
+        allDevice.stream().filter(e -> e.getSerialNumber().equals(iotDevice.getDeviceCode())).findFirst().ifPresent(e -> {
+            iotDeviceRespVO.setIfInline(e.getStatus());
+            List<DeviceVO> deviceVOS = deviceMapper.selectNew(e.getSerialNumber());
+            if (CollUtil.isNotEmpty(deviceVOS)) {
+                Timestamp ts = deviceVOS.get(0).getTs();
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                String format = sdf.format(ts);
+                iotDeviceRespVO.setLastInlineTime(format);
+            }
+        });
         return success(iotDeviceRespVO);
     }
 

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/failure/IotFailureReportMapper.java

@@ -20,7 +20,7 @@ public interface IotFailureReportMapper extends BaseMapperX<IotFailureReportDO>
     default PageResult<IotFailureReportDO> selectPage(IotFailureReportPageReqVO reqVO) {
 
         return selectPage(reqVO, new LambdaQueryWrapperX<IotFailureReportDO>()
-                .eqIfPresent(IotFailureReportDO::getFailureCode, reqVO.getFailureCode())
+                .likeIfPresent(IotFailureReportDO::getFailureCode, reqVO.getFailureCode())
                 .likeIfPresent(IotFailureReportDO::getFailureName, reqVO.getFailureName())
                 .eqIfPresent(IotFailureReportDO::getDeviceId, reqVO.getDeviceId())
                 .eqIfPresent(IotFailureReportDO::getStatus, reqVO.getStatus())

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/inspect/IotInspectItemMapper.java

@@ -17,7 +17,7 @@ public interface IotInspectItemMapper extends BaseMapperX<IotInspectItemDO> {
 
     default PageResult<IotInspectItemDO> selectPage(IotInspectItemPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<IotInspectItemDO>()
-                .eqIfPresent(IotInspectItemDO::getItem, reqVO.getItem())
+                .likeIfPresent(IotInspectItemDO::getItem, reqVO.getItem())
                 .eqIfPresent(IotInspectItemDO::getStandard, reqVO.getStandard())
                 .eqIfPresent(IotInspectItemDO::getSort, reqVO.getSort())
                 .eqIfPresent(IotInspectItemDO::getRemark, reqVO.getRemark())

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/inspect/IotInspectOrderMapper.java

@@ -19,7 +19,7 @@ public interface IotInspectOrderMapper extends BaseMapperX<IotInspectOrderDO> {
 
     default PageResult<IotInspectOrderDO> selectPage(IotInspectOrderPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<IotInspectOrderDO>()
-                .eqIfPresent(IotInspectOrderDO::getInspectOrderTitle, reqVO.getInspectOrderTitle())
+                .likeIfPresent(IotInspectOrderDO::getInspectOrderTitle, reqVO.getInspectOrderTitle())
                 .eqIfPresent(IotInspectOrderDO::getInspectOrderCode, reqVO.getInspectOrderCode())
                 .eqIfPresent(IotInspectOrderDO::getStatus, reqVO.getStatus())
                 .eqIfPresent(IotInspectOrderDO::getRemark, reqVO.getRemark())

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/inspect/IotInspectPlanMapper.java

@@ -19,7 +19,7 @@ public interface IotInspectPlanMapper extends BaseMapperX<IotInspectPlanDO> {
 
     default PageResult<IotInspectPlanDO> selectPage(IotInspectPlanPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<IotInspectPlanDO>()
-                .eqIfPresent(IotInspectPlanDO::getPlanTitle, reqVO.getPlanTitle())
+                .likeIfPresent(IotInspectPlanDO::getPlanTitle, reqVO.getPlanTitle())
                 .eqIfPresent(IotInspectPlanDO::getPlanCode, reqVO.getPlanCode())
                 .eqIfPresent(IotInspectPlanDO::getPlanCycle, reqVO.getPlanCycle())
                 .eqIfPresent(IotInspectPlanDO::getPlanUnit, reqVO.getPlanUnit())

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/maintain/IotMaintainMapper.java

@@ -19,7 +19,7 @@ public interface IotMaintainMapper extends BaseMapperX<IotMaintainDO> {
 
     default PageResult<IotMaintainDO> selectPage(IotMaintainPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<IotMaintainDO>()
-                .eqIfPresent(IotMaintainDO::getFailureCode, reqVO.getFailureCode())
+                .likeIfPresent(IotMaintainDO::getFailureCode, reqVO.getFailureCode())
                 .likeIfPresent(IotMaintainDO::getFailureName, reqVO.getFailureName())
                 .eqIfPresent(IotMaintainDO::getDeviceId, reqVO.getDeviceId())
                 .eqIfPresent(IotMaintainDO::getStatus, reqVO.getStatus())