|
@@ -23,6 +23,8 @@ import cn.iocoder.yudao.module.pms.dal.mysql.inspect.IotInspectPlanMapper;
|
|
import cn.iocoder.yudao.module.pms.message.PmsMessage;
|
|
import cn.iocoder.yudao.module.pms.message.PmsMessage;
|
|
import cn.iocoder.yudao.module.pms.service.IotDeviceService;
|
|
import cn.iocoder.yudao.module.pms.service.IotDeviceService;
|
|
import cn.iocoder.yudao.module.pms.service.iotdeviceperson.IotDevicePersonService;
|
|
import cn.iocoder.yudao.module.pms.service.iotdeviceperson.IotDevicePersonService;
|
|
|
|
+import cn.iocoder.yudao.module.system.api.dept.DeptApi;
|
|
|
|
+import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
|
|
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
|
|
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
|
|
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
|
|
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
|
|
import cn.iocoder.yudao.module.system.service.dept.DeptService;
|
|
import cn.iocoder.yudao.module.system.service.dept.DeptService;
|
|
@@ -73,6 +75,8 @@ public class IotInspectOrderServiceImpl implements IotInspectOrderService {
|
|
private PmsMessage pmsMessage;
|
|
private PmsMessage pmsMessage;
|
|
@Autowired
|
|
@Autowired
|
|
private IotDeviceService iotDeviceService;
|
|
private IotDeviceService iotDeviceService;
|
|
|
|
+ @Autowired
|
|
|
|
+ private DeptApi deptApi;
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@@ -245,7 +249,14 @@ public class IotInspectOrderServiceImpl implements IotInspectOrderService {
|
|
|
|
|
|
IotInspectOrderDO iotInspectOrderDO = new IotInspectOrderDO();
|
|
IotInspectOrderDO iotInspectOrderDO = new IotInspectOrderDO();
|
|
AdminUserRespDTO user = adminUserApi.getUser(k);
|
|
AdminUserRespDTO user = adminUserApi.getUser(k);
|
|
- iotInspectOrderDO.setInspectOrderTitle((Objects.nonNull(user)?user.getNickname():"")+"/"+ DateUtil.format(LocalDateTime.now(), "yyyy-MM-dd")+"-巡检工单");
|
|
|
|
|
|
+ String deptName = "";
|
|
|
|
+ if (Objects.nonNull(user)&&Objects.nonNull(user.getDeptId())) {
|
|
|
|
+ DeptRespDTO dept = deptApi.getDept(user.getDeptId());
|
|
|
|
+ if (Objects.nonNull(dept)) {
|
|
|
|
+ deptName = dept.getName();
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ iotInspectOrderDO.setInspectOrderTitle(deptName+"/"+(Objects.nonNull(user)?user.getNickname():"")+"/"+ DateUtil.format(LocalDateTime.now(), "yyyy-MM-dd")+"-巡检工单");
|
|
iotInspectOrderDO.setInspectOrderCode("IN"+ DateUtil.format(new Date(),"yyyyMMddHHmmss")+UUID.randomUUID().toString().substring(0, 4));
|
|
iotInspectOrderDO.setInspectOrderCode("IN"+ DateUtil.format(new Date(),"yyyyMMddHHmmss")+UUID.randomUUID().toString().substring(0, 4));
|
|
iotInspectOrderDO.setCharge(k);
|
|
iotInspectOrderDO.setCharge(k);
|
|
iotInspectOrderDO.setStatus("todo");
|
|
iotInspectOrderDO.setStatus("todo");
|