feat: 设备管理优化-0510
chenhc
1 year ago
parent
58ace1f05d
commit
958aa625ad
@ -0,0 +1,68 @@
|
||||
package com.glxp.api.controller.dev;
|
||||
|
||||
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.glxp.api.annotation.AuthRuleAnnotation;
|
||||
import com.glxp.api.common.res.BaseResponse;
|
||||
import com.glxp.api.common.util.ResultVOUtils;
|
||||
import com.glxp.api.controller.BaseController;
|
||||
import com.glxp.api.entity.dev.DeviceCheckDetailEntity;
|
||||
import com.glxp.api.req.dev.*;
|
||||
import com.glxp.api.res.PageSimpleResponse;
|
||||
import com.glxp.api.res.dev.DeviceRepairApplyDetailMiniResponse;
|
||||
import com.glxp.api.service.dev.DeviceCheckDetailService;
|
||||
import com.glxp.api.service.dev.DeviceRepairApplyDetailService;
|
||||
import groovy.util.logging.Slf4j;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.validation.Valid;
|
||||
import java.util.List;
|
||||
|
||||
@Slf4j
|
||||
@RestController
|
||||
@RequestMapping
|
||||
@RequiredArgsConstructor
|
||||
public class DeviceMiniController extends BaseController {
|
||||
|
||||
private final DeviceRepairApplyDetailService deviceRepairApplyDetailService;
|
||||
private final DeviceCheckDetailService deviceCheckDetailService;
|
||||
|
||||
/**
|
||||
* 获取明细报修单列表分页
|
||||
*
|
||||
* @param query
|
||||
* @return
|
||||
*/
|
||||
@AuthRuleAnnotation("")
|
||||
@PostMapping("/udi/device/repair/apply/detail/mini/page")
|
||||
public BaseResponse miniPage(@RequestBody @Valid DeviceRepairApplyDetailMiniQuery query) {
|
||||
List<DeviceRepairApplyDetailMiniResponse> list = deviceRepairApplyDetailService.miniPage(query);
|
||||
PageInfo pageInfo = new PageInfo<>(list);
|
||||
PageSimpleResponse page = new PageSimpleResponse();
|
||||
page.setTotal(pageInfo.getTotal());
|
||||
page.setList(pageInfo.getList());
|
||||
return ResultVOUtils.success(page);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 巡检任务单明细列表
|
||||
*
|
||||
* @param query
|
||||
* @return
|
||||
*/
|
||||
@AuthRuleAnnotation("")
|
||||
@PostMapping("/udi/device/check/detail/mini/page")
|
||||
public BaseResponse miniPage(@RequestBody @Valid DeviceCheckDetailMiniQuery query) {
|
||||
List<DeviceCheckDetailEntity> list = deviceCheckDetailService.miniPage(query);
|
||||
PageInfo pageInfo = new PageInfo<>(list);
|
||||
PageSimpleResponse page = new PageSimpleResponse();
|
||||
page.setTotal(pageInfo.getTotal());
|
||||
page.setList(pageInfo.getList());
|
||||
return ResultVOUtils.success(page);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,29 @@
|
||||
package com.glxp.api.req.dev;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.glxp.api.util.page.ListPageRequest;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
|
||||
@Data
|
||||
public class DeviceCheckDetailMiniQuery extends ListPageRequest {
|
||||
|
||||
/**
|
||||
* 部门编码
|
||||
*/
|
||||
@NotBlank(message = "缺少部门编码")
|
||||
private String deptCode;
|
||||
|
||||
/**
|
||||
* 模糊设备码和UDI
|
||||
*/
|
||||
private String deviceCodeAndUdi;
|
||||
|
||||
/**
|
||||
* 是否完成
|
||||
*/
|
||||
private Boolean finishFlag;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,28 @@
|
||||
package com.glxp.api.req.dev;
|
||||
|
||||
import com.glxp.api.util.page.ListPageRequest;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
|
||||
@Data
|
||||
public class DeviceRepairApplyDetailMiniQuery extends ListPageRequest {
|
||||
|
||||
/**
|
||||
* 部门编码
|
||||
*/
|
||||
@NotBlank(message = "缺少部门编码")
|
||||
private String deptCode;
|
||||
|
||||
/**
|
||||
* 模糊设备码和UDI
|
||||
*/
|
||||
private String deviceCodeAndUdi;
|
||||
|
||||
/**
|
||||
* 状态 待诊断、待维修、维修中、完成',
|
||||
*/
|
||||
private String status;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,202 @@
|
||||
package com.glxp.api.res.dev;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.glxp.api.enums.dev.DeviceRepairApplyDetailStatusEnum;
|
||||
import com.glxp.api.enums.dev.DeviceRepairApplyStatusEnum;
|
||||
import lombok.Data;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Data
|
||||
public class DeviceRepairApplyDetailMiniResponse {
|
||||
|
||||
/**
|
||||
* 报修单id
|
||||
*/
|
||||
@TableField(value = "applyId")
|
||||
private Long applyId;
|
||||
|
||||
/**
|
||||
* 设备编码
|
||||
*/
|
||||
@TableField(value = "deviceCode")
|
||||
private String deviceCode;
|
||||
|
||||
/**
|
||||
* 部门编码
|
||||
*/
|
||||
@TableField(value = "deptCode")
|
||||
private String deptCode;
|
||||
|
||||
/**
|
||||
* 部门名称
|
||||
*/
|
||||
@TableField(value = "deptName")
|
||||
private String deptName;
|
||||
|
||||
/**
|
||||
* 问题描述
|
||||
*/
|
||||
@TableField(value = "description")
|
||||
private String description;
|
||||
|
||||
/**
|
||||
* 诊断信息
|
||||
*/
|
||||
@TableField(value = "diagnosisInfo")
|
||||
private String diagnosisInfo;
|
||||
|
||||
/**
|
||||
* 状态 待诊断、待维修、维修中、完成
|
||||
*/
|
||||
@TableField(value = "status")
|
||||
private DeviceRepairApplyDetailStatusEnum status;
|
||||
|
||||
/**
|
||||
* 是否需要维修 true/false
|
||||
*/
|
||||
@TableField(value = "repairFlag")
|
||||
private Boolean repairFlag;
|
||||
|
||||
/**
|
||||
* 维修单id
|
||||
*/
|
||||
@TableField(value = "repairId")
|
||||
private Long repairId;
|
||||
|
||||
/**
|
||||
* 产品id
|
||||
*/
|
||||
@TableField(value = "productId")
|
||||
private Long productId;
|
||||
|
||||
/**
|
||||
* UDI码
|
||||
*/
|
||||
@TableField(value = "udi")
|
||||
private String udi;
|
||||
|
||||
/**
|
||||
* DI码
|
||||
*/
|
||||
@TableField(value = "nameCode")
|
||||
private String nameCode;
|
||||
|
||||
/**
|
||||
* 产品名称
|
||||
*/
|
||||
@TableField(value = "productName")
|
||||
private String productName;
|
||||
|
||||
/**
|
||||
* 规格型号
|
||||
*/
|
||||
@TableField(value = "ggxh")
|
||||
private String ggxh;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 报修单id
|
||||
*/
|
||||
@TableId(value = "id")
|
||||
private Long id;
|
||||
|
||||
// /**
|
||||
// * 状态 待受理，受理中，维修中，完成
|
||||
// */
|
||||
// @TableField(value = "status")
|
||||
// private DeviceRepairApplyStatusEnum status;
|
||||
|
||||
/**
|
||||
* 报修部门编码
|
||||
*/
|
||||
@TableField(value = "applyDeptCode")
|
||||
private String applyDeptCode;
|
||||
|
||||
/**
|
||||
* 报修部门
|
||||
*/
|
||||
@TableField(value = "applyDeptName")
|
||||
private String applyDeptName;
|
||||
|
||||
/**
|
||||
* 报修人id
|
||||
*/
|
||||
@TableField(value = "applyUserId")
|
||||
private Long applyUserId;
|
||||
|
||||
/**
|
||||
* 报修人姓名
|
||||
*/
|
||||
@TableField(value = "applyUserName")
|
||||
private String applyUserName;
|
||||
|
||||
/**
|
||||
* 报修人联系方式
|
||||
*/
|
||||
@TableField(value = "applyUserPhone")
|
||||
private String applyUserPhone;
|
||||
|
||||
/**
|
||||
* 报修时间
|
||||
*/
|
||||
@TableField(value = "applyTime")
|
||||
private LocalDateTime applyTime;
|
||||
|
||||
/**
|
||||
* 设备数量
|
||||
*/
|
||||
@TableField(value = "deviceCount")
|
||||
private Integer deviceCount;
|
||||
|
||||
/**
|
||||
* 完成数量
|
||||
*/
|
||||
@TableField(value = "finishCount")
|
||||
private Integer finishCount;
|
||||
|
||||
/**
|
||||
* 确认部门
|
||||
*/
|
||||
@TableField(value = "confirmDeptCode")
|
||||
private String confirmDeptCode;
|
||||
|
||||
/**
|
||||
* 确认部门名称
|
||||
*/
|
||||
@TableField(value = "confirmDeptName")
|
||||
private String confirmDeptName;
|
||||
|
||||
/**
|
||||
* 确认人id
|
||||
*/
|
||||
@TableField(value = "confirmUserId")
|
||||
private Long confirmUserId;
|
||||
|
||||
/**
|
||||
* 确认人姓名
|
||||
*/
|
||||
@TableField(value = "confirmUserName")
|
||||
private String confirmUserName;
|
||||
|
||||
/**
|
||||
* 确认人联系方式
|
||||
*/
|
||||
@TableField(value = "confirmPhone")
|
||||
private String confirmPhone;
|
||||
|
||||
/**
|
||||
* 确认时间
|
||||
*/
|
||||
@TableField(value = "confirmTime")
|
||||
private LocalDateTime confirmTime;
|
||||
|
||||
/**
|
||||
* 完成时间
|
||||
*/
|
||||
@TableField(value = "finishTime")
|
||||
private LocalDateTime finishTime;
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue