Merge remote-tracking branch 'origin/master'

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

@@ -13,7 +13,7 @@ public class LyDeviceSaveReqVO {
     private Long id;
 
     @Schema(description = "设备id", example = "19197")
-    @NotEmpty(message = "设备信息不能为空")
+//    @NotEmpty(message = "设备信息不能为空")
     private Long deviceId;
 
     @Schema(description = "部门id", example = "8641")

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

@@ -1,5 +1,7 @@
 package cn.iocoder.yudao.module.pms.controller.admin.maintain;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
 import cn.iocoder.yudao.framework.common.exception.ErrorCode;
 import cn.iocoder.yudao.framework.common.exception.ServiceException;
@@ -9,7 +11,6 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.yudao.module.pms.controller.admin.failure.vo.IotFailureReportProcessVO;
-import cn.iocoder.yudao.module.pms.controller.admin.failure.vo.IotFailureReportRespVO;
 import cn.iocoder.yudao.module.pms.controller.admin.maintain.vo.IotMaintainPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.maintain.vo.IotMaintainRespVO;
 import cn.iocoder.yudao.module.pms.controller.admin.maintain.vo.IotMaintainSaveVO;
@@ -18,6 +19,8 @@ import cn.iocoder.yudao.module.pms.dal.dataobject.failure.IotFailureReportDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.maintain.IotMaintainBomDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.maintain.IotMaintainDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.oa.IotOaPersonDO;
+import cn.iocoder.yudao.module.pms.dal.mysql.IotDeviceMapper;
+import cn.iocoder.yudao.module.pms.dal.mysql.maintain.IotMaintainMapper;
 import cn.iocoder.yudao.module.pms.enums.ErrorCodeConstant;
 import cn.iocoder.yudao.module.pms.oa.CallBackOaVo;
 import cn.iocoder.yudao.module.pms.service.IotDeviceService;
@@ -45,6 +48,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.annotation.security.PermitAll;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
@@ -81,6 +85,10 @@ public class IotMaintainController {
     private DeptApi deptApi;
     @Autowired
     private DictDataService dictDataService;
+    @Autowired
+    private IotMaintainMapper iotMaintainMapper;
+    @Autowired
+    private IotDeviceMapper iotDeviceMapper;
 
     @PostMapping("/create")
     @Operation(summary = "创建维修工单")
@@ -151,8 +159,12 @@ public class IotMaintainController {
                     iotMaintainRespVO.setCreateName(user.getNickname());
                 }
             }
-            String deviceCompany = iotDeviceService.getDeviceCompany(e.getDeviceId());
-            iotMaintainRespVO.setCompany(deviceCompany);
+            if (e.getFailureCode().contains("GZRDLS")) {
+                iotMaintainRespVO.setCompany("rd");
+            } else {
+                String deviceCompany = iotDeviceService.getDeviceCompany(e.getDeviceId());
+                iotMaintainRespVO.setCompany(deviceCompany);
+            }
             return iotMaintainRespVO;
         }).collect(Collectors.toList());
         return success(new PageResult<>(collect, pageResult.getTotal()));
@@ -266,4 +278,22 @@ public class IotMaintainController {
         iotMaintainService.methodDeal(maintainMethod);
         return success("成功");
     }
+
+    @GetMapping("/init-maintain")
+    @PermitAll
+    public void initMaintain() {
+        List<IotMaintainDO> deviceId = iotMaintainMapper.selectList("device_id", 10001);
+        deviceId.forEach(device -> {
+            List<IotDeviceDO> iotDeviceDOS = iotDeviceMapper.selectList("yf_device_code", device.getDeviceCode());
+            if (CollUtil.isNotEmpty(iotDeviceDOS)) {
+                IotDeviceDO iotDeviceDO = iotDeviceDOS.get(0);
+                device.setDeviceId(iotDeviceDO.getId());
+                device.setDeptId(iotDeviceDO.getDeptId());
+                device.setDeviceName(iotDeviceDO.getDeviceName());
+                device.setFailureName(iotDeviceDO.getDeviceCode()+iotDeviceDO.getDeviceName()+ DateUtil.format(device.getMaintainStartTime(),"yyyyMMdd"));
+//                iotMaintainMapper.updateById(device);
+            }
+        });
+        iotMaintainMapper.updateBatch(deviceId);
+    }
 }

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

@@ -50,7 +50,7 @@ public interface IotMaintainMapper extends BaseMapperX<IotMaintainDO> {
                 .eqIfPresent(IotMaintainDO::getProcessInstanceId, reqVO.getProcessInstanceId())
                 .eqIfPresent(IotMaintainDO::getAuditStatus, reqVO.getAuditStatus())
                 .inIfPresent(IotMaintainDO::getDeptId, ids)
-                .orderByDesc(IotMaintainDO::getId));
+                .orderByDesc(IotMaintainDO::getCreateTime));
     }
 
     default PageResult<IotMaintainDO> selectPageApp(IotMaintainPageReqVO reqVO, Collection<Long> ids) {