feat(core): 维护管理:添加JAVA增强处理功能并实现设备故障维修模块
- 在DbFormEnhanceController中添加javaHandle接口用于处理增强操作 - 实现EnhanceJavaService的handleEnhanceJava方法并添加事务和缓存注解 - 新增故障报修相关实体类包括DevGzbxDO、DevGzbxWxfaDO、DevGzbxWxgdDO和DevArchivesEntity - 创建设备故障维修相关控制器DevGzbxController和EquipmentArchivesController - 实现设备档案查询服务EquipmentArchivesService及对应的映射器 - 添加故障报修状态修改功能和设备档案类型查询功能 - 新增多个设备维护相关的Java增强处理器和环绕通知插件 - 实现故障编号自动生成和维修流程的状态处理逻辑
This commit is contained in:
@@ -0,0 +1,40 @@
|
||||
|
||||
package com.lideeyunji.module.biz.controller;
|
||||
|
||||
import com.lideeyunji.module.biz.entity.DevGzbxDO;
|
||||
import com.lideeyunji.module.biz.service.DevGzbxService;
|
||||
import com.lideeyunji.tool.framework.common.constant.lideeYunJiBaseConstant;
|
||||
import com.lideeyunji.tool.framework.common.pojo.CommonResult;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.validation.Valid;
|
||||
|
||||
import static com.lideeyunji.tool.framework.common.pojo.CommonResult.success;
|
||||
|
||||
/**
|
||||
* @author DX
|
||||
* @create 2026-03-3 11:59
|
||||
* @dedescription:
|
||||
*/
|
||||
@Tag(name = "设备故障维修")
|
||||
@RestController
|
||||
@Validated
|
||||
@RequestMapping(lideeYunJiBaseConstant.REQUEST_URL_START +"/gzbx")
|
||||
public class DevGzbxController {
|
||||
|
||||
@Resource
|
||||
private DevGzbxService devGzbxService;
|
||||
|
||||
@PutMapping("/updateStatus")
|
||||
@Operation(tags = "故障报修",summary = "故障报修状态修改")
|
||||
public CommonResult<Boolean> updateConfig(@Valid @RequestBody DevGzbxDO devGzbxDO) {
|
||||
devGzbxService.updateDevgGzbx(devGzbxDO);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
package com.lideeyunji.module.biz.controller;
|
||||
|
||||
|
||||
import com.lideeyunji.module.biz.entity.DevArchivesEntity;
|
||||
import com.lideeyunji.module.biz.entity.DevGzbxDO;
|
||||
import com.lideeyunji.module.biz.service.EquipmentArchivesService;
|
||||
import com.lideeyunji.module.biz.vo.DevArchivesVo;
|
||||
import com.lideeyunji.tool.framework.common.constant.lideeYunJiBaseConstant;
|
||||
import com.lideeyunji.tool.framework.common.pojo.CommonResult;
|
||||
import com.lideeyunji.tool.framework.sql.core.toolkit.CollectionUtils;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import org.mapstruct.ap.internal.util.Collections;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.validation.Valid;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
import static com.lideeyunji.tool.framework.common.pojo.CommonResult.success;
|
||||
|
||||
/**
|
||||
* @author DX
|
||||
* @create 2026-03-3 11:59
|
||||
* @dedescription:
|
||||
*/
|
||||
@Tag(name = "设备档案控制器")
|
||||
@RestController
|
||||
@Validated
|
||||
@RequestMapping(lideeYunJiBaseConstant.REQUEST_URL_START +"/dev")
|
||||
public class EquipmentArchivesController {
|
||||
|
||||
@Resource
|
||||
private EquipmentArchivesService equipmentArchivesService;
|
||||
|
||||
|
||||
@GetMapping("/selectByType/{devType}")
|
||||
@Operation(summary = "根据设备类型获取设备档案")
|
||||
public CommonResult<List<DevArchivesEntity>> getByDeviceType(@Valid @PathVariable("devType") String devType) {
|
||||
List<DevArchivesEntity> devArchives = equipmentArchivesService.selectByType(devType);
|
||||
if (CollectionUtils.isEmpty(devArchives)) {
|
||||
return CommonResult.error(400,"未找到对应设备类型的档案");
|
||||
}
|
||||
return success(devArchives);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,48 @@
|
||||
|
||||
package com.lideeyunji.module.biz.controller;
|
||||
import com.lideeyunji.core.framework.config.aspect.enhance.model.EnhanceContext;
|
||||
import com.lideeyunji.core.framework.config.aspect.enhance.plugin.AroundAdvicePlugin;
|
||||
import com.lideeyunji.module.biz.entity.*;
|
||||
import com.lideeyunji.module.biz.mapper.*;
|
||||
import com.lideeyunji.tool.framework.yunji.enums.AcceptanceStatusEnum;
|
||||
import com.lideeyunji.tool.framework.yunji.enums.ProcessingStatusEnum;
|
||||
import com.lideeyunji.tool.framework.yunji.utils.lideeYunJiUtils;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.Date;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 设备报修-环绕
|
||||
*/
|
||||
@Component("EquipmentMalfunctionCheck")
|
||||
public class EquipmentMalfunctionCheck implements AroundAdvicePlugin {
|
||||
|
||||
@Resource
|
||||
private DevGzbxWxgdMapper devGzbxWxgdMapper;
|
||||
@Resource
|
||||
private DevGzbxMapper devGzbxMapper;
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public void beforeExecute(EnhanceContext enhanceContext) {
|
||||
|
||||
Map<String, Object> params = enhanceContext.getParam().getParams();
|
||||
Long id = lideeYunJiUtils.getMap2Long(params, "id");
|
||||
DevGzbxWxgdDO yorn = devGzbxWxgdMapper.selectOne("id",id);
|
||||
yorn.setProcessingStatus(ProcessingStatusEnum.ACCEPTED.getType());
|
||||
yorn.setDevStatus(AcceptanceStatusEnum.COMPLETED.getType());
|
||||
yorn.setCompletionTime(new Date());
|
||||
yorn.setAcceptanceTime(new Date());
|
||||
DevGzbxDO devGzbxDO = devGzbxMapper.selectOne("id", yorn.getGzbxId());
|
||||
devGzbxDO.setProcessingStatus(AcceptanceStatusEnum.COMPLETED.getType());
|
||||
devGzbxWxgdMapper.updateById(yorn);
|
||||
devGzbxMapper.updateById(devGzbxDO);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void afterExecute(EnhanceContext enhanceContext) {
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,77 @@
|
||||
|
||||
package com.lideeyunji.module.biz.controller;
|
||||
import com.lideeyunji.core.framework.config.aspect.enhance.model.EnhanceContext;
|
||||
import com.lideeyunji.core.framework.config.aspect.enhance.plugin.AroundAdvicePlugin;
|
||||
import com.lideeyunji.module.biz.entity.DevGzbxDO;
|
||||
import com.lideeyunji.module.biz.entity.DevGzbxWxfaDO;
|
||||
import com.lideeyunji.module.biz.entity.DevGzbxWxgdDO;
|
||||
import com.lideeyunji.module.biz.mapper.DevGzbxMapper;
|
||||
import com.lideeyunji.module.biz.mapper.DevGzbxWxfaMapper;
|
||||
import com.lideeyunji.module.biz.mapper.DevGzbxWxgdMapper;
|
||||
import com.lideeyunji.tool.framework.yunji.utils.lideeYunJiUtils;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 设备报修方案-环绕
|
||||
*/
|
||||
@Component("equipmentMalfunctionOrder")
|
||||
public class EquipmentMalfunctionOrder implements AroundAdvicePlugin {
|
||||
|
||||
@Resource
|
||||
private DevGzbxWxfaMapper devGzbxWxfaMapper;
|
||||
@Resource
|
||||
private DevGzbxWxgdMapper devGzbxWxgdMapper;
|
||||
@Resource
|
||||
private DevGzbxMapper devGzbxMapper;
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public void beforeExecute(EnhanceContext enhanceContext) {
|
||||
|
||||
Map<String, Object> params = enhanceContext.getParam().getParams();
|
||||
Long status = lideeYunJiUtils.getMap2Long(params, "dev_status");
|
||||
Long gzbx_id = lideeYunJiUtils.getMap2Long(params, "gzbx_id");
|
||||
Long id = lideeYunJiUtils.getMap2Long(params, "gzbx_id");
|
||||
DevGzbxWxfaDO yorn = devGzbxWxfaMapper.selectById(id);
|
||||
if (status == 2) {
|
||||
if (yorn == null) {
|
||||
DevGzbxWxfaDO devGzbxWxfaDO = new DevGzbxWxfaDO();
|
||||
devGzbxWxfaDO.setDevStatus(2);
|
||||
devGzbxWxfaDO.setGzbxId(gzbx_id);
|
||||
devGzbxWxfaMapper.insertOrUpdate(devGzbxWxfaDO);
|
||||
} else {
|
||||
yorn.setDevStatus(2);
|
||||
devGzbxWxfaMapper.insertOrUpdate(yorn);
|
||||
DevGzbxWxgdDO devGzbxWxgdDO = devGzbxWxgdMapper.selectOne("gzbx_id", gzbx_id);
|
||||
devGzbxWxgdDO.setDevStatus(2);
|
||||
devGzbxWxgdMapper.updateBatch(devGzbxWxgdDO);
|
||||
DevGzbxDO devGzbxDO = devGzbxMapper.selectById(gzbx_id);
|
||||
devGzbxDO.setDevStatus(2);
|
||||
devGzbxMapper.insertOrUpdate(devGzbxDO);
|
||||
}
|
||||
} else if (status == 0) {
|
||||
if (!(yorn == null)) {
|
||||
DevGzbxWxfaDO devGzbxWxfaDO = devGzbxWxfaMapper.selectOne("gzbx_id", gzbx_id);
|
||||
devGzbxWxfaDO.setDevStatus(0);
|
||||
devGzbxWxfaMapper.updateBatch(devGzbxWxfaDO);
|
||||
DevGzbxDO devGzbxDO = devGzbxMapper.selectById(gzbx_id);
|
||||
devGzbxDO.setDevStatus(0);
|
||||
devGzbxMapper.insertOrUpdate(devGzbxDO);
|
||||
} else {
|
||||
DevGzbxDO devGzbxDO = devGzbxMapper.selectById(gzbx_id);
|
||||
devGzbxDO.setDevStatus(0);
|
||||
devGzbxMapper.insertOrUpdate(devGzbxDO);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void afterExecute(EnhanceContext enhanceContext) {
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,67 @@
|
||||
|
||||
package com.lideeyunji.module.biz.controller;
|
||||
import com.lideeyunji.core.framework.config.aspect.enhance.model.EnhanceContext;
|
||||
import com.lideeyunji.core.framework.config.aspect.enhance.plugin.AroundAdvicePlugin;
|
||||
import com.lideeyunji.module.biz.entity.DevGzbxWxfaDO;
|
||||
import com.lideeyunji.module.biz.entity.DevGzbxWxgdDO;
|
||||
import com.lideeyunji.module.biz.mapper.DevGzbxWxfaMapper;
|
||||
import com.lideeyunji.module.biz.mapper.DevGzbxWxgdMapper;
|
||||
import com.lideeyunji.tool.framework.yunji.utils.lideeYunJiUtils;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 维修方案-java增强
|
||||
*/
|
||||
@Component("equipmentMalfunctionRecord")
|
||||
public class EquipmentMalfunctionRecord implements AroundAdvicePlugin {
|
||||
|
||||
@Resource
|
||||
private DevGzbxWxfaMapper devGzbxWxfaMapper;
|
||||
@Resource
|
||||
private DevGzbxWxgdMapper devGzbxWxgdMapper;
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public void beforeExecute(EnhanceContext enhanceContext) {
|
||||
|
||||
Map<String, Object> params = enhanceContext.getParam().getParams();
|
||||
|
||||
String submitType = lideeYunJiUtils.getMap2Str(params, "submitType");
|
||||
if (!"ys".equals(submitType)) {
|
||||
return;
|
||||
}
|
||||
|
||||
Long id = lideeYunJiUtils.getMap2Long(params, "id");
|
||||
if (id == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
DevGzbxWxfaDO devGzbxWxfaDO = devGzbxWxfaMapper.selectOne("id", id);
|
||||
if (devGzbxWxfaDO == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
devGzbxWxfaDO.setDevStatus(1);
|
||||
devGzbxWxfaMapper.updateById(devGzbxWxfaDO);
|
||||
|
||||
Long gzbxId = devGzbxWxfaDO.getGzbxId();
|
||||
if (gzbxId == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
DevGzbxWxgdDO devGzbxWxgdDO = devGzbxWxgdMapper.selectOne("id", gzbxId);
|
||||
if (devGzbxWxgdDO != null) {
|
||||
devGzbxWxgdDO.setDevStatus(2);
|
||||
devGzbxWxgdMapper.updateById(devGzbxWxgdDO);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void afterExecute(EnhanceContext enhanceContext) {
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,90 @@
|
||||
|
||||
package com.lideeyunji.module.biz.controller;
|
||||
|
||||
import com.lideeyunji.core.framework.config.aspect.enhance.model.EnhanceContext;
|
||||
import com.lideeyunji.core.framework.config.aspect.enhance.plugin.AroundAdvicePlugin;
|
||||
import com.lideeyunji.core.framework.mapper.AdapterMapper;
|
||||
import com.lideeyunji.module.biz.entity.DevGzbxDO;
|
||||
import com.lideeyunji.module.biz.entity.DevGzbxWxgdDO;
|
||||
import com.lideeyunji.module.biz.mapper.DevGzbxMapper;
|
||||
import com.lideeyunji.module.biz.mapper.DevGzbxWxgdMapper;
|
||||
import com.lideeyunji.tool.framework.security.core.LoginUser;
|
||||
import com.lideeyunji.tool.framework.security.core.util.SecurityFrameworkUtils;
|
||||
import com.lideeyunji.tool.framework.yunji.enums.AcceptanceStatusEnum;
|
||||
import com.lideeyunji.tool.framework.yunji.enums.ProcessingStatusEnum;
|
||||
import com.lideeyunji.tool.framework.yunji.utils.lideeYunJiUtils;
|
||||
import jodd.util.StringUtil;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
|
||||
/**
|
||||
* 设备报修工单-环绕
|
||||
*/
|
||||
@Component("equipmentMalfunctionRepair")
|
||||
public class EquipmentMalfunctionRepair implements AroundAdvicePlugin {
|
||||
|
||||
@Resource
|
||||
private DevGzbxWxgdMapper devGzbxWxgdMapper;
|
||||
|
||||
@Resource
|
||||
private DevGzbxMapper devGzbxMapper;
|
||||
|
||||
@Resource
|
||||
private AdapterMapper adapterMapper;
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public void beforeExecute(EnhanceContext enhanceContext) {
|
||||
|
||||
Map<String, Object> params = enhanceContext.getParam().getParams();
|
||||
|
||||
String submitType = lideeYunJiUtils.getMap2Str(params, "submitType");
|
||||
if (!"ys".equals(submitType)) {
|
||||
return;
|
||||
}
|
||||
|
||||
Long id = lideeYunJiUtils.getMap2Long(params, "id");
|
||||
if (id == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
DevGzbxWxgdDO existingRecord = devGzbxWxgdMapper.selectOne("gzbx_id", id);
|
||||
if (existingRecord != null) {
|
||||
return;
|
||||
}
|
||||
|
||||
DevGzbxDO gzbxDO = devGzbxMapper.selectOne("id", id);
|
||||
if (gzbxDO == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
DevGzbxWxgdDO newRecord = new DevGzbxWxgdDO();
|
||||
BeanUtils.copyProperties(gzbxDO, newRecord);
|
||||
newRecord.setId(null);
|
||||
newRecord.setGzbxId(id);
|
||||
newRecord.setFaultType(gzbxDO.getType());
|
||||
newRecord.setFaultRemark(gzbxDO.getRemark());
|
||||
newRecord.setNumber(generateFaultNumber(params));
|
||||
newRecord.setCreateUserName(gzbxDO.getCreateUserName());
|
||||
devGzbxWxgdMapper.insert(newRecord);
|
||||
gzbxDO.setProcessingStatus(AcceptanceStatusEnum.TREATED.getType());
|
||||
devGzbxMapper.updateById(gzbxDO);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void afterExecute(EnhanceContext enhanceContext) {
|
||||
}
|
||||
|
||||
private String generateFaultNumber(Map<String, Object> params) {
|
||||
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
|
||||
return "GD" + LocalDateTime.now().format(formatter);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,66 @@
|
||||
package com.lideeyunji.module.biz.controller.maintenance;
|
||||
|
||||
|
||||
import com.lideeyunji.core.framework.config.aspect.enhance.model.EnhanceContext;
|
||||
import com.lideeyunji.core.framework.config.aspect.enhance.plugin.AroundAdvicePlugin;
|
||||
import com.lideeyunji.core.framework.mapper.AdapterMapper;
|
||||
import com.lideeyunji.module.biz.entity.DevGzbxDO;
|
||||
import com.lideeyunji.module.biz.mapper.DevGzbxMapper;
|
||||
import com.lideeyunji.tool.framework.security.core.LoginUser;
|
||||
import com.lideeyunji.tool.framework.security.core.util.SecurityFrameworkUtils;
|
||||
import com.lideeyunji.tool.framework.yunji.utils.lideeYunJiUtils;
|
||||
import jodd.util.StringUtil;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 故障报修-新增-java增强
|
||||
*/
|
||||
@Component("AddFMaintenanceOrderFunctionRecord")
|
||||
public class AddFMaintenanceOrderFunctionRecord implements AroundAdvicePlugin {
|
||||
|
||||
@Resource
|
||||
private DevGzbxMapper devGzbxMapper;
|
||||
|
||||
|
||||
@Resource
|
||||
private AdapterMapper adapterMapper;
|
||||
|
||||
@Override
|
||||
public void beforeExecute(EnhanceContext enhanceContext) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void afterExecute(EnhanceContext enhanceContext) {
|
||||
Map<String, Object> params = enhanceContext.getParam().getParams();
|
||||
String faultNumber = generateFaultNumber(params);
|
||||
Long id = lideeYunJiUtils.getMap2Long(params, "id");
|
||||
|
||||
LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
|
||||
if (loginUser == null) {
|
||||
return;
|
||||
}
|
||||
Long userId = loginUser.getId();
|
||||
|
||||
DevGzbxDO devGzbxDO = new DevGzbxDO();
|
||||
devGzbxDO.setId(id);
|
||||
devGzbxDO.setFaultNumber(faultNumber);
|
||||
devGzbxDO.setReporter(userId);
|
||||
devGzbxDO.setCreateUserName(adapterMapper.getNickname(userId));
|
||||
devGzbxMapper.updateById(devGzbxDO);
|
||||
}
|
||||
|
||||
private String generateFaultNumber(Map<String, Object> params) {
|
||||
String faultNumber = lideeYunJiUtils.getMap2Str(params, "fault_number");
|
||||
if (StringUtil.isBlank(faultNumber)) {
|
||||
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
|
||||
return "GZ" + LocalDateTime.now().format(formatter);
|
||||
}
|
||||
return faultNumber;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,71 @@
|
||||
package com.lideeyunji.module.biz.controller.maintenance;
|
||||
|
||||
|
||||
import com.lideeyunji.core.framework.config.aspect.enhance.model.EnhanceContext;
|
||||
import com.lideeyunji.core.framework.config.aspect.enhance.plugin.AroundAdvicePlugin;
|
||||
import com.lideeyunji.core.framework.mapper.AdapterMapper;
|
||||
import com.lideeyunji.module.biz.entity.DevGzbxDO;
|
||||
import com.lideeyunji.module.biz.entity.DevGzbxWxgdDO;
|
||||
import com.lideeyunji.module.biz.mapper.DevGzbxMapper;
|
||||
import com.lideeyunji.module.biz.mapper.DevGzbxWxgdMapper;
|
||||
import com.lideeyunji.tool.framework.security.core.LoginUser;
|
||||
import com.lideeyunji.tool.framework.security.core.util.SecurityFrameworkUtils;
|
||||
import com.lideeyunji.tool.framework.yunji.enums.ProcessingStatusEnum;
|
||||
import com.lideeyunji.tool.framework.yunji.utils.lideeYunJiUtils;
|
||||
import jodd.util.StringUtil;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
|
||||
/**
|
||||
* 故障报修-新增-java增强
|
||||
*/
|
||||
@Component("AddFaultFeportingFunctionRecord")
|
||||
public class AddFaultReportingFunctionRecord implements AroundAdvicePlugin {
|
||||
|
||||
@Resource
|
||||
private DevGzbxMapper devGzbxMapper;
|
||||
|
||||
|
||||
@Resource
|
||||
private AdapterMapper adapterMapper;
|
||||
|
||||
@Override
|
||||
public void beforeExecute(EnhanceContext enhanceContext) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void afterExecute(EnhanceContext enhanceContext) {
|
||||
Map<String, Object> params = enhanceContext.getParam().getParams();
|
||||
String faultNumber = generateFaultNumber(params);
|
||||
Long id = lideeYunJiUtils.getMap2Long(params, "id");
|
||||
|
||||
LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
|
||||
if (loginUser == null) {
|
||||
return;
|
||||
}
|
||||
Long userId = loginUser.getId();
|
||||
|
||||
DevGzbxDO devGzbxDO = new DevGzbxDO();
|
||||
devGzbxDO.setId(id);
|
||||
devGzbxDO.setFaultNumber(faultNumber);
|
||||
devGzbxDO.setReporter(userId);
|
||||
devGzbxDO.setCreateUserName(adapterMapper.getNickname(userId));
|
||||
devGzbxMapper.updateById(devGzbxDO);
|
||||
}
|
||||
|
||||
private String generateFaultNumber(Map<String, Object> params) {
|
||||
String faultNumber = lideeYunJiUtils.getMap2Str(params, "number");
|
||||
if (StringUtil.isBlank(faultNumber)) {
|
||||
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
|
||||
return "GZ" + LocalDateTime.now().format(formatter);
|
||||
}
|
||||
return faultNumber;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,43 @@
|
||||
package com.lideeyunji.module.biz.controller.maintenance;
|
||||
|
||||
import com.lideeyunji.core.framework.config.aspect.enhance.model.EnhanceContext;
|
||||
import com.lideeyunji.core.framework.config.aspect.enhance.plugin.AroundAdvicePlugin;
|
||||
import com.lideeyunji.module.biz.mapper.EquipmentArchivesMapper;
|
||||
import com.lideeyunji.tool.framework.sql.core.toolkit.StringUtils;
|
||||
import com.lideeyunji.tool.framework.yunji.utils.lideeYunJiUtils;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
|
||||
/**
|
||||
* 设备档案-java增强
|
||||
*/
|
||||
@Component("EquipmentArchivesFunctionRecord")
|
||||
public class EquipmentArchivesFunctionRecord implements AroundAdvicePlugin {
|
||||
|
||||
@Resource
|
||||
private EquipmentArchivesMapper equipmentArchivesMapper;
|
||||
|
||||
@Override
|
||||
public void beforeExecute(EnhanceContext enhanceContext) {
|
||||
Map<String, Object> params = enhanceContext.getParam().getParams();
|
||||
String decCode = lideeYunJiUtils.getMap2Str(params, "dev_code");
|
||||
if (StringUtils.isBlank(decCode)) {
|
||||
String newDevCode = generateFaultNumber();
|
||||
params.put("dev_code", newDevCode);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void afterExecute(EnhanceContext enhanceContext) {
|
||||
}
|
||||
|
||||
private String generateFaultNumber() {
|
||||
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
|
||||
return "SB" + LocalDateTime.now().format(formatter);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,80 @@
|
||||
package com.lideeyunji.module.biz.controller.maintenance;
|
||||
|
||||
import com.lideeyunji.core.framework.config.aspect.enhance.model.EnhanceContext;
|
||||
import com.lideeyunji.core.framework.config.aspect.enhance.plugin.AroundAdvicePlugin;
|
||||
import com.lideeyunji.module.biz.entity.DevGzbxWxfaDO;
|
||||
import com.lideeyunji.module.biz.entity.DevGzbxWxgdDO;
|
||||
import com.lideeyunji.module.biz.mapper.DevGzbxWxfaMapper;
|
||||
import com.lideeyunji.module.biz.mapper.DevGzbxWxgdMapper;
|
||||
import com.lideeyunji.tool.framework.yunji.enums.AcceptanceStatusEnum;
|
||||
import com.lideeyunji.tool.framework.yunji.enums.ProcessingStatusEnum;
|
||||
import com.lideeyunji.tool.framework.yunji.utils.lideeYunJiUtils;
|
||||
import jodd.util.StringUtil;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.Date;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 设备报修工单-环绕
|
||||
*/
|
||||
@Component("FaultRepairFunctionRecord")
|
||||
public class FaultRepairFunctionRecord implements AroundAdvicePlugin {
|
||||
@Resource
|
||||
private DevGzbxWxfaMapper devGzbxWxfaMapper;
|
||||
|
||||
@Resource
|
||||
private DevGzbxWxgdMapper devGzbxWxgdMapper;
|
||||
|
||||
// @Resource
|
||||
@Override
|
||||
public void beforeExecute(EnhanceContext enhanceContext) {
|
||||
Map<String, Object> params = enhanceContext.getParam().getParams();
|
||||
|
||||
String submitType = lideeYunJiUtils.getMap2Str(params, "submitType");
|
||||
if (!"ys".equals(submitType)) {
|
||||
return;
|
||||
}
|
||||
|
||||
Long id = lideeYunJiUtils.getMap2Long(params, "id");
|
||||
if (id == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
DevGzbxWxfaDO existingRecord = devGzbxWxfaMapper.selectOne("gzbx_id", id);
|
||||
if (existingRecord != null) {
|
||||
return;
|
||||
}
|
||||
DevGzbxWxgdDO wxgdDO = devGzbxWxgdMapper.selectOne("id", id);
|
||||
if (wxgdDO == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
DevGzbxWxfaDO newRecord = new DevGzbxWxfaDO();
|
||||
BeanUtils.copyProperties(wxgdDO, newRecord);
|
||||
newRecord.setId(null);
|
||||
newRecord.setGzbxId(id);
|
||||
newRecord.setDevStatus(0);
|
||||
newRecord.setCreateTime(new Date());
|
||||
newRecord.setNumber(generateFaultNumber(params));
|
||||
devGzbxWxfaMapper.insert(newRecord);
|
||||
wxgdDO.setDevStatus(AcceptanceStatusEnum.TREATED.getType());
|
||||
wxgdDO.setProcessingStatus(null);
|
||||
devGzbxWxgdMapper.updateById(wxgdDO);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void afterExecute(EnhanceContext enhanceContext) {
|
||||
|
||||
}
|
||||
|
||||
|
||||
private String generateFaultNumber(Map<String, Object> params) {
|
||||
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
|
||||
return "FA" + LocalDateTime.now().format(formatter);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,125 @@
|
||||
package com.lideeyunji.module.biz.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 设备档案-实体类
|
||||
*
|
||||
* @author duanxiang
|
||||
*/
|
||||
@TableName(value = "sys_device", autoResultMap = true)
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class DevArchivesEntity {
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 设备编码
|
||||
*/
|
||||
private String devCode;
|
||||
|
||||
/**
|
||||
* 设备名称
|
||||
*/
|
||||
private String devName;
|
||||
|
||||
/**
|
||||
* 设备类型
|
||||
*/
|
||||
private String devType;
|
||||
|
||||
/**
|
||||
* 设备型号
|
||||
*/
|
||||
private String devXh;
|
||||
|
||||
/**
|
||||
* 设备部门
|
||||
*/
|
||||
private String devDept;
|
||||
|
||||
/**
|
||||
* 设备所属单位
|
||||
*/
|
||||
private String devZzdw;
|
||||
|
||||
/**
|
||||
* 设备出厂日期
|
||||
*/
|
||||
private Date devCcrq;
|
||||
|
||||
/**
|
||||
* 设备启用日期
|
||||
*/
|
||||
private Date devQyrq;
|
||||
|
||||
/**
|
||||
* 设备功率/管理
|
||||
*/
|
||||
private String devGl;
|
||||
|
||||
/**
|
||||
* 设备安装位置
|
||||
*/
|
||||
private String devAzwz;
|
||||
|
||||
/**
|
||||
* 设备固定资产编码
|
||||
*/
|
||||
private String devGdzcbm;
|
||||
|
||||
/**
|
||||
* 设备图片
|
||||
*/
|
||||
private String devTp;
|
||||
|
||||
/**
|
||||
* 租户ID
|
||||
*/
|
||||
private Long tenantId;
|
||||
|
||||
/**
|
||||
* 创建人
|
||||
*/
|
||||
private Long createUser;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
private Date createTime;
|
||||
|
||||
/**
|
||||
* 创建部门
|
||||
*/
|
||||
private Long createDept;
|
||||
|
||||
/**
|
||||
* 修改人
|
||||
*/
|
||||
private Long updateUser;
|
||||
|
||||
/**
|
||||
* 修改时间
|
||||
*/
|
||||
private Date updateTime;
|
||||
|
||||
/**
|
||||
* 逻辑删除标志(0-未删除,1-已删除)
|
||||
*/
|
||||
private Integer isDeleted;
|
||||
}
|
||||
@@ -0,0 +1,156 @@
|
||||
package com.lideeyunji.module.biz.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.lideeyunji.tool.framework.tenant.core.db.TenantBaseDO;
|
||||
import lombok.*;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 故障保修 DO
|
||||
*
|
||||
* @author duanxiang
|
||||
*/
|
||||
@TableName(value = "dev_gzbx", autoResultMap = true)
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class DevGzbxDO {
|
||||
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@TableId(value = "id", type = IdType.AUTO)
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 租户ID
|
||||
*/
|
||||
@TableField("tenant_id")
|
||||
private Long tenantId;
|
||||
|
||||
/**
|
||||
* 故障编号
|
||||
*/
|
||||
@TableField("fault_number")
|
||||
private String faultNumber;
|
||||
|
||||
/**
|
||||
* 故障名称
|
||||
*/
|
||||
@TableField("name")
|
||||
private String name;
|
||||
|
||||
/**
|
||||
* 设备类型
|
||||
*/
|
||||
@TableField("dev_type")
|
||||
private Integer devType;
|
||||
|
||||
/**
|
||||
* 设备名称
|
||||
*/
|
||||
@TableField("dev_name")
|
||||
private String devName;
|
||||
|
||||
/**
|
||||
* 设备编号
|
||||
*/
|
||||
@TableField("dev_no")
|
||||
private String devNo;
|
||||
|
||||
/**
|
||||
* 故障类型(0-硬件故障 1-软件故障 2-网络故障 3-其他)
|
||||
*/
|
||||
@TableField("type")
|
||||
private Integer type;
|
||||
|
||||
/**
|
||||
* 故障备注/描述
|
||||
*/
|
||||
@TableField("remark")
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 故障级别(严重/高/中/低)
|
||||
*/
|
||||
@TableField("level")
|
||||
private Integer level;
|
||||
|
||||
/**
|
||||
* 是否停机(0-否 1-是)
|
||||
*/
|
||||
@TableField("is_stop")
|
||||
private Integer isStop;
|
||||
|
||||
/**
|
||||
* 上报人ID
|
||||
*/
|
||||
@TableField("reporter")
|
||||
private Long reporter;
|
||||
|
||||
/**
|
||||
* 手机号码
|
||||
*/
|
||||
@TableField("phone_number")
|
||||
private String phoneNumber;
|
||||
|
||||
/**
|
||||
* 创建人
|
||||
*/
|
||||
@TableField("create_user")
|
||||
private Long createUser;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@TableField("create_time")
|
||||
private Date createTime;
|
||||
|
||||
/**
|
||||
* 创建部门ID
|
||||
*/
|
||||
@TableField("create_dept")
|
||||
private Long createDept;
|
||||
|
||||
/**
|
||||
* 更新人
|
||||
*/
|
||||
@TableField("update_user")
|
||||
private Long updateUser;
|
||||
|
||||
/**
|
||||
* 更新时间
|
||||
*/
|
||||
@TableField("update_time")
|
||||
private Date updateTime;
|
||||
|
||||
/**
|
||||
* 删除标志(0-未删除 1-已删除)
|
||||
*/
|
||||
@TableField("is_deleted")
|
||||
@TableLogic
|
||||
private Integer isDeleted;
|
||||
|
||||
/**
|
||||
* 设备状态(0-正常 1-异常 2-维护中 3-已报废)
|
||||
*/
|
||||
@TableField("dev_status")
|
||||
private Integer devStatus;
|
||||
|
||||
/**
|
||||
* 处理状态(0-待处理 1-处理中 2-已处理 3-已关闭)
|
||||
*/
|
||||
@TableField("processing_status")
|
||||
private Integer processingStatus;
|
||||
|
||||
/**
|
||||
* 创建人姓名
|
||||
*/
|
||||
@TableField("create_user_name")
|
||||
private String createUserName;
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,121 @@
|
||||
package com.lideeyunji.module.biz.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 维修方案 DO
|
||||
*
|
||||
* @author duanxiang
|
||||
*/
|
||||
@TableName(value = "dev_gzbx_wxfa", autoResultMap = true)
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class DevGzbxWxfaDO {
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 更新时间
|
||||
*/
|
||||
@TableField(fill = FieldFill.UPDATE)
|
||||
private Date updateTime;
|
||||
|
||||
/**
|
||||
* 更新人
|
||||
*/
|
||||
@TableField(fill = FieldFill.UPDATE)
|
||||
private Long updateUser;
|
||||
|
||||
/**
|
||||
* 创建部门
|
||||
*/
|
||||
private Long createDept;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
private Date createTime;
|
||||
|
||||
/**
|
||||
* 创建人
|
||||
*/
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
private Long createUser;
|
||||
|
||||
/**
|
||||
* 租户ID
|
||||
*/
|
||||
private Long tenantId;
|
||||
|
||||
/**
|
||||
* 逻辑删除标志(0-正常,1-已删除)
|
||||
*/
|
||||
@TableLogic
|
||||
@TableField(select = false)
|
||||
private Integer isDeleted;
|
||||
|
||||
/**
|
||||
* 设备类型(0-电脑,1-打印机,2-网络设备,3-其他)
|
||||
*/
|
||||
private Integer devType;
|
||||
|
||||
/**
|
||||
* 设备名称
|
||||
*/
|
||||
private String devName;
|
||||
|
||||
/**
|
||||
* 设备编号
|
||||
*/
|
||||
private String devNo;
|
||||
|
||||
/**
|
||||
* 故障类型(0-硬件故障,1-软件故障,2-网络故障,3-其他)
|
||||
*/
|
||||
private Integer faultType;
|
||||
|
||||
/**
|
||||
* 故障描述
|
||||
*/
|
||||
private String faultRemark;
|
||||
|
||||
/**
|
||||
* 设备状态(0-正常,1-故障,2-维修中,3-已报废)
|
||||
*/
|
||||
private Integer devStatus;
|
||||
|
||||
/**
|
||||
* 工单报修ID
|
||||
*/
|
||||
private Long gzbxId;
|
||||
|
||||
/**
|
||||
* 处理状态(0-待处理,1-处理中,2-已完成,3-已关闭)
|
||||
*/
|
||||
private Integer processingStatus;
|
||||
|
||||
/**
|
||||
* 姓名/联系人
|
||||
*/
|
||||
private String name;
|
||||
|
||||
/**
|
||||
* 号码/联系电话
|
||||
*/
|
||||
private String number;
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,199 @@
|
||||
package com.lideeyunji.module.biz.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Date;
|
||||
|
||||
import static com.lideeyunji.tool.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
||||
import static com.lideeyunji.tool.framework.common.util.date.DateUtils.TIME_ZONE_DEFAULT;
|
||||
|
||||
/**
|
||||
* 维修故障 DO
|
||||
*
|
||||
* @author duanxiang
|
||||
*/
|
||||
@TableName(value = "dev_gzbx_wxgd", autoResultMap = true)
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class DevGzbxWxgdDO {
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@TableId(value = "id", type = IdType.AUTO)
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 故障报修ID
|
||||
*/
|
||||
@TableField("gzbx_id")
|
||||
private Long gzbxId;
|
||||
|
||||
/**
|
||||
* 删除标志(0-未删除 1-已删除)
|
||||
*/
|
||||
@TableField("is_deleted")
|
||||
@TableLogic
|
||||
private Integer isDeleted;
|
||||
|
||||
/**
|
||||
* 更新时间
|
||||
*/
|
||||
@TableField("update_time")
|
||||
private LocalDateTime updateTime;
|
||||
|
||||
/**
|
||||
* 更新人
|
||||
*/
|
||||
@TableField("update_user")
|
||||
private Long updateUser;
|
||||
|
||||
/**
|
||||
* 创建部门ID
|
||||
*/
|
||||
@TableField("create_dept")
|
||||
private Long createDept;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@TableField("create_time")
|
||||
private Date createTime;
|
||||
|
||||
/**
|
||||
* 创建人
|
||||
*/
|
||||
@TableField("create_user")
|
||||
private Long createUser;
|
||||
|
||||
/**
|
||||
* 租户ID
|
||||
*/
|
||||
@TableField("tenant_id")
|
||||
private Long tenantId;
|
||||
|
||||
/**
|
||||
* 处理状态(0-待处理 1-处理中 2-已处理 3-已关闭)
|
||||
*/
|
||||
@TableField("processing_status")
|
||||
private Integer processingStatus;
|
||||
|
||||
/**
|
||||
* 故障名称
|
||||
*/
|
||||
@TableField("name")
|
||||
private String name;
|
||||
|
||||
/**
|
||||
* 故障类型
|
||||
*/
|
||||
@TableField("fault_type")
|
||||
private Integer faultType;
|
||||
|
||||
/**
|
||||
* 设备编号
|
||||
*/
|
||||
@TableField("dev_no")
|
||||
private String devNo;
|
||||
|
||||
/**
|
||||
* 设备名称
|
||||
*/
|
||||
@TableField("dev_name")
|
||||
private String devName;
|
||||
|
||||
/**
|
||||
* 优先级(
|
||||
*/
|
||||
@TableField("priority")
|
||||
private String priority;
|
||||
|
||||
/**
|
||||
* 工单类型
|
||||
*/
|
||||
@TableField("type")
|
||||
private String type;
|
||||
|
||||
/**
|
||||
* 工单编号
|
||||
*/
|
||||
@TableField("number")
|
||||
private String number;
|
||||
|
||||
/**
|
||||
* 故障备注/描述
|
||||
*/
|
||||
@TableField("fault_remark")
|
||||
private String faultRemark;
|
||||
|
||||
/**
|
||||
* 设备类型(
|
||||
*/
|
||||
@TableField("dev_type")
|
||||
private Integer devType;
|
||||
|
||||
/**
|
||||
* 维修人员ID
|
||||
*/
|
||||
@TableField("maintenance_person")
|
||||
private Long maintenancePerson;
|
||||
|
||||
/**
|
||||
* 是否停机(0-否 1-是)
|
||||
*/
|
||||
@TableField("is_top")
|
||||
private Integer isTop;
|
||||
|
||||
/**
|
||||
* 是否备案(0-否 1-是)
|
||||
*/
|
||||
@TableField("is_filing")
|
||||
private Integer isFiling;
|
||||
|
||||
/**
|
||||
* 上报人ID
|
||||
*/
|
||||
@TableField("reporter")
|
||||
private Long reporter;
|
||||
|
||||
/**
|
||||
* 手机号码
|
||||
*/
|
||||
@TableField("phone_number")
|
||||
private String phoneNumber;
|
||||
|
||||
/**
|
||||
* 设备状态
|
||||
*/
|
||||
@TableField("dev_status")
|
||||
private Integer devStatus;
|
||||
/**
|
||||
* 严重级别
|
||||
*/
|
||||
private Integer level;
|
||||
/**
|
||||
* 完成时间
|
||||
*/
|
||||
@JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT)
|
||||
private Date completionTime;
|
||||
|
||||
/**
|
||||
* 完成时间
|
||||
*/
|
||||
@JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT)
|
||||
private Date acceptanceTime;
|
||||
|
||||
/**
|
||||
* 创建人姓名
|
||||
*/
|
||||
@TableField("create_user_name")
|
||||
private String createUserName;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
|
||||
package com.lideeyunji.module.biz.mapper;
|
||||
|
||||
|
||||
import com.lideeyunji.module.biz.entity.DevGzbxDO;
|
||||
import com.lideeyunji.tool.framework.mybatis.core.mapper.BaseMapperX;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* demo相关
|
||||
*/
|
||||
@Mapper
|
||||
public interface DevGzbxMapper extends BaseMapperX<DevGzbxDO> {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
|
||||
package com.lideeyunji.module.biz.mapper;
|
||||
|
||||
|
||||
import com.lideeyunji.module.biz.entity.DevGzbxWxfaDO;
|
||||
import com.lideeyunji.tool.framework.mybatis.core.mapper.BaseMapperX;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* demo相关
|
||||
*/
|
||||
@Mapper
|
||||
public interface DevGzbxWxfaMapper extends BaseMapperX<DevGzbxWxfaDO> {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
|
||||
package com.lideeyunji.module.biz.mapper;
|
||||
|
||||
|
||||
import com.lideeyunji.module.biz.entity.DevGzbxWxgdDO;
|
||||
import com.lideeyunji.tool.framework.mybatis.core.mapper.BaseMapperX;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* demo相关
|
||||
*/
|
||||
@Mapper
|
||||
public interface DevGzbxWxgdMapper extends BaseMapperX<DevGzbxWxgdDO> {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
|
||||
package com.lideeyunji.module.biz.mapper;
|
||||
|
||||
|
||||
import com.lideeyunji.module.biz.entity.DevArchivesEntity;
|
||||
import com.lideeyunji.tool.framework.mybatis.core.mapper.BaseMapperX;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
/**
|
||||
* 设备档案
|
||||
*/
|
||||
@Mapper
|
||||
public interface EquipmentArchivesMapper extends BaseMapperX<DevArchivesEntity> {
|
||||
|
||||
DevArchivesEntity selectByType(@Param("devType")String devType);
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
package com.lideeyunji.module.biz.service;
|
||||
import com.lideeyunji.module.biz.entity.DevGzbxDO;
|
||||
|
||||
import javax.validation.Valid;
|
||||
|
||||
/**
|
||||
* 故障报修 Service 接口
|
||||
*
|
||||
* @author dx
|
||||
*/
|
||||
public interface DevGzbxService {
|
||||
|
||||
/**
|
||||
* 创建故障报修
|
||||
*
|
||||
* @param devGzbxDO 修改报修状态
|
||||
* @return 配置编号
|
||||
*/
|
||||
void updateDevgGzbx(@Valid DevGzbxDO devGzbxDO);
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
package com.lideeyunji.module.biz.service;
|
||||
|
||||
import com.lideeyunji.module.biz.entity.DevArchivesEntity;
|
||||
|
||||
import javax.validation.Valid;
|
||||
import java.util.List;
|
||||
|
||||
public interface EquipmentArchivesService
|
||||
{
|
||||
List<DevArchivesEntity> selectByType(@Valid String devType);
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
package com.lideeyunji.module.biz.service.impl;
|
||||
|
||||
import com.google.common.annotations.VisibleForTesting;
|
||||
import com.lideeyunji.module.biz.entity.DevGzbxDO;
|
||||
import com.lideeyunji.module.biz.mapper.DevGzbxMapper;
|
||||
import com.lideeyunji.module.biz.service.DevGzbxService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
/**
|
||||
* 参数配置 Service 实现类
|
||||
*/
|
||||
@Service
|
||||
@Slf4j
|
||||
@Validated
|
||||
public class DevGzbxServiceImpl implements DevGzbxService {
|
||||
|
||||
@Resource
|
||||
private DevGzbxMapper devGzbxMapper;
|
||||
|
||||
@Override
|
||||
public void updateDevgGzbx(DevGzbxDO devGzbxDO) {
|
||||
devGzbxDO.setDevStatus(1);
|
||||
devGzbxMapper.updateById(devGzbxDO);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
package com.lideeyunji.module.biz.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.lideeyunji.module.biz.entity.DevArchivesEntity;
|
||||
import com.lideeyunji.module.biz.mapper.EquipmentArchivesMapper;
|
||||
import com.lideeyunji.module.biz.service.EquipmentArchivesService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
@Slf4j
|
||||
@Validated
|
||||
public class EquipmentArchivesServiceImpl implements EquipmentArchivesService {
|
||||
|
||||
@Resource
|
||||
private EquipmentArchivesMapper equipmentArchivesMapper;
|
||||
|
||||
@Override
|
||||
public List<DevArchivesEntity> selectByType(String devType) {
|
||||
LambdaQueryWrapper<DevArchivesEntity> queryWrapper = new LambdaQueryWrapper<>();
|
||||
queryWrapper.eq(DevArchivesEntity::getDevType, devType).eq(DevArchivesEntity::getIsDeleted, 0);
|
||||
return equipmentArchivesMapper.selectList(queryWrapper);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,112 @@
|
||||
package com.lideeyunji.module.biz.vo;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
@Data
|
||||
public class DevArchivesVo {
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 设备编码
|
||||
*/
|
||||
private String devCode;
|
||||
|
||||
/**
|
||||
* 设备名称
|
||||
*/
|
||||
private String devName;
|
||||
|
||||
/**
|
||||
* 设备类型
|
||||
*/
|
||||
private String devType;
|
||||
|
||||
/**
|
||||
* 设备型号
|
||||
*/
|
||||
private String devXh;
|
||||
|
||||
/**
|
||||
* 设备部门
|
||||
*/
|
||||
private String devDept;
|
||||
|
||||
/**
|
||||
* 设备所属单位
|
||||
*/
|
||||
private String devZzdw;
|
||||
|
||||
/**
|
||||
* 设备出厂日期
|
||||
*/
|
||||
private Date devCcrq;
|
||||
|
||||
/**
|
||||
* 设备启用日期
|
||||
*/
|
||||
private Date devQyrq;
|
||||
|
||||
/**
|
||||
* 设备功率/管理
|
||||
*/
|
||||
private String devGl;
|
||||
|
||||
/**
|
||||
* 设备安装位置
|
||||
*/
|
||||
private String devAzwz;
|
||||
|
||||
/**
|
||||
* 设备固定资产编码
|
||||
*/
|
||||
private String devGdzcbm;
|
||||
|
||||
/**
|
||||
* 设备图片
|
||||
*/
|
||||
private String devTp;
|
||||
|
||||
/**
|
||||
* 租户ID
|
||||
*/
|
||||
private Long tenantId;
|
||||
|
||||
/**
|
||||
* 创建人
|
||||
*/
|
||||
private Long createUser;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
private Date createTime;
|
||||
|
||||
/**
|
||||
* 创建部门
|
||||
*/
|
||||
private Long createDept;
|
||||
|
||||
/**
|
||||
* 修改人
|
||||
*/
|
||||
private Long updateUser;
|
||||
|
||||
/**
|
||||
* 修改时间
|
||||
*/
|
||||
private Date updateTime;
|
||||
|
||||
/**
|
||||
* 逻辑删除标志(0-未删除,1-已删除)
|
||||
*/
|
||||
private Integer isDeleted;
|
||||
}
|
||||
Reference in New Issue
Block a user