设备添加车辆id，处理维修保存报错问题，添加附件权限控制

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/config/PmsDataPermissionConfiguration.java

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.pms.config;
 
 import cn.iocoder.yudao.framework.datapermission.core.rule.dept.DeptDataPermissionRuleCustomizer;
 import cn.iocoder.yudao.module.pms.dal.dataobject.IotDeviceDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.IotInfoDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.IotTreeDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.failure.IotFailureReportDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.information.IotInformationDbDO;
@@ -35,6 +36,7 @@ public class PmsDataPermissionConfiguration {
             rule.addDeptColumn(IotTreeDO.class,"dept_id");
             rule.addDeptColumn(IotDeviceDO.class,"dept_id");
             rule.addDeptColumn(IotFailureReportDO.class,"dept_id");
+            rule.addDeptColumn(IotInfoDO.class, "dept_id");
             rule.addDeptColumn(IotMaintainDO.class,"dept_id");
             rule.addDeptColumn(IotInformationDbDO.class,"dept_id");
             rule.addDeptColumn(IotMainWorkOrderDO.class,"dept_id");

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

@@ -130,4 +130,7 @@ public class IotDevicePageReqVO extends PageParam {
 
     @Schema(description = "是否设置过设备责任人/调整过状态/调拨 Y设置过 N未设置 A全部")
     private String setFlag;
+
+    @Schema(description = "车辆id")
+    private Long carId;
 }

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

@@ -182,4 +182,7 @@ public class IotDeviceRespVO {
     private String workOrderId;
     @Schema(description = "保养计划id")
     private String planId;
+
+    @Schema(description = "车辆id")
+    private Long carId;
 }

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

@@ -108,4 +108,7 @@ public class IotDeviceSaveReqVO {
 
     @Schema(description = "设备分类BOM同步状态 1已同步 0未同步")
     private Integer bomSyncStatus;
+
+    @Schema(description = "车辆id")
+    private Long carId;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/IotDeviceDO.java

@@ -152,4 +152,6 @@ public class IotDeviceDO extends BaseDO {
     private String lastInlineTime;
 
     private Long yfDeviceId ;
+
+    private Long carId;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/maintain/IotMaintainServiceImpl.java

@@ -137,7 +137,7 @@ public class IotMaintainServiceImpl implements IotMaintainService {
         IotMaintainDO iotMaintain = BeanUtils.toBean(createReqVO.getMaintain(), IotMaintainDO.class);
         iotMaintain.setFailureCode("GZ"+ DateUtil.format(new Date(), "yyyyMMddHHmmss"));
         iotMaintain.setFailureName(createReqVO.getMaintain().getDeviceName()+DateUtil.format(new Date(), "yyyyMMddHHmmss"));
-        if (iotMaintain.getAuditStatus()==20&&"out".equals(iotMaintain.getType())){
+        if (Objects.nonNull(iotMaintain.getAuditStatus())&&iotMaintain.getAuditStatus()==20&&"out".equals(iotMaintain.getType())){
             iotMaintain.setStatus("finished");
         }
         iotMaintain.setDeleted(false);