巡检路线

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/inspect/item/vo/IotInspectItemPageReqVO.java

@@ -33,23 +33,12 @@ public class IotInspectItemPageReqVO extends PageParam {
 
     @Schema(description = "部门id", example = "5369")
     private Long deptId;
-    /**
-     * 设备分类id
-     */
+    @Schema(description = "设备分类id")
     private Long deviceClassify;
-
-    /**
-     * 设备id
-     */
+    @Schema(description = "设备id")
     private Long deviceId;
-
-    /**
-     * 设备分类名称
-     */
+    @Schema(description = "设备分类名称")
     private String deviceClassifyName;
-
-    /**
-     * 设备名称
-     */
+    @Schema(description = "设备名称")
     private String deviceName;
 }

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

@@ -23,6 +23,8 @@ public interface IotInspectItemMapper extends BaseMapperX<IotInspectItemDO> {
                 .eqIfPresent(IotInspectItemDO::getRemark, reqVO.getRemark())
                 .betweenIfPresent(IotInspectItemDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(IotInspectItemDO::getDeptId, reqVO.getDeptId())
+                .eqIfPresent(IotInspectItemDO::getDeviceClassify, reqVO.getDeviceClassify())
+                .eqIfPresent(IotInspectItemDO::getDeviceId, reqVO.getDeviceId())
                 .orderByDesc(IotInspectItemDO::getId));
     }
 

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/inspect/IotInspectRouteServiceImpl.java

@@ -2,9 +2,11 @@ package cn.iocoder.yudao.module.pms.service.inspect;
 
 import cn.iocoder.yudao.module.pms.controller.admin.inspect.route.vo.IotInspectRoutePageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.inspect.route.vo.IotInspectRouteSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.IotProductClassifyDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.inspect.IotInspectRouteDO;
 import cn.iocoder.yudao.module.pms.dal.mysql.inspect.IotInspectRouteMapper;
 import cn.iocoder.yudao.module.pms.enums.ErrorCodeConstant;
+import cn.iocoder.yudao.module.pms.service.IotProductClassifyService;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -29,11 +31,18 @@ public class IotInspectRouteServiceImpl implements IotInspectRouteService {
 
     @Resource
     private IotInspectRouteMapper iotInspectRouteMapper;
+    @Resource
+    private IotProductClassifyService iotProductClassifyService;
 
     @Override
     public Long createIotInspectRoute(IotInspectRouteSaveReqVO createReqVO) {
         // 插入
         IotInspectRouteDO iotInspectRoute = BeanUtils.toBean(createReqVO, IotInspectRouteDO.class);
+        iotInspectRoute.setDeleted(false);
+        IotProductClassifyDO iotProductClassify = iotProductClassifyService.getIotProductClassify(iotInspectRoute.getDeviceClassify());
+        if (Objects.nonNull(iotProductClassify)) {
+            iotInspectRoute.setDeviceClassifyName(iotProductClassify.getName());
+        }
         iotInspectRouteMapper.insert(iotInspectRoute);
         // 返回
         return iotInspectRoute.getId();