feat: sql更新、设备管理迁移、小程序接口暴露

dev_ksck_axxyy
chenhc 1 year ago
parent b108828b54
commit 1ca947ba0a

@ -78,4 +78,5 @@ public class DeviceCheckDetailController extends BaseController {
}
}

@ -2,7 +2,6 @@ package com.glxp.api.controller.dev;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.RandomUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageInfo;
@ -17,7 +16,9 @@ import com.glxp.api.entity.dev.DeviceInfoEntity;
import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity;
import com.glxp.api.entity.system.SystemPDFTemplateEntity;
import com.glxp.api.exception.JsonException;
import com.glxp.api.req.dev.*;
import com.glxp.api.req.dev.DeviceInfoDetailByDeptCodeQuery;
import com.glxp.api.req.dev.DeviceInfoDetailQuery;
import com.glxp.api.req.dev.DeviceInfoQuery;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.service.dev.DeviceChangeLogService;
import com.glxp.api.service.dev.DeviceInfoService;
@ -39,19 +40,18 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.imageio.ImageIO;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.awt.*;
import java.awt.font.LineMetrics;
import java.awt.image.BufferedImage;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.util.*;
import java.util.Base64;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@RestController

@ -9,13 +9,19 @@ import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.auth.AuthAdmin;
import com.glxp.api.entity.dev.DeviceRepairApplyEntity;
import com.glxp.api.enums.dev.DeviceRepairApplyStatusEnum;
import com.glxp.api.req.dev.*;
import com.glxp.api.req.dev.DeviceRepairApplyAddParam;
import com.glxp.api.req.dev.DeviceRepairApplyConfirmParam;
import com.glxp.api.req.dev.DeviceRepairApplyHallQuery;
import com.glxp.api.req.dev.DeviceRepairApplyQuery;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.service.dev.DeviceRepairApplyService;
import com.glxp.api.vo.dev.DeviceRepairApplyVo;
import groovy.util.logging.Slf4j;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
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.ArrayList;

@ -8,13 +8,12 @@ import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.auth.AuthAdmin;
import com.glxp.api.entity.dev.DeviceRepairApplyDetailEntity;
import com.glxp.api.entity.dev.DeviceRepairApplyEntity;
import com.glxp.api.req.dev.*;
import com.glxp.api.req.dev.DeviceRepairApplyDetailDiagnosisParam;
import com.glxp.api.req.dev.DeviceRepairApplyDetailQuery;
import com.glxp.api.req.dev.DeviceRepairApplyListByIdAndCodeQuery;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.service.dev.DeviceRepairApplyDetailService;
import com.glxp.api.service.dev.DeviceRepairApplyService;
import com.glxp.api.vo.dev.DeviceRepairApplyDetailVo;
import com.glxp.api.vo.dev.DeviceRepairApplyVo;
import groovy.util.logging.Slf4j;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.PostMapping;

@ -1,25 +1,19 @@
package com.glxp.api.controller.dev;
import cn.hutool.core.bean.BeanUtil;
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.auth.AuthAdmin;
import com.glxp.api.entity.dev.DeviceRepairApplyEntity;
import com.glxp.api.entity.dev.DeviceRepairEntity;
import com.glxp.api.enums.dev.DeviceRepairApplyStatusEnum;
import com.glxp.api.req.dev.*;
import com.glxp.api.req.dev.DeviceRepairQuery;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.service.dev.DeviceRepairApplyService;
import com.glxp.api.service.dev.DeviceRepairService;
import com.glxp.api.vo.dev.DeviceRepairApplyVo;
import groovy.util.logging.Slf4j;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.List;
@Slf4j

@ -2,7 +2,6 @@ package com.glxp.api.dao.dev;
import com.glxp.api.dao.BaseMapperPlus;
import com.glxp.api.entity.dev.DeviceInfoEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.api.enums.dev.DeviceStatusEnum;
import com.glxp.api.req.dev.DeviceInfoDetailByDeptCodeQuery;
import com.glxp.api.req.dev.DeviceInfoDetailQuery;
@ -11,7 +10,6 @@ import com.glxp.api.vo.dev.DeviceInfoVo;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Set;
/**
* device_info()Mapper
@ -28,6 +26,9 @@ public interface DeviceInfoMapper extends BaseMapperPlus<DeviceInfoMapper,Device
List<DeviceInfoVo> listVoByProductIdAndStatus(@Param("productId")Long productId, @Param("status")DeviceStatusEnum status);
List<DeviceInfoVo> listVoByCodes(@Param("list") List<String> deviceCodes,@Param("deptCode") String deptCode,@Param("status") DeviceStatusEnum status);
List<DeviceInfoVo> listVoByCodes(@Param("list") List<String> deviceCodes,@Param("deptCode") String deptCode,@Param("status") List<DeviceStatusEnum> status);
}

@ -3,7 +3,6 @@ package com.glxp.api.dao.dev;
import com.glxp.api.dao.BaseMapperPlus;
import com.glxp.api.entity.dev.DeviceRepairApplyDetailEntity;
import com.glxp.api.req.dev.DeviceRepairApplyDetailMiniQuery;
import com.glxp.api.req.dev.DeviceRepairApplyListByIdAndCodeQuery;
import com.glxp.api.res.dev.DeviceRepairApplyDetailMiniResponse;
import org.apache.ibatis.annotations.Param;

@ -0,0 +1,190 @@
package com.glxp.api.entity.dev;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
*
*/
@Data
@TableName(value = "dept_device_detail")
public class DeptDeviceDetailEntity {
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
*
*/
@TableField(value = "deptCode")
private String deptCode;
/**
*
*/
@TableField(value = "invCode")
private String invCode;
/**
*
*/
@TableField(value = "originCode")
private String originCode;
/**
*
*/
@TableField(value = "code")
private String code;
/**
*
*/
@TableField(value = "relId")
private String relId;
/**
*
*/
@TableField(value = "deviceName")
private String deviceName;
/**
*
*/
@TableField(value = "ggxh")
private String ggxh;
/**
*
*/
@TableField(value = "batchNo")
private String batchNo;
/**
*
*/
@TableField(value = "serialNo")
private String serialNo;
/**
*
*/
@TableField(value = "productionDate")
private String productionDate;
/**
*
*/
@TableField(value = "expireDate")
private String expireDate;
/**
*
*/
@TableField(value = "manufactory")
private String manufactory;
/**
*
*/
@TableField(value = "measname")
private String measname;
/**
* /
*/
@TableField(value = "zczbhhzbapzbh")
private String zczbhhzbapzbh;
/**
* ID
*/
@TableField(value = "supId")
private String supId;
/**
*
*/
@TableField(value = "supName")
private String supName;
/**
* 123456使7
*/
@TableField(value = "`status`")
private Integer status;
/**
* 12
*/
@TableField(value = "addType")
private Integer addType;
/**
*
*/
@TableField(value = "`createUser`")
private String createUser;
/**
*
*/
@TableField(value = "manager")
private String manager;
/**
*
*/
@TableField(value = "maTime")
private Date maTime;
/**
*
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField(value = "createTime")
private Date createTime;
/**
*
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField(value = "updateTime")
private Date updateTime;
/**
*
*/
@TableField(value = "remark")
private String remark;
/**
* 使
*/
@TableField(value = "curUser")
private String curUser;
/**
*
*/
@TableField(value = "location")
private String location;
/**
*
*/
@TableField(value = "detailLocation")
private String detailLocation;
@TableField(value = "nameCode")
private String nameCode;
}

@ -0,0 +1,105 @@
package com.glxp.api.entity.dev;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.io.Serializable;
import java.time.LocalDate;
@Data
@TableName(value = "device_asset_cert")
public class DeviceAssetCertEntity implements Serializable {
/**
* ID
*/
@TableId(value = "id", type = IdType.INPUT)
private Long id;
/**
*
*/
@TableField(value = "devCodeFk")
private String devCodeFk;
/**
*
*/
@TableField(value = "`name`")
private String name;
/**
*
*/
@TableField(value = "code")
private String code;
/**
*
*/
@TableField(value = "filePath")
private String filePath;
/**
*
*/
@TableField(value = "vailDate")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate vailDate;
/**
*
*/
@TableField(value = "expireDate")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate expireDate;
/**
*
*/
@TableField(value = "`status`")
private Integer status;
/**
* 12
*/
@TableField(value = "`type`")
private Integer type;
/**
*
*/
@TableField(value = "remark")
private String remark;
/**
*
*/
@TableField(value = "`createUser`")
private String createUser;
/**
*
*/
@TableField(value = "createTime")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate createTime;
/**
*
*/
@TableField(value = "updateUser")
private String updateUser;
/**
*
*/
@TableField(value = "updateTime")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate updateTime;
private static final long serialVersionUID = 1L;
}

@ -0,0 +1,82 @@
package com.glxp.api.entity.dev;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
*
*/
@Data
@TableName(value = "device_asset_loacation")
public class DeviceAssetLoacationEntity implements Serializable {
@TableId(value = "id", type = IdType.INPUT)
private Long id;
/**
*
*/
@TableField(value = "code")
private String code;
/**
*
*/
@TableField(value = "`name`")
private String name;
/**
*
*/
@TableField(value = "parentCode")
private String parentCode;
/**
*
*/
@TableField(value = "longitude")
private String longitude;
/**
*
*/
@TableField(value = "latitude")
private String latitude;
/**
*
*/
@TableField(value = "remark")
private String remark;
/**
*
*/
@TableField(value = "`createUser`")
private String createUser;
/**
*
*/
@TableField(value = "createTime")
private Date createTime;
/**
*
*/
@TableField(value = "updateUser")
private String updateUser;
/**
*
*/
@TableField(value = "updateTime")
private Date updateTime;
private static final long serialVersionUID = 1L;
}

@ -0,0 +1,76 @@
package com.glxp.api.entity.dev;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@Data
@TableName(value = "device_asset_usage")
public class DeviceAssetUsageEntity implements Serializable {
/**
* ID
*/
@TableId(value = "id", type = IdType.INPUT)
private Long id;
/**
* 使
*/
@TableField(value = "code")
private String code;
/**
* 使
*/
@TableField(value = "`user`")
private String user;
/**
*
*/
@TableField(value = "startTime")
private Date startTime;
/**
*
*/
@TableField(value = "endTime")
private Date endTime;
/**
*
*/
@TableField(value = "remark")
private String remark;
/**
*
*/
@TableField(value = "`createUser`")
private String createUser;
/**
*
*/
@TableField(value = "createTime")
private Date createTime;
/**
*
*/
@TableField(value = "updateUser")
private String updateUser;
/**
*
*/
@TableField(value = "updateTime")
private Date updateTime;
private static final long serialVersionUID = 1L;
}

@ -0,0 +1,79 @@
package com.glxp.api.entity.dev;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@Data
@TableName(value = "device_asset_user")
public class DeviceAssetUserEntity implements Serializable {
@TableId(value = "id", type = IdType.INPUT)
private Long id;
/**
*
*/
@TableField(value = "devCodeFk")
private String devCodeFk;
/**
*
*/
@TableField(value = "userName")
private String userName;
/**
* 1
*/
@TableField(value = "contact1")
private String contact1;
/**
* 2
*/
@TableField(value = "contact2")
private String contact2;
/**
*
*/
@TableField(value = "remark")
private String remark;
/**
*
*/
@TableField(value = "`createUser`")
private String createUser;
/**
*
*/
@TableField(value = "createTime")
private Date createTime;
/**
*
*/
@TableField(value = "updateUser")
private String updateUser;
/**
*
*/
@TableField(value = "updateTime")
private Date updateTime;
/**
*
*/
@TableField(value = "userType")
private String userType;
private static final long serialVersionUID = 1L;
}

@ -32,6 +32,12 @@ public class DeviceChangeOrderEntity implements Serializable {
@TableId(value = "orderId")
private Long orderId;
/**
*
*/
@TableField(value = "billNo")
private String billNo;
/**
* add:change:
*/
@ -106,4 +112,16 @@ public class DeviceChangeOrderEntity implements Serializable {
@TableField(exist = false)
private static final long serialVersionUID = 1L;
/**
*
*/
@TableField(value = "destroyType")
private Integer destroyType;
/**
*
*/
@TableField(value = "approvalFlowId")
private String approvalFlowId;
}

@ -0,0 +1,471 @@
package com.glxp.api.entity.dev;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.Date;
/**
*
*
* @TableName device_change_order_item
*/
@TableName(value = "device_change_order_item")
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@Accessors(chain = true)
public class DeviceChangeOrderItemEntity implements Serializable {
/**
*
*/
@TableField(value = "orderId")
private Long orderId;
/**
*
*/
@TableField(value = "deviceCode")
private String deviceCode;
/**
* 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;
/**
*
*/
@TableField(value = "batchNo")
private String batchNo;
/**
*
*/
@TableField(value = "serialNo")
private String serialNo;
/**
*
*/
@TableField(value = "productionDate")
private LocalDate productionDate;
/**
*
*/
@TableField(value = "expireDate")
private LocalDate expireDate;
/**
*
*/
@TableField(value = "manufactory")
private String manufactory;
/**
*
*/
@TableField(value = "measname")
private String measname;
/**
* /
*/
@TableField(value = "zczbhhzbapzbh")
private String zczbhhzbapzbh;
/**
* ID
*/
@TableField(value = "supId")
private String supId;
/**
*
*/
@TableField(value = "supName")
private String supName;
/**
*
*/
@TableField(value = "sourceType")
private String sourceType;
/**
*
*/
@TableField(value = "remark")
private String remark;
@TableField(exist = false)
private static final long serialVersionUID = 1L;
/**
*
*/
@TableField(value = "assetType")
private String assetType;
/**
*
*/
@TableField(value = "sasacType")
private String sasacType;
/**
*
*/
@TableField(value = "assetMnemonicCode")
private String assetMnemonicCode;
/**
*
*/
@TableField(value = "number")
private Integer number;
/**
*
*/
@TableField(value = "acquisitionMethod")
private String acquisitionMethod;
/**
*
*/
@TableField(value = "purpose")
private String purpose;
/**
*
*/
@TableField(value = "depreciationYear")
private Integer depreciationYear;
/**
*
*/
@TableField(value = "depreciationMonth")
private Integer depreciationMonth;
/**
*
*/
@TableField(value = "invCode")
private String invCode;
/**
*
*/
@TableField(value = "estimatedTotalHour")
private Integer estimatedTotalHour;
/**
*
*/
@TableField(value = "dayHour")
private Integer dayHour;
/**
*
*/
@TableField(value = "assetValue")
private BigDecimal assetValue;
/**
*
*/
@TableField(value = "ownFund")
private BigDecimal ownFund;
/**
*
*/
@TableField(value = "financialAppropriation")
private BigDecimal financialAppropriation;
/**
*
*/
@TableField(value = "educationFund")
private BigDecimal educationFund;
/**
*
*/
@TableField(value = "otherFund")
private BigDecimal otherFund;
/**
*
*/
@TableField(value = "nonPeerFinancialAppropriation")
private BigDecimal nonPeerFinancialAppropriation;
/**
*
*/
@TableField(value = "ybbm")
private String ybbm;
/**
* (
*/
@TableField(value = "catalogname1")
private String catalogname1;
/**
* (
*/
@TableField(value = "catalogname2")
private String catalogname2;
/**
* (
*/
@TableField(value = "catalogname3")
private String catalogname3;
/**
*
*/
@TableField(value = "catalogCode")
private String catalogCode;
/**
*
*/
@TableField(value = "catalogCode1")
private Integer catalogCode1;
/**
*
*/
@TableField(value = "catalogCode2")
private Integer catalogCode2;
/**
*
*/
@TableField(value = "catalogCode3")
private Integer catalogCode3;
/**
*
*/
@TableField(value = "managementCategory")
private String managementCategory;
/**
* 使
*/
@TableField(value = "endUser")
private String endUser;
/**
*
*/
@TableField(value = "estimatedResidualValue")
private BigDecimal estimatedResidualValue;
/**
*
*/
@TableField(value = "currencyType")
private String currencyType;
/**
*
*/
@TableField(value = "purType")
private String purType;
/**
*
*/
@TableField(value = "purchaseDate")
@JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
private Date purchaseDate;
/**
*
*/
@TableField(value = "addDate")
@JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
private Date addDate;
/**
*
*/
@TableField(value = "assetName")
private String assetName;
/**
*
*/
@TableField(value = "isImperative")
private Boolean isImperative;
/**
*
*/
@TableField(value = "isMaintain")
private Boolean isMaintain;
/**
* (
*/
@TableField(value = "imperativeCycle")
private Integer imperativeCycle;
/**
* (
*/
@TableField(value = "maintainCycle")
private Integer maintainCycle;
/**
*
*/
@TableField(value = "startImperativeDate")
@JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
private Date startImperativeDate;
/**
*
*/
@TableField(value = "startMaintainDate")
@JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
private Date startMaintainDate;
/**
*
*/
@TableField(value = "serviceType")
private String serviceType;
/**
*
*/
@TableField(value = "maintainType")
private String maintainType;
/**
*
*/
@TableField(value = "managerUser")
private String managerUser;
/**
*
*/
@TableField(value = "approveUser")
private String approveUser;
/**
*
*/
@TableField(value = "ledgerAccount")
private String ledgerAccount;
/**
*
*/
@TableField(value = "impairmentProvision")
private String impairmentProvision;
/**
*
*/
@TableField(value = "estimatedWorkload")
private String estimatedWorkload;
/**
*
*/
@TableField(value = "completedWorkload")
private String completedWorkload;
/**
*
*/
@TableField(value = "maintenanceType")
private String maintenanceType;
/**
*
*/
@TableField(value = "maintenanceCycle")
private Integer maintenanceCycle;
/**
*
*/
@TableField(value = "startMaintenancDate")
@JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
private Date startMaintenancDate;
/**
*
*/
@TableField(value = "endMaintenancDate")
@JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
private Date endMaintenancDate;
/**
*
*/
@TableField(value = "networkType")
private Integer networkType;
/**
* 使
*/
@TableField(value = "userRole")
private Integer userRole;
/**
*
*/
@TableField(value = "isAddDomain")
private Boolean isAddDomain;
/**
* u
*/
@TableField(value = "isUDisc")
private Boolean isUDisc;
/**
*
*/
@TableField(value = "ascriptionType")
private Integer ascriptionType;
/**
*
*/
@TableField(value = "assetReserveType")
private String assetReserveType;
}

@ -1,20 +1,15 @@
package com.glxp.api.entity.dev;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.time.LocalDateTime;
/**
*
*
@ -194,5 +189,10 @@ public class DeviceCheckDetailEntity {
@TableField(value = "updateTime")
private LocalDateTime updateTime;
}
/**
* id
*/
@TableField(value = "applyId")
private Long applyId;
}

@ -1,20 +1,15 @@
package com.glxp.api.entity.dev;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.time.LocalDateTime;
/**
*
*

@ -43,7 +43,7 @@ public class DeviceCheckItemDictEntity {
* id
*/
@TableField(value = "createUserId")
private String createUserId;
private Long createUserId;
/**
*
@ -51,18 +51,15 @@ public class DeviceCheckItemDictEntity {
@TableField(value = "createUserName")
private String createUserName;
/**
* 1: 2:
*/
@TableField(value = "type")
private Integer type;
/**
*
*/
@TableField(value = "createTime")
private LocalDateTime createTime;
/**
*
*/
@TableField(value = "type")
private Integer type;
}

@ -586,4 +586,30 @@ public class DeviceInfoEntity implements Serializable {
*/
@TableField(value = "updateTime")
private LocalDateTime updateTime;
/**
* id
*/
@TableField(value = "purApplyBillNo")
private String purApplyBillNo;
/**
* id
*/
@TableField(value = "purOrderBillNo")
private String purOrderBillNo;
/**
* id
*/
@TableField(value = "purContractBillNo")
private String purContractBillNo;
/**
* id
*/
@TableField(value = "purPlanBillNo")
private String purPlanBillNo;
}

@ -0,0 +1,105 @@
package com.glxp.api.entity.dev;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.util.Date;
/**
*
*/
@Data
@TableName(value = "device_inspect_order")
public class DeviceInspectOrderEntity {
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
*
*/
@TableField(value = "orderId")
private String orderId;
/**
*
*/
@TableField(value = "deptCode")
private String deptCode;
/**
*
*/
@TableField(value = "invCode")
private String invCode;
/**
*
*/
@TableField(value = "code")
private String code;
/**
*
*/
@TableField(value = "lastOrderId")
private String lastOrderId;
/**
* 123
*/
@TableField(value = "`type`")
private Integer type;
/**
* 012
*/
@TableField(value = "`status`")
private Integer status;
/**
* 01
*/
@TableField(value = "deviceStatus")
private Integer deviceStatus;
/**
*
*/
@TableField(value = "`createUser`")
private String createUser;
/**
*
*/
@TableField(value = "auditUser")
private String auditUser;
/**
*
*/
@TableField(value = "createTime")
private Date createTime;
/**
*
*/
@TableField(value = "auditTime")
private Date auditTime;
/**
*
*/
@TableField(value = "updateTime")
private Date updateTime;
/**
*
*/
@TableField(value = "remark")
private String remark;
}

@ -0,0 +1,55 @@
package com.glxp.api.entity.dev;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.util.Date;
@Data
@TableName(value = "device_inspect_plan_delect")
public class DeviceInspectPlanDelectEntity {
@TableId(value = "id", type = IdType.INPUT)
private Long id;
@TableField(value = "orderIdFk")
private String orderIdFk;
/**
*
*/
@TableField(value = "code")
private String code;
/**
*
*/
@TableField(value = "content")
private String content;
/**
* 12
*/
@TableField(value = "`type`")
private Integer type;
/**
*
*/
@TableField(value = "remark")
private String remark;
/**
*
*/
@TableField(value = "updateUser")
private String updateUser;
/**
*
*/
@TableField(value = "updateTime")
private Date updateTime;
}

@ -0,0 +1,139 @@
package com.glxp.api.entity.dev;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.util.Date;
/**
*
*/
@Data
@TableName(value = "device_inspect_plan")
public class DeviceInspectPlanEntity {
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
*
*/
@TableField(value = "orderId")
private String orderId;
/**
*
*/
@TableField(value = "deptCode")
private String deptCode;
/**
*
*/
@TableField(value = "invCode")
private String invCode;
/**
*
*/
@TableField(value = "code")
private String code;
/**
* 123
*/
@TableField(value = "`level`")
private Integer level;
/**
* 012
*/
@TableField(value = "`status`")
private Integer status;
/**
*
*/
@TableField(value = "`createUser`")
private String createUser;
/**
*
*/
@TableField(value = "auditUser")
private String auditUser;
/**
*
*/
@TableField(value = "createTime")
private Date createTime;
/**
*
*/
@TableField(value = "auditTime")
private Date auditTime;
/**
*
*/
@TableField(value = "updateTime")
private Date updateTime;
/**
*
*/
@TableField(value = "remark")
private String remark;
//--------------------------新增字段--------------------------------
/**
*
*/
private Date startTime;
/**
*
*/
private Date endTime;
/**
*
*/
private String frequency;
/**
* 12345 6
*/
private Integer frequencyUnit;
/**
* (1:234
*/
private Integer planStatus;
/**
*
*/
private String inspectUser;
/**
*
*/
private Date lastTime;
/**
*
*/
private Date nextTime;
/**
* 使
*/
private Integer useFrequency;
/**
*
*/
private Integer executeCount;
}

@ -0,0 +1,63 @@
package com.glxp.api.entity.dev;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.util.Date;
/**
*
*/
@Data
@TableName(value = "device_inspect_set")
public class DeviceInspectSetEntity {
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
*
*/
@TableField(value = "code")
private String code;
/**
*
*/
@TableField(value = "frequency")
private String frequency;
/**
* 12345 6
*/
@TableField(value = "frequencyUnit")
private Integer frequencyUnit;
/**
* 12
*/
@TableField(value = "`status`")
private Integer status;
/**
*
*/
@TableField(value = "createTime")
private Date createTime;
/**
*
*/
@TableField(value = "updateTime")
private Date updateTime;
/**
*
*/
@TableField(value = "remark")
private String remark;
}

@ -0,0 +1,70 @@
package com.glxp.api.entity.dev;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@Data
@TableName(value = "device_inspect_task_detail")
public class DeviceInspectTaskDetailEntity implements Serializable {
@TableId(value = "id", type = IdType.INPUT)
private Long id;
/**
*
*/
@TableField(value = "projectCode")
private String projectCode;
/**
*
*/
@TableField(value = "projectContent")
private String projectContent;
/**
* 1234
*/
@TableField(value = "`status`")
private Integer status;
/**
*
*/
@TableField(value = "`result`")
private String result;
/**
*
*/
@TableField(value = "inspectImage")
private String inspectImage;
/**
*
*/
@TableField(value = "inspectUser")
private String inspectUser;
/**
*
*/
@TableField(value = "updateTime")
private Date updateTime;
/**
* ID
*/
@TableField(value = "taskOrderIdFk")
private String taskOrderIdFk;
@TableField(exist = false)
private String inspectName;
private static final long serialVersionUID = 1L;
}

@ -0,0 +1,109 @@
package com.glxp.api.entity.dev;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.util.Date;
@Data
@TableName(value = "device_inspect_task")
public class DeviceInspectTaskEntity {
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
*
*/
@TableField(value = "orderId")
private String orderId;
/**
*
*/
@TableField(value = "planOrderIdFk")
private String planOrderIdFk;
/**
*
*/
@TableField(value = "deptCode")
private String deptCode;
/**
*
*/
@TableField(value = "invCode")
private String invCode;
/**
*
*/
@TableField(value = "code")
private String code;
/**
* 0 1 2
*/
@TableField(value = "`status`")
private Integer status;
/**
*
*/
@TableField(value = "inspectUser")
private String inspectUser;
/**
*
*/
@TableField(value = "remindTime")
private Date remindTime;
/**
*
*/
@TableField(value = "remark")
private String remark;
/**
*
*/
@TableField(value = "strartTime")
private Date strartTime;
/**
*
*/
@TableField(value = "endTime")
private Date endTime;
/**
*
*/
@TableField(value = "createTime")
private Date createTime;
/**
*
*/
@TableField(value = "updateTime")
private Date updateTime;
@TableField(value = "expectedTime")
private Date expectedTime;
@TableField(value = "type")
private Integer type;
@TableField(value = "repairType")
private Integer repairType;
@TableField(value = "level")
private Integer level;
private static final long serialVersionUID = 1L;
}

@ -0,0 +1,137 @@
package com.glxp.api.entity.dev;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.util.Date;
/**
*
*/
@Data
@TableName(value = "device_ma_order_detail")
public class DeviceMAOrderDetailEntity {
/**
* id
*/
@TableId(value = "id", type = IdType.INPUT)
private Integer id;
/**
*
*/
@TableField(value = "orderIdFk")
private String orderIdFk;
/**
*
*/
@TableField(value = "code")
private String code;
/**
* ID
*/
@TableField(value = "nameCode")
private String nameCode;
/**
* ID
*/
@TableField(value = "relId")
private Long relId;
/**
*
*/
@TableField(value = "batchNo")
private String batchNo;
/**
*
*/
@TableField(value = "productionDate")
private String productionDate;
/**
*
*/
@TableField(value = "expireDate")
private String expireDate;
/**
*
*/
@TableField(value = "serialNo")
private String serialNo;
/**
*
*/
@TableField(value = "createTime")
private Date createTime;
/**
*
*/
@TableField(value = "updateTime")
private Date updateTime;
/**
* 0 1
*/
@TableField(value = "deviceStatus")
private Integer deviceStatus;
/**
* 0 1
*/
@TableField(value = "maStatus")
private Integer maStatus;
/**
*
*/
@TableField(value = "`createUser`")
private String createUser;
/**
*
*/
@TableField(value = "remark")
private String remark;
public static final String COL_ID = "id";
public static final String COL_ORDERIDFK = "orderIdFk";
public static final String COL_CODE = "code";
public static final String COL_NAMECODE = "nameCode";
public static final String COL_RELID = "relId";
public static final String COL_BATCHNO = "batchNo";
public static final String COL_PRODUCTIONDATE = "productionDate";
public static final String COL_EXPIREDATE = "expireDate";
public static final String COL_SERIALNO = "serialNo";
public static final String COL_CREATETIME = "createTime";
public static final String COL_UPDATETIME = "updateTime";
public static final String COL_DEVICESTATUS = "deviceStatus";
public static final String COL_MASTATUS = "maStatus";
public static final String COL_CREATEUSER = "createUser";
public static final String COL_REMARK = "remark";
}

@ -0,0 +1,86 @@
package com.glxp.api.entity.dev;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.util.Date;
/**
*
*/
@Data
@TableName(value = "device_ma_order")
public class DeviceMAOrderEntity {
@TableId(value = "id", type = IdType.INPUT)
private Integer id;
/**
*
*/
@TableField(value = "orderId")
private String orderId;
/**
*
*/
@TableField(value = "receiveOrderId")
private String receiveOrderId;
/**
*
*/
@TableField(value = "`status`")
private Integer status;
/**
*
*/
@TableField(value = "createTime")
private Date createTime;
/**
*
*/
@TableField(value = "updateTime")
private Date updateTime;
/**
*
*/
@TableField(value = "`createUser`")
private String createUser;
/**
*
*/
@TableField(value = "auditUser")
private String auditUser;
/**
*
*/
@TableField(value = "remark")
private String remark;
public static final String COL_ID = "id";
public static final String COL_ORDERID = "orderId";
public static final String COL_RECEIVEORDERID = "receiveOrderId";
public static final String COL_STATUS = "status";
public static final String COL_CREATETIME = "createTime";
public static final String COL_UPDATETIME = "updateTime";
public static final String COL_CREATEUSER = "createUser";
public static final String COL_AUDITUSER = "auditUser";
public static final String COL_REMARK = "remark";
}

@ -50,15 +50,15 @@ public class DevicePlanDetailItemEntity {
@TableField(value = "name")
private String name;
/**
* 1 2
*/
@TableField(value = "type")
private String type;
/**
*
*/
@TableField(value = "content")
private String content;
/**
*
*/
@TableField(value = "type")
private Integer type;
}

@ -90,13 +90,13 @@ public class DevicePlanEntity {
*/
@TableField(value = "status")
private Integer status;
/**
* 1: 2:
*
*/
@TableField(value = "type")
private Integer type;
/**
*
*/

@ -0,0 +1,67 @@
package com.glxp.api.entity.dev;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@Data
@TableName(value = "device_project_set")
public class DeviceProjectSet implements Serializable {
@TableId(value = "id", type = IdType.INPUT)
private Integer id;
/**
*
*/
@TableField(value = "code")
private String code;
/**
*
*/
@TableField(value = "content")
private String content;
/**
* 12
*/
@TableField(value = "`type`")
private Integer type;
/**
*
*/
@TableField(value = "remak")
private String remak;
/**
*
*/
@TableField(value = "udpateTime")
private Date udpateTime;
/**
*
*/
@TableField(value = "updateUser")
private String updateUser;
/**
*
*/
@TableField(value = "`createUser`")
private String createUser;
/**
*
*/
@TableField(value = "createTime")
private Date createTime;
private static final long serialVersionUID = 1L;
}

@ -0,0 +1,146 @@
package com.glxp.api.entity.dev;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.util.Date;
@Data
@TableName(value = "device_receive_order_detail")
public class DeviceReceiveOrderDetailEntity {
/**
* id
*/
@TableId(value = "id", type = IdType.INPUT)
private Integer id;
/**
*
*/
@TableField(value = "orderIdFk")
private String orderIdFk;
/**
*
*/
@TableField(value = "originCode")
private String originCode;
/**
*
*/
@TableField(value = "code")
private String code;
/**
* ID
*/
@TableField(value = "relId")
private Long relId;
/**
* DI
*/
@TableField(value = "nameCode")
private String nameCode;
/**
*
*/
@TableField(value = "batchNo")
private String batchNo;
/**
*
*/
@TableField(value = "productionDate")
private String productionDate;
/**
*
*/
@TableField(value = "expireDate")
private String expireDate;
/**
*
*/
@TableField(value = "serialNo")
private String serialNo;
/**
* ID
*/
@TableField(value = "supId")
private String supId;
/**
*
*/
@TableField(value = "createTime")
private Date createTime;
/**
*
*/
@TableField(value = "updateTime")
private Date updateTime;
/**
*
*/
@TableField(exist = false)
private String productName;
/**
*
*/
@TableField(exist = false)
private String invName;
/**
*
*/
@TableField(exist = false)
private String invSpaceName;
/**
*
*/
@TableField(exist = false)
private String invSpaceCode;
/**
* /
*/
@TableField(exist = false)
private String zczbhhzbapzbh;
/**
*
*/
@TableField(exist = false)
private String ylqxzcrbarmc;
/**
*
*/
@TableField(exist = false)
private String ggxh;
/**
*
*/
@TableField(exist = false)
private Boolean editSerialNo;
/**
*
*/
@TableField(exist = false)
private String deptName;
}

@ -0,0 +1,114 @@
package com.glxp.api.entity.dev;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.util.Date;
@Data
@TableName(value = "device_receive_order")
public class DeviceReceiveOrderEntity {
/**
* id
*/
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
*
*/
@TableField(value = "orderId")
private String orderId;
/**
*
*/
@TableField(value = "fromDeptCode")
private String fromDeptCode;
/**
*
*/
@TableField(value = "fromInvCode")
private String fromInvCode;
/**
*
*/
@TableField(value = "fromInvSpaceCode")
private String fromInvSpaceCode;
/**
*
*/
@TableField(value = "deptCode")
private String deptCode;
/**
*
*/
@TableField(value = "invCode")
private String invCode;
/**
*
*/
@TableField(value = "invSpaceCode")
private String invSpaceCode;
/**
* 0稿 1 2
*/
@TableField(value = "status")
private Integer status;
/**
*
*/
@TableField(value = "createUser")
private String createUser;
/**
*
*/
@TableField(value = "auditUser")
private String auditUser;
/**
*
*/
@TableField(value = "receiveUser")
private String receiveUser;
/**
*
*/
@TableField(value = "createTime")
private Date createTime;
/**
*
*/
@TableField(value = "updateTime")
private Date updateTime;
/**
*
*/
@TableField(value = "auditTime")
private Date auditTime;
/**
*
*/
@TableField(value = "remark")
private String remark;
@TableField(value = "type")
private String type;
}

@ -195,26 +195,18 @@ public class DeviceRepairApplyDetailEntity {
@TableField(value = "confirmRemark")
private String confirmRemark;
/**
*
*/
@TableField(value = "livePath")
private String livePath;
/**
*
*/
@TableField(value = "diagnosisLivePath")
private String diagnosisLivePath;
/**
*
*/
@TableField(value = "finishTime")
private LocalDateTime finishTime;
/**
*
*/
@TableField(exist = false)
private String repairUserPhone;
/**
*
@ -223,9 +215,14 @@ public class DeviceRepairApplyDetailEntity {
private LocalDateTime updateTime;
/**
*
*
*/
@TableField(exist = false)
private String repairUserPhone;
@TableField(value = "livePath")
private String livePath;
/**
*
*/
@TableField(value = "diagnosisLivePath")
private String diagnosisLivePath;
}

@ -70,6 +70,13 @@ public class DeviceRepairEntity {
*/
@TableField(value = "repairUserName")
private String repairUserName;
/**
*
*/
@TableField(value = "repairUserId")
private Long repairUserId;
/**
*
*/
@ -256,36 +263,27 @@ public class DeviceRepairEntity {
@TableField(value = "repairDescription")
private String repairDescription;
/**
*
*
*/
@TableField(value = "livePath")
private String livePath;
@TableField(value = "updateTime")
private LocalDateTime updateTime;
/**
*
*
*/
@TableField(value = "serviceLivePath")
private String serviceLivePath;
@TableField(value = "livePath")
private String livePath;
/**
*
*
*/
@TableField(value = "diagnosisLivePath")
private String diagnosisLivePath;
/**
* id
*/
@TableField(value = "repairUserId")
private Long repairUserId;
/**
*
*
*/
@TableField(value = "updateTime")
private LocalDateTime updateTime;
@TableField(value = "serviceLivePath")
private String serviceLivePath;
}

@ -0,0 +1,55 @@
package com.glxp.api.entity.dev;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.util.Date;
@Data
@TableName(value = "device_repair_order_detail")
public class DeviceRepairOrderDetailEntity {
@TableId(value = "id", type = IdType.AUTO)
private Long id;
@TableField(value = "orderIdFk")
private String orderIdFk;
/**
*
*/
@TableField(value = "code")
private String code;
/**
*
*/
@TableField(value = "content")
private String content;
/**
* 12
*/
@TableField(value = "`type`")
private Integer type;
/**
*
*/
@TableField(value = "remark")
private String remark;
/**
*
*/
@TableField(value = "updateUser")
private String updateUser;
/**
*
*/
@TableField(value = "updateTime")
private Date updateTime;
}

@ -0,0 +1,136 @@
package com.glxp.api.entity.dev;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.util.Date;
/**
*
*/
@Data
@TableName(value = "device_repair_order")
public class DeviceRepairOrderEntity {
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
*
*/
@TableField(value = "orderId")
private String orderId;
/**
*
*/
@TableField(value = "deptCode")
private String deptCode;
/**
*
*/
@TableField(value = "invCode")
private String invCode;
/**
*
*/
@TableField(value = "code")
private String code;
/**
* 0稿123 4 5
*/
@TableField(value = "`status`")
private Integer status;
/**
*
*/
@TableField(value = "`createUser`")
private String createUser;
/**
*
*/
@TableField(value = "auditUser")
private String auditUser;
/**
*
*/
@TableField(value = "msg")
private String msg;
/**
*
*/
@TableField(value = "createTime")
private Date createTime;
/**
*
*/
@TableField(value = "auditTime")
private Date auditTime;
/**
*
*/
@TableField(value = "updateTime")
private Date updateTime;
/**
*
*/
@TableField(value = "remark")
private String remark;
// ----------------------新增字段=-------------------------------
/**
* 1:2
*/
private Integer repairType;
/**
* 1,2,3,
*/
private Integer urgencyType;
/**
*
*/
private Date planTime;
/**
*
*/
private String uploadImage;
private String inspectUser;
/**
*
*/
private String repariName;
/**
*
*/
private Date repariStartTime;
/**
*
*/
private Date repariEndTime;
/**
*
*/
private String repariRemark;
/**
*
*/
private String repariImage;
}

@ -0,0 +1,43 @@
package com.glxp.api.entity.dev;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
/**
*
*/
@Data
@TableName(value = "inv_ma_explanation")
public class InvMAExplanationEntity {
@TableId(value = "id", type = IdType.INPUT)
private Integer id;
/**
*
*/
@TableField(value = "`name`")
private String name;
/**
* 0 1
*/
@TableField(value = "`status`")
private String status;
/**
*
*/
@TableField(value = "`text`")
private String text;
public static final String COL_ID = "id";
public static final String COL_NAME = "name";
public static final String COL_STATUS = "status";
public static final String COL_TEXT = "text";
}

@ -0,0 +1,129 @@
package com.glxp.api.entity.dev;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.util.Date;
/**
*
*/
@Data
@TableName(value = "inv_ma_order_detail")
public class InvMAOrderDetailEntity {
/**
* id
*/
@TableId(value = "id", type = IdType.INPUT)
private Integer id;
/**
*
*/
@TableField(value = "orderIdFk")
private String orderIdFk;
/**
*
*/
@TableField(value = "code")
private String code;
/**
* ID
*/
@TableField(value = "relId")
private Long relId;
/**
* DI
*/
@TableField(value = "nameCode")
private String nameCode;
/**
*
*/
@TableField(value = "batchNo")
private String batchNo;
/**
*
*/
@TableField(value = "productionDate")
private String productionDate;
/**
*
*/
@TableField(value = "expireDate")
private String expireDate;
/**
*
*/
@TableField(value = "`count`")
private Integer count;
/**
* 0 1
*/
@TableField(value = "maStatus")
private Integer maStatus;
/**
* 0 1
*/
@TableField(value = "deviceStatus")
private Integer deviceStatus;
/**
*
*/
@TableField(value = "createTime")
private Date createTime;
/**
*
*/
@TableField(value = "updateTime")
private Date updateTime;
/**
*
*/
@TableField(value = "remark")
private String remark;
public static final String COL_ID = "id";
public static final String COL_ORDERIDFK = "orderIdFk";
public static final String COL_CODE = "code";
public static final String COL_RELID = "relId";
public static final String COL_NAMECODE = "nameCode";
public static final String COL_BATCHNO = "batchNo";
public static final String COL_PRODUCTIONDATE = "productionDate";
public static final String COL_EXPIREDATE = "expireDate";
public static final String COL_COUNT = "count";
public static final String COL_MASTATUS = "maStatus";
public static final String COL_DEVICESTATUS = "deviceStatus";
public static final String COL_CREATETIME = "createTime";
public static final String COL_UPDATETIME = "updateTime";
public static final String COL_REMARK = "remark";
}

@ -0,0 +1,101 @@
package com.glxp.api.entity.dev;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.util.Date;
/**
*
*/
@Data
@TableName(value = "inv_ma_order")
public class InvMAOrderEntity {
@TableId(value = "id", type = IdType.INPUT)
private Integer id;
/**
*
*/
@TableField(value = "orderId")
private String orderId;
/**
*
*/
@TableField(value = "invCode")
private String invCode;
/**
*
*/
@TableField(value = "invSpaceCode")
private String invSpaceCode;
/**
* 0稿 1 2
*/
@TableField(value = "`status`")
private Integer status;
/**
*
*/
@TableField(value = "createTime")
private Date createTime;
/**
*
*/
@TableField(value = "updateTime")
private Date updateTime;
/**
*
*/
@TableField(value = "auditTime")
private Date auditTime;
/**
*
*/
@TableField(value = "`createUser`")
private String createUser;
/**
*
*/
@TableField(value = "auditUser")
private String auditUser;
/**
*
*/
@TableField(value = "remark")
private String remark;
public static final String COL_ID = "id";
public static final String COL_ORDERID = "orderId";
public static final String COL_INVCODE = "invCode";
public static final String COL_INVSPACECODE = "invSpaceCode";
public static final String COL_STATUS = "status";
public static final String COL_CREATETIME = "createTime";
public static final String COL_UPDATETIME = "updateTime";
public static final String COL_AUDITTIME = "auditTime";
public static final String COL_CREATEUSER = "createUser";
public static final String COL_AUDITUSER = "auditUser";
public static final String COL_REMARK = "remark";
}

@ -0,0 +1,108 @@
package com.glxp.api.req.dev;
import lombok.Data;
/**
*
*/
@Data
public class AddDeptDeviceRequest {
private Integer id;
/**
*
*/
private String deptCode;
/**
*
*/
private String invCode;
/**
*
*/
private String originCode;
/**
*
*/
private String code;
/**
*
*/
private String deviceName;
/**
*
*/
private String ggxh;
/**
*
*/
private String batchNo;
/**
*
*/
private String serialNo;
/**
*
*/
private String productionDate;
/**
*
*/
private String expireDate;
/**
*
*/
private String manufactory;
/**
*
*/
private String measname;
/**
* /
*/
private String zczbhhzbapzbh;
/**
*
*/
private String supName;
/**
* 12345
*/
private Integer status;
/**
* 12
*/
private Integer addType;
/**
*
*/
private String createUser;
/**
*
*/
private String manager;
/**
*
*/
private String remark;
}

@ -0,0 +1,51 @@
package com.glxp.api.req.dev;
import lombok.Data;
/**
*
*/
@Data
public class AddDeviceInspectOrderRequest {
/**
*
*/
private String deptCode;
/**
*
*/
private String invCode;
/**
*
*/
private String code;
/**
*
*/
private String lastOrderId;
/**
* 123
*/
private Integer type;
/**
* 012
*/
private Integer status;
/**
* 01
*/
private Integer deviceStatus;
/**
*
*/
private String remark;
}

@ -0,0 +1,78 @@
package com.glxp.api.req.dev;
import lombok.Data;
import java.util.Date;
/**
*
*/
@Data
public class AddDeviceInspectPlanRequest {
/**
*
*/
private String deptCode;
/**
*
*/
private String invCode;
/**
*
*/
private String code;
/**
* 123
*/
private Integer level;
/**
* 123
*/
private Integer status;
/**
*
*/
private String remark;
/**
*
*/
private Date startTime;
/**
*
*/
private Date endTime;
/**
*
*/
private String frequency;
/**
* 12345 6
*/
private Integer frequencyUnit;
/**
* (1:234
*/
private Integer planStatus;
/**
*
*/
private String inspectUser;
/**
*
*/
private Date lastTime;
/**
*
*/
private Date nextTime;
}

@ -0,0 +1,48 @@
package com.glxp.api.req.dev;
import lombok.Data;
import java.util.Date;
/**
*
*/
@Data
public class AddDeviceInspectSetRequest {
/**
*
*/
private String code;
/**
*
*/
private String frequency;
/**
* 12345 6
*/
private Integer frequencyUnit;
/**
* 12
*/
private Integer status;
/**
*
*/
private Date createTime;
/**
*
*/
private Date updateTime;
/**
*
*/
private String remark;
}

@ -0,0 +1,50 @@
package com.glxp.api.req.dev;
import lombok.Data;
/**
*
*/
@Data
public class AddDeviceMAOrderRequest {
/**
*
*/
private String code;
/**
*
*/
private String createUser;
/**
*
*/
private String deptCode;
/**
*
*/
private String createTime;
/**
* 0 1
*/
private Integer maStatus;
/**
* 0 1
*/
private Integer deviceStatus;
/**
*
*/
private String remark;
/**
* ID
*/
private String receiveOrderId;
}

@ -0,0 +1,50 @@
package com.glxp.api.req.dev;
import lombok.Data;
import java.util.List;
/**
*
*/
@Data
public class AddDeviceReceiveOrderDetailRequest {
/**
*
*/
private String orderIdFk;
/**
*
*/
private String code;
/**
* ID
*/
private List<String> invProductIds;
/**
*
*/
private String deptCode;
/**
*
*/
private String invCode;
/**
*
*/
private String invSpaceCode;
/**
* ID
*/
private String supId;
private Integer type;
}

@ -0,0 +1,84 @@
package com.glxp.api.req.dev;
import lombok.Data;
import java.util.Date;
/**
*
*/
@Data
public class AddDeviceRepairOrderRequest {
/**
*
*/
private String deptCode;
/**
*
*/
private String invCode;
/**
*
*/
private String code;
/**
* 0稿123 4 5
*/
private Integer status;
/**
*
*/
private String msg;
/**
*
*/
private String remark;
// ----------------------新增字段=-------------------------------
/**
* 1:2
*/
private Integer repairType;
/**
* 1,2,3,
*/
private Integer urgencyType;
/**
*
*/
private Date planTime;
/**
*
*/
private String uploadImage;
/**
*
*/
private String repariName;
/**
*
*/
private String repariStartTime;
/**
*
*/
private String repariEndTime;
/**
*
*/
private String repariRemark;
/**
*
*/
private String repariImage;
}

@ -0,0 +1,23 @@
package com.glxp.api.req.dev;
import lombok.Data;
import java.util.List;
/**
*
*/
@Data
public class AddInvMAOrderDetailRequest {
/**
*
*/
private String orderIdFk;
/**
* ID
*/
List<String> invProductIds;
}

@ -0,0 +1,12 @@
package com.glxp.api.req.dev;
import com.glxp.api.util.page.ListPageRequest;
import lombok.Data;
@Data
public class CheckDetailQuery extends ListPageRequest {
private String deviceCode;
}

@ -0,0 +1,19 @@
package com.glxp.api.req.dev;
import com.glxp.api.enums.dev.DeviceChangeTypeEnum;
import com.glxp.api.util.page.ListPageRequest;
import lombok.Data;
import javax.validation.constraints.NotNull;
@Data
public class DeviceChangeOrderDetailQuery extends ListPageRequest {
@NotNull(message = "缺少必要参数")
Long orderId;
@NotNull(message = "缺少必要参数")
DeviceChangeTypeEnum type;
}

@ -0,0 +1,28 @@
package com.glxp.api.req.dev;
import com.baomidou.mybatisplus.annotation.TableField;
import com.glxp.api.enums.dev.DeviceChangeTypeEnum;
import lombok.Data;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
@Data
public class DeviceChangeOrderGenerateOrderId {
/**
*
*/
@TableField(value = "deptCode")
@NotEmpty(message = "操作部门不能为空!")
private String deptCode;
/**
*
*/
@TableField(value = "toDeptCode")
private String toDeptCode;
@NotNull(message = "类型不能为空")
private DeviceChangeTypeEnum type;
}

@ -0,0 +1,631 @@
package com.glxp.api.req.dev;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.glxp.api.entity.auth.AuthAdmin;
import com.glxp.api.entity.dev.DeviceChangeOrderEntity;
import com.glxp.api.entity.dev.DeviceChangeOrderItemEntity;
import com.glxp.api.enums.dev.DeviceChangeStatusEnum;
import com.glxp.api.enums.dev.DeviceChangeTypeEnum;
import com.glxp.api.exception.JsonException;
import com.glxp.api.util.SnowflakeUtil;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
*
*/
@Data
public class DeviceChangeOrderParam {
/**
*
*/
@NotNull(message = "类型不能为空")
DeviceChangeTypeEnum type;
/**
*
*/
@TableField(value = "billNo")
private String billNo;
/**
*
*/
String toDeptCode;
/**
*
*/
@Length(max = 500, message = "备注最多500个字")
String remark;
@Valid
@NotEmpty(message = "明细不能为空")
List<Item> items;
/**
*
*/
@TableId(value = "orderId")
private Long orderId;
/**
* 1. 2.() 3.4.
*/
private DeviceChangeStatusEnum status;
/**
*
*/
private String deptCode;
/**
* id
*/
private Long confirmUser;
/**
*
*/
private String confirmUserName;
/**
*
*/
private LocalDateTime confirmTime;
/**
*
*/
private String confirmRemark;
/**
*
*/
@TableField(value = "createUserName")
private String createUserName;
/**
* id
*/
@TableField(value = "createUser")
private Long createUser;
/**
*
*/
@TableField(value = "createTime")
private LocalDateTime createTime;
/**
*
*/
private Integer destroyType;
@Data
public static class Item {
/**
*
*/
@NotBlank(message = "设备编码不能为空")
@Pattern(regexp = "^[A-Za-z0-9]{1,20}$", message = "设备编码只能为(大小写字母、数字)组合或其中一项最多20个字符")
private String deviceCode;
/**
* id
*/
// @NotNull(message = "产品id不能为空")
private Long productId;
/**
* UDI
*/
private String udi;
/**
*
*/
private String batchNo;
/**
*
*/
private String serialNo;
/**
*
*/
private String productionDate;
/**
*
*/
private String expireDate;
private String ggxh;
private String manufactory;
private String measname;
private String nameCode;
private String productName;
private String zczbhhzbapzbh;
/**
*
*/
private String sourceType;
/**
* ID
*/
@TableField(value = "supId")
private String supId;
/**
*
*/
@TableField(value = "supName")
private String supName;
/**
*
*/
@TableField(value = "remark")
private String remark;
/**
*
*/
@TableField(value = "assetType")
private String assetType;
/**
*
*/
@TableField(value = "sasacType")
private String sasacType;
/**
*
*/
@TableField(value = "assetMnemonicCode")
private String assetMnemonicCode;
/**
*
*/
@TableField(value = "number")
private Integer number;
/**
*
*/
@TableField(value = "acquisitionMethod")
private String acquisitionMethod;
/**
*
*/
@TableField(value = "purpose")
private String purpose;
/**
*
*/
@TableField(value = "depreciationYear")
private Integer depreciationYear;
/**
*
*/
@TableField(value = "depreciationMonth")
private Integer depreciationMonth;
/**
*
*/
@TableField(value = "invCode")
private String invCode;
/**
*
*/
@TableField(value = "estimatedTotalHour")
private Integer estimatedTotalHour;
/**
*
*/
@TableField(value = "dayHour")
private Integer dayHour;
/**
*
*/
@TableField(value = "assetValue")
private BigDecimal assetValue;
/**
*
*/
@TableField(value = "ownFund")
private BigDecimal ownFund;
/**
*
*/
@TableField(value = "financialAppropriation")
private BigDecimal financialAppropriation;
/**
*
*/
@TableField(value = "educationFund")
private BigDecimal educationFund;
/**
*
*/
@TableField(value = "otherFund")
private BigDecimal otherFund;
/**
*
*/
@TableField(value = "nonPeerFinancialAppropriation")
private BigDecimal nonPeerFinancialAppropriation;
/**
*
*/
@TableField(value = "ybbm")
private String ybbm;
/**
* (
*/
@TableField(value = "catalogname1")
private String catalogname1;
/**
* (
*/
@TableField(value = "catalogname2")
private String catalogname2;
/**
* (
*/
@TableField(value = "catalogname3")
private String catalogname3;
/**
*
*/
@TableField(value = "catalogCode")
private String catalogCode;
/**
*
*/
@TableField(value = "catalogCode1")
private Integer catalogCode1;
/**
*
*/
@TableField(value = "catalogCode2")
private Integer catalogCode2;
/**
*
*/
@TableField(value = "catalogCode3")
private Integer catalogCode3;
/**
*
*/
@TableField(value = "managementCategory")
private String managementCategory;
/**
* 使
*/
@TableField(value = "endUser")
private String endUser;
/**
*
*/
@TableField(value = "estimatedResidualValue")
private BigDecimal estimatedResidualValue;
/**
*
*/
@TableField(value = "currencyType")
private String currencyType;
/**
*
*/
@TableField(value = "purType")
private String purType;
/**
*
*/
@TableField(value = "purchaseDate")
@JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
private Date purchaseDate;
/**
*
*/
@TableField(value = "addDate")
@JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
private Date addDate;
/**
*
*/
@TableField(value = "assetName")
private String assetName;
/**
*
*/
@TableField(value = "isImperative")
private Boolean isImperative;
/**
*
*/
@TableField(value = "isMaintain")
private Boolean isMaintain;
/**
* (
*/
@TableField(value = "imperativeCycle")
private Integer imperativeCycle;
/**
* (
*/
@TableField(value = "maintainCycle")
private Integer maintainCycle;
/**
*
*/
@TableField(value = "startImperativeDate")
@JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
private Date startImperativeDate;
/**
*
*/
@TableField(value = "startMaintainDate")
@JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
private Date startMaintainDate;
/**
*
*/
@TableField(value = "serviceType")
private String serviceType;
/**
*
*/
@TableField(value = "maintainType")
private String maintainType;
/**
*
*/
@TableField(value = "managerUser")
private String managerUser;
/**
*
*/
@TableField(value = "approveUser")
private String approveUser;
/**
*
*/
@TableField(value = "ledgerAccount")
private String ledgerAccount;
/**
*
*/
@TableField(value = "impairmentProvision")
private String impairmentProvision;
/**
*
*/
@TableField(value = "estimatedWorkload")
private String estimatedWorkload;
/**
*
*/
@TableField(value = "completedWorkload")
private String completedWorkload;
/**
*
*/
@TableField(value = "maintenanceType")
private String maintenanceType;
/**
*
*/
@TableField(value = "maintenanceCycle")
private Integer maintenanceCycle;
/**
*
*/
@TableField(value = "startMaintenancDate")
@JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
private Date startMaintenancDate;
/**
*
*/
@TableField(value = "endMaintenancDate")
@JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
private Date endMaintenancDate;
/**
*
*/
@TableField(value = "networkType")
private Integer networkType;
/**
* 使
*/
@TableField(value = "userRole")
private Integer userRole;
/**
*
*/
@TableField(value = "isAddDomain")
private Boolean isAddDomain;
/**
* u
*/
@TableField(value = "isUDisc")
private Boolean isUDisc;
/**
*
*/
@TableField(value = "ascriptionType")
private Integer ascriptionType;
/**
*
*/
@TableField(value = "assetReserveType")
private String assetReserveType;
/**
* id
*/
@TableField(value = "purApplyBillNo")
private String purApplyBillNo;
/**
* id
*/
@TableField(value = "purOrderBillNo")
private String purOrderBillNo;
/**
* id
*/
@TableField(value = "purContractBillNo")
private String purContractBillNo;
/**
* id
*/
@TableField(value = "purPlanBillNo")
private String purPlanBillNo;
}
public void valid(AuthAdmin user) {
if (StrUtil.isBlank(this.deptCode)) {
throw new JsonException("请选择操作部门");
}
if (this.type == DeviceChangeTypeEnum.CHANGE) {
if (StrUtil.isBlank(this.toDeptCode)) {
throw new JsonException("请选择目标部门");
} else if (this.toDeptCode.equals(user.getLocDeptCode())) {
throw new JsonException("目标部门不能为当前部门");
}
} else {
this.toDeptCode = user.getLocDeptCode();
items.stream().forEach(i -> {
if (i.getProductId() == null) {
throw new JsonException("产品id不能为空");
}
});
}
Map<String, List<Item>> map = items.stream().collect(Collectors.groupingBy(Item::getDeviceCode));
map.entrySet().stream().forEach(i -> {
if (i.getValue().size() > 1) {
throw new JsonException(500, String.format("设备编码[%s]重复请检查", i.getKey()));
}
});
}
public DeviceChangeOrderEntity getOrderEntity(AuthAdmin user) {
if (billNo != null) {
DeviceChangeOrderEntity deviceChangeOrderEntity = new DeviceChangeOrderEntity();
BeanUtil.copyProperties(this, deviceChangeOrderEntity);
return deviceChangeOrderEntity;
}
DeviceChangeOrderEntity order = DeviceChangeOrderEntity.builder()
.orderId(SnowflakeUtil.getId())
.type(type)
.status(DeviceChangeStatusEnum.WAIT_CONFIRM)
.deptCode(deptCode)
.toDeptCode(toDeptCode)
.remark(remark)
.destroyType(destroyType)
.createUser(user.getId())
.createUserName(user.getEmployeeName())
.createTime(LocalDateTime.now())
.build();
// 新增时状态直接为完成
if (type == DeviceChangeTypeEnum.ADD || type == DeviceChangeTypeEnum.DESTROY) {
order.setStatus(DeviceChangeStatusEnum.FINISH)
.setConfirmTime(order.getCreateTime())
.setConfirmUser(order.getCreateUser())
.setConfirmUserName(order.getCreateUserName())
;
}
return order;
}
public List<DeviceChangeOrderItemEntity> getOrderItemList(Long orderId, AuthAdmin user) {
return items.stream().map(i -> {
DeviceChangeOrderItemEntity itemEntity = new DeviceChangeOrderItemEntity();
if (type == DeviceChangeTypeEnum.ADD) {
BeanUtil.copyProperties(i, itemEntity);
} else {
itemEntity.setDeviceCode(i.getDeviceCode());
}
itemEntity.setOrderId(orderId);
return itemEntity;
}).collect(Collectors.toList());
}
public List<DeviceChangeOrderItemEntity> getDraftOrderItemList(Long orderId, AuthAdmin user) {
return items.stream().map(i -> {
DeviceChangeOrderItemEntity itemEntity = new DeviceChangeOrderItemEntity();
BeanUtil.copyProperties(i, itemEntity);
itemEntity.setOrderId(orderId);
return itemEntity;
}).collect(Collectors.toList());
}
}

@ -0,0 +1,36 @@
package com.glxp.api.req.dev;
import com.glxp.api.enums.dev.DeviceChangeTypeEnum;
import com.glxp.api.util.page.ListPageRequest;
import lombok.Data;
@Data
public class DeviceChangeOrderQuery extends ListPageRequest {
/**
*
*/
String changeOrderId;
/**
*
*
*/
DeviceChangeTypeEnum type;
String remark;
/**
*
*/
String toDeptCode;
/**
*
*/
String deptCode;
}

@ -46,7 +46,7 @@ public class DeviceCheckItemDictParam {
.name(name)
.content(content)
.type(type)
.createUserId(user.getCustomerId())
.createUserId(Long.valueOf(user.getCustomerId()))
.createUserName(user.getEmployeeName())
.createTime(LocalDateTime.now())
.build();

@ -16,4 +16,5 @@ public class DeviceCheckItemDictQuery extends ListPageRequest {
*/
private String name;
private Integer type;
}

@ -4,14 +4,19 @@ import com.glxp.api.enums.dev.DeviceStatusEnum;
import com.glxp.api.util.page.ListPageRequest;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@Data
public class DeviceInfoDetailByDeptCodeQuery extends ListPageRequest {
public class DeviceInfoDetailByDeptCodeQuery extends ListPageRequest {
/**
* UDI
*/
private String deviceCodeAndUdi;
/**
*
*/
@NotBlank(message = "缺少部门编码")
// @NotBlank(message = "缺少部门编码")
private String deptCode;
/**

@ -2,10 +2,12 @@ package com.glxp.api.req.dev;
import com.glxp.api.enums.dev.DeviceStatusEnum;
import com.glxp.api.util.page.ListPageRequest;
import com.glxp.api.vo.dev.DeviceInfoVo;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.List;
@Data
public class DeviceInfoDetailQuery extends ListPageRequest {
@ -68,4 +70,11 @@ public class DeviceInfoDetailQuery extends ListPageRequest {
private String zczbhhzbapzbh;
private String deviceCodeAndUdi;
private String templateId;
private List<DeviceInfoVo> list;
}

@ -36,6 +36,12 @@ public class DevicePlanDetailItemParam {
String deviceCode;
/**
*
*/
Integer type;
@NotEmpty(message = "巡检项目不能为空")
Set<String> itemCodes;
@ -55,7 +61,7 @@ public class DevicePlanDetailItemParam {
public List<DevicePlanDetailItemEntity> getEntity(DeviceCheckItemDictService deviceCheckItemDictService) {
List<DeviceCheckItemDictEntity> list = deviceCheckItemDictService.listByIds(itemCodes);
if (CollectionUtil.isEmpty(list)) {
throw new JsonException("所有项目编码都不存在,疑似非法操作");
throw new JsonException("项目编码不存在,请确认");
}
if (list.size() != itemCodes.size()) {
Map<String, List<DeviceCheckItemDictEntity>> collect = list.stream().collect(Collectors.groupingBy(DeviceCheckItemDictEntity::getCode));
@ -71,6 +77,7 @@ public class DevicePlanDetailItemParam {
DevicePlanDetailItemEntity build = DevicePlanDetailItemEntity.builder()
.planId(planId)
.productId(productId)
.type(type)
.deviceCode(StrUtil.blankToDefault(deviceCode, ""))
.itemCode(i.getCode())
.name(i.getName())

@ -39,7 +39,7 @@ public class DevicePlanDetailParam {
public List<DevicePlanDetailEntity> getEntity(DeviceInfoService deviceInfoService) {
List<DeviceInfoEntity> deviceList = deviceInfoService.listByIds(deviceCodes);
if (CollectionUtil.isEmpty(deviceList)) {
throw new JsonException("未找到设备,疑似非法操作");
throw new JsonException("设备编码不存在,请确认");
}
List<DevicePlanDetailEntity> list = deviceList.stream().map(d -> {

@ -58,6 +58,11 @@ public class DevicePlanParam {
*/
private Integer status;
/**
*
*/
private Integer type;
/**
*
*/
@ -67,7 +72,7 @@ public class DevicePlanParam {
public void valid(DeptService deptService) {
DeptEntity dept = deptService.selectByCode(chargeDeptCode);
if (dept == null) {
throw new JsonException("负责部门不存在,疑似非法操作");
throw new JsonException("负责部门不存在,请确认");
}
if (startDate.isAfter(endDate)) {
throw new JsonException("计划开始日期不能在计划结束日期之后");
@ -88,6 +93,7 @@ public class DevicePlanParam {
.frequency(frequency)
.status(status == null ? 1 : status)
.remark(remark)
.type(type)
.build();
if (!isUpdate) {
build.setCreateUserId(user.getId()).setCreateUserName(user.getEmployeeName()).setCreateTime(LocalDateTime.now());

@ -13,4 +13,6 @@ public class DevicePlanQuery extends ListPageRequest {
*/
String chargeDeptCode;
Integer type;
}

@ -0,0 +1,55 @@
package com.glxp.api.req.dev;
import com.glxp.api.util.page.ListPageRequest;
import lombok.Data;
import java.util.Date;
@Data
public class DeviceProjectSetRequest extends ListPageRequest {
private Integer id;
/**
*
*/
private String code;
/**
*
*/
private String content;
/**
* 12
*/
private Integer type;
/**
*
*/
private String remak;
/**
*
*/
private Date udpateTime;
/**
*
*/
private String updateUser;
/**
*
*/
private String createUser;
/**
*
*/
private Date createTime;
private String startTime;
private String endTime;
}

@ -1,6 +1,7 @@
package com.glxp.api.req.dev;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.annotation.TableField;
import com.glxp.api.entity.auth.AuthAdmin;
import com.glxp.api.entity.dev.DeviceInfoEntity;
import com.glxp.api.entity.dev.DeviceRepairApplyDetailEntity;
@ -18,10 +19,7 @@ import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.*;
import java.util.stream.Collectors;
@Data
@ -37,6 +35,8 @@ public class DeviceRepairApplyAddParam {
@NotEmpty(message = "请选择至少一个设备进行报修")
Set<ApplyDetail> details;
Long taskId;
@Data
public static class ApplyDetail {
@ -52,6 +52,12 @@ public class DeviceRepairApplyAddParam {
@NotBlank(message = "问题描述不能为空")
String description;
/**
*
*/
@TableField(value = "livePath")
private String livePath;
@Override
public boolean equals(Object o) {
if (this == o) return true;
@ -80,6 +86,7 @@ public class DeviceRepairApplyAddParam {
.applyUserId(user.getId())
.applyUserName(user.getEmployeeName())
.applyUserPhone(this.applyUserPhone)
.confirmUserId(user.getId())
.applyTime(LocalDateTime.now())
.deviceCount(details.size())
.finishCount(0)
@ -88,9 +95,11 @@ public class DeviceRepairApplyAddParam {
}
public List<DeviceRepairApplyDetailEntity> getDetailEntityList(Long applyId, DeviceInfoService deviceInfoService, AuthAdmin user) {
List<DeviceInfoVo> list = deviceInfoService.listVoByCodes(details.stream().map(ApplyDetail::getDeviceCode).collect(Collectors.toList()), user.getLocDeptCode(), DeviceStatusEnum.NORMAL);
List<DeviceStatusEnum> enums = new ArrayList<>();
enums.add( DeviceStatusEnum.NORMAL);
List<DeviceInfoVo> list = deviceInfoService.listVoByCodes(details.stream().map(ApplyDetail::getDeviceCode).collect(Collectors.toList()), null, enums);
if (list.size() != details.size()) {
throw new JsonException("设备信息不匹配,疑似非法操作");
throw new JsonException("设备状态异常或信息不符,请确认");
}
Map<String, List<DeviceInfoEntity>> deviceMap = list.stream().collect(Collectors.groupingBy(DeviceInfoEntity::getDeviceCode));
return details.stream().map(d -> {
@ -99,6 +108,7 @@ public class DeviceRepairApplyAddParam {
.applyId(applyId)
.description(d.getDescription())
.status(DeviceRepairApplyDetailStatusEnum.WAIT_DIAGNOSIS)
.livePath(d.getLivePath())
.build();
BeanUtil.copyProperties(info, build,"status");
return build;

@ -22,8 +22,12 @@ public class DeviceRepairApplyDetailDiagnosisParam {
@NotBlank(message = "诊断信息不能为空")
String diagnosisInfo;
String diagnosisLivePath;
Boolean innerFlag;
Long repairUserId;
String repairUserName;
String repairDeptCode;

@ -1,13 +1,12 @@
package com.glxp.api.req.dev;
import com.glxp.api.util.page.ListPageRequest;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
@Data
public class DeviceRepairApplyListByIdAndCodeQuery extends ListPageRequest {
public class DeviceRepairApplyListByIdAndCodeQuery {
@NotNull(message = "报修单标识不能为空")
Long applyId;

@ -0,0 +1,80 @@
package com.glxp.api.req.dev;
import com.glxp.api.util.page.ListPageRequest;
import lombok.Data;
/**
*
*/
@Data
public class FilterDeptDeviceRequest extends ListPageRequest {
/**
*
*/
private String deptCode;
/**
*
*/
private String invCode;
/**
*
*/
private String deviceName;
/**
*
*/
private String code;
/**
*
*/
private String originCode;
/**
*
*/
private String ggxh;
/**
*
*/
private String batchNo;
/**
* 12345
*/
private Integer status;
/**
* 12
*/
private Integer addType;
private Integer id;
private String udiCode;
private String nameCode;
private String manufactory;
private String zczbhhzbapzbh;
private String supName;
private String productionDate;
private String expireDate;
private String serialNo;
private String manager;
}

@ -0,0 +1,54 @@
package com.glxp.api.req.dev;
import com.glxp.api.util.page.ListPageRequest;
import lombok.Data;
/**
*
*/
@Data
public class FilterDeviceInspectOrderRequest extends ListPageRequest {
private Integer id;
/**
*
*/
private String orderId;
/**
*
*/
private String deptCode;
/**
*
*/
private String invCode;
/**
*
*/
private String code;
/**
*
*/
private String lastOrderId;
/**
* 12
*/
private Integer type;
/**
* 123
*/
private Integer status;
/**
* 01
*/
private Integer deviceStatus;
}

@ -0,0 +1,66 @@
package com.glxp.api.req.dev;
import com.glxp.api.util.page.ListPageRequest;
import lombok.Data;
import java.util.List;
/**
*
*/
@Data
public class FilterDeviceInspectPlanRequest extends ListPageRequest {
private Integer id;
/**
*
*/
private String orderId;
/**
*
*/
private String deptCode;
/**
*
*/
private String invCode;
/**
*
*/
private String code;
/**
* 123
*/
private Integer level;
/**
* 123
*/
private Integer status;
private List<Integer> statusList;
private Integer planStatus;
private String ksStartDate;
private String ksEndDate;
private String jsStartDate;
private String jsEndDate;
private String auditStartDate;
private String auditEndDate;
}

@ -0,0 +1,72 @@
package com.glxp.api.req.dev;
import com.glxp.api.util.page.ListPageRequest;
import lombok.Data;
import java.util.Date;
import java.util.List;
/**
*
*/
@Data
public class FilterDeviceInspectTakeRequest extends ListPageRequest {
private Long id;
/**
*
*/
private String orderId;
/**
*
*/
private String deptCode;
/**
*
*/
private String invCode;
/**
*
*/
private String code;
/**
* 123
*/
private Integer level;
/**
* 123
*/
private Integer status;
private List<Integer> statusList;
private Date expectedTime;
private String ksStartDate;
private String ksEndDate;
private String jsStartDate;
private String jsEndDate;
private String yjjsStartDate;
private String yjjsEndDate;
private Integer repairType;
private Integer type;
}

@ -0,0 +1,18 @@
package com.glxp.api.req.dev;
import com.glxp.api.util.page.ListPageRequest;
import lombok.Data;
/**
*
*/
@Data
public class FilterDeviceMAOrderDetailRequest extends ListPageRequest {
/**
*
*/
private String orderIdFk;
}

@ -0,0 +1,39 @@
package com.glxp.api.req.dev;
import com.glxp.api.util.page.ListPageRequest;
import lombok.Data;
@Data
public class FilterDeviceMAOrderRequest extends ListPageRequest {
/**
* ID
*/
private Integer id;
/**
*
*/
private String orderId;
/**
*
*/
private String receiveOrderId;
/**
* 0稿 1
*/
private Integer status;
/**
*
*/
private String code;
/**
* ID
*/
private String templateId;
}

@ -0,0 +1,49 @@
package com.glxp.api.req.dev;
import com.glxp.api.util.page.ListPageRequest;
import lombok.Data;
/**
*
*/
@Data
public class FilterDeviceReceiveOrderDetailRequest extends ListPageRequest {
/**
* ID
*/
private Integer id;
/**
*
*/
private String orderIdFk;
/**
*
*/
private String code;
/**
* DI
*/
private String nameCode;
/**
*
*/
private String deptCode;
/**
*
*/
private String receiveUser;
/**
*
*/
private Integer status;
private String relId;
}

@ -0,0 +1,62 @@
package com.glxp.api.req.dev;
import com.glxp.api.util.page.ListPageRequest;
import lombok.Data;
import java.util.List;
/**
*
*/
@Data
public class FilterDeviceReceiveOrderRequest extends ListPageRequest {
/**
* ID
*/
private Integer id;
/**
*
*/
private String orderId;
/**
* 0稿 1 2
*/
private Integer status;
/**
*
*/
private String fromDeptCode;
/**
*
*/
private String fromInvCode;
/**
*
*/
private String fromInvSpaceCode;
private String templateId;
/**
*
*/
private String startTime;
/**
*
*/
private String endTime;
private String receiveUserName;
private List<Integer> statusList;
}

@ -0,0 +1,48 @@
package com.glxp.api.req.dev;
import com.glxp.api.util.page.ListPageRequest;
import lombok.Data;
import java.util.Date;
/**
*
*/
@Data
public class FilterDeviceRepairOrderDetailRequest extends ListPageRequest {
private Long id;
private String orderIdFk;
/**
*
*/
private String code;
/**
*
*/
private String content;
/**
* 12
*/
private Integer type;
/**
*
*/
private String remark;
/**
*
*/
private String updateUser;
/**
*
*/
private Date updateTime;
}

@ -0,0 +1,57 @@
package com.glxp.api.req.dev;
import com.glxp.api.util.page.ListPageRequest;
import lombok.Data;
import java.util.List;
/**
*
*/
@Data
public class FilterDeviceRepairOrderRequest extends ListPageRequest {
private Integer id;
/**
*
*/
private String orderId;
/**
*
*/
private String deptCode;
/**
*
*/
private String invCode;
/**
*
*/
private String code;
/**
* 0稿123 4 5
*/
private Integer status;
private List<Integer> statusList;
/**
*
*/
private String repariName;
/**
* 1:2
*/
private Integer repairType;
/**
* 1,2,3,
*/
private Integer urgencyType;
}

@ -0,0 +1,30 @@
package com.glxp.api.req.dev;
import com.glxp.api.util.page.ListPageRequest;
import lombok.Data;
/**
*
*/
@Data
public class FilterInvMAOrderDetailRequest extends ListPageRequest {
private Integer id;
/**
* ID
*/
public String orderIdFk;
/**
* 0 1
*/
public Integer maStatus;
/**
* 0 1
*/
private Integer deviceStatus;
}

@ -0,0 +1,35 @@
package com.glxp.api.req.dev;
import com.glxp.api.util.page.ListPageRequest;
import lombok.Data;
/**
*
*/
@Data
public class FilterInvMAOrderRequest extends ListPageRequest {
private Integer id;
/**
* ID
*/
private String orderId;
/**
*
*/
private String invCode;
/**
*
*/
private String invSpaceCode;
/**
* 0稿 1 2
*/
private Integer status;
}

@ -0,0 +1,11 @@
package com.glxp.api.req.dev;
import com.glxp.api.entity.dev.DeviceAssetCertEntity;
import lombok.Data;
@Data
public class PostDeviceCertRequest extends DeviceAssetCertEntity {
private int repeatUpload;
}

@ -0,0 +1,12 @@
package com.glxp.api.res.dev;
import lombok.Data;
@Data
public class DateRequest {
private String firstDay;
private String lastDay;
private int year;
private int momth;
}

@ -0,0 +1,158 @@
package com.glxp.api.res.dev;
import lombok.Data;
import java.util.Date;
/**
* VO
*/
@Data
public class DeptDeviceDetailResponse {
private Integer id;
/**
*
*/
private String deptCode;
/**
*
*/
private String invCode;
/**
*
*/
private String originCode;
/**
*
*/
private String code;
/**
*
*/
private String relId;
/**
*
*/
private String deviceName;
/**
*
*/
private String ggxh;
/**
*
*/
private String batchNo;
/**
*
*/
private String serialNo;
/**
*
*/
private String productionDate;
/**
*
*/
private String expireDate;
/**
*
*/
private String manufactory;
/**
*
*/
private String measname;
/**
* /
*/
private String zczbhhzbapzbh;
/**
* ID
*/
private String supId;
/**
*
*/
private String supName;
/**
* 12345
*/
private Integer status;
/**
* 12
*/
private Integer addType;
/**
*
*/
private String createUser;
/**
*
*/
private String manager;
/**
*
*/
private Date maTime;
/**
*
*/
private Date createTime;
/**
*
*/
private Date updateTime;
/**
*
*/
private String remark;
/**
*
*/
private String createUserName;
/**
*
*/
private String managerName;
/**
*
*/
private String deptName;
/**
*
*/
private String invName;
private String orderIdFk;
private String nameCode;
}

@ -0,0 +1,120 @@
package com.glxp.api.res.dev;
import lombok.Data;
import java.util.Date;
/**
* VO
*/
@Data
public class DeviceInspectOrderResponse {
private Integer id;
/**
*
*/
private String orderId;
/**
*
*/
private String deptCode;
/**
*
*/
private String invCode;
/**
*
*/
private String code;
/**
*
*/
private String lastOrderId;
/**
* 123
*/
private Integer type;
/**
* 012
*/
private Integer status;
/**
* 01
*/
private Integer deviceStatus;
/**
*
*/
private String createUser;
/**
*
*/
private String auditUser;
/**
*
*/
private Date createTime;
/**
*
*/
private Date auditTime;
/**
*
*/
private Date updateTime;
/**
*
*/
private String remark;
/**
*
*/
private String deptName;
/**
*
*/
private String invName;
/**
*
*/
private String createUserName;
/**
*
*/
private String auditUserName;
/**
*
*/
private String deviceName;
/**
*
*/
private String ggxh;
/**
*
*/
private String batchNo;
}

@ -0,0 +1,138 @@
package com.glxp.api.res.dev;
import lombok.Data;
import java.util.Date;
/**
* VO
*/
@Data
public class DeviceInspectPlanResponse {
private Integer id;
/**
*
*/
private String orderId;
/**
*
*/
private String deptCode;
/**
*
*/
private String invCode;
/**
*
*/
private String code;
/**
* 123
*/
private Integer level;
/**
* 012
*/
private Integer status;
/**
*
*/
private String createUser;
/**
*
*/
private String auditUser;
/**
*
*/
private Date createTime;
/**
*
*/
private Date auditTime;
/**
*
*/
private String remark;
/**
*
*/
private String deptName;
/**
*
*/
private String invName;
/**
*
*/
private String deviceName;
/**
*
*/
private String ggxh;
/**
*
*/
private String batchNo;
/**
*
*/
private String createUserName;
/**
*
*/
private String auditUserName;
/**
*
*/
private Date startTime;
/**
*
*/
private Date endTime;
/**
*
*/
private String frequency;
/**
* 12345 6
*/
private Integer frequencyUnit;
/**
* (1:234
*/
private Integer planStatus;
/**
*
*/
private String inspectUser;
/**
*
*/
private Date lastTime;
/**
*
*/
private Date nextTime;
}

@ -0,0 +1,53 @@
package com.glxp.api.res.dev;
import lombok.Data;
/**
*
*/
@Data
public class DeviceInspectSetResponse {
private Integer id;
/**
*
*/
private String deviceName;
/**
*
*/
private String code;
/**
*
*/
private String deptName;
/**
*
*/
private String invName;
/**
*
*/
private String frequency;
/**
* 12345 6
*/
private Integer frequencyUnit;
/**
* 12
*/
private Integer status;
/**
*
*/
private String remark;
}

@ -0,0 +1,117 @@
package com.glxp.api.res.dev;
import lombok.Data;
import java.util.Date;
/**
* VO
*/
@Data
public class DeviceInspectTakeResponse {
private Long id;
/**
*
*/
private String orderId;
/**
*
*/
private String deptCode;
/**
*
*/
private String invCode;
/**
*
*/
private String code;
private String planOrderIdFk;
/**
* 012
*/
private Integer status;
/**
*
*/
private Date createTime;
/**
*
*/
private String remark;
/**
*
*/
private String deptName;
/**
*
*/
private String invName;
/**
*
*/
private String deviceName;
/**
*
*/
private String ggxh;
/**
*
*/
private String batchNo;
/**
*
*/
private String createUserName;
/**
*
*/
private String auditUserName;
/**
*
*/
private Date strartTime;
/**
*
*/
private Date endTime;
/**
* (1:234
*/
private Integer planStatus;
/**
*
*/
private String inspectUser;
/**
*
*/
private Date remindTime;
private String inspectName;
private Date expectedTime;
private Integer type;
private Integer repairType;
private Integer level;
}

@ -0,0 +1,108 @@
package com.glxp.api.res.dev;
import lombok.Data;
import java.util.Date;
/**
*
*/
@Data
public class DeviceMAOrderDetailResponse {
/**
* id
*/
private Integer id;
/**
*
*/
private String orderIdFk;
/**
*
*/
private String code;
/**
* ID
*/
private String nameCode;
/**
* ID
*/
private String relId;
/**
*
*/
private String batchNo;
/**
*
*/
private String produceDate;
/**
*
*/
private String expireDate;
/**
*
*/
private String serialNo;
/**
*
*/
private Date createTime;
/**
*
*/
private Date updateTime;
/**
* 0 1
*/
private Integer deviceStatus;
/**
* 0 1
*/
private Integer maStatus;
/**
*
*/
private String createUser;
/**
*
*/
private String remark;
/**
*
*/
private String productName;
/**
*
*/
private String ylqxzcrbarmc;
/**
*
*/
private String zczbhhzbapzbh;
/**
*
*/
private String ggxh;
}

@ -0,0 +1,65 @@
package com.glxp.api.res.dev;
import lombok.Data;
import java.util.Date;
/**
*
*/
@Data
public class DeviceMAOrderResponse {
private Integer id;
/**
*
*/
private String orderId;
/**
*
*/
private String receiveOrderId;
/**
*
*/
private Integer status;
/**
*
*/
private Date createTime;
/**
*
*/
private Date updateTime;
/**
*
*/
private String createUser;
/**
*
*/
private String auditUser;
/**
*
*/
private String remark;
/**
*
*/
private String code;
/**
*
*/
private String deptName;
}

@ -0,0 +1,60 @@
package com.glxp.api.res.dev;
import lombok.Data;
import java.util.Date;
@Data
public class DeviceProjectSetResponse {
private Integer id;
/**
*
*/
private String code;
/**
*
*/
private String content;
/**
* 12
*/
private Integer type;
/**
*
*/
private String remak;
/**
*
*/
private Date udpateTime;
/**
*
*/
private String updateUser;
/**
*
*/
private String updateUserName;
/**
*
*/
private String createUser;
/**
*
*/
private String createUserName;
/**
*
*/
private Date createTime;
}

@ -0,0 +1,138 @@
package com.glxp.api.res.dev;
import lombok.Data;
import java.util.Date;
/**
*
*/
@Data
public class DeviceReceiveOrderDetailResponse {
/**
* id
*/
private Integer id;
/**
*
*/
private String orderIdFk;
/**
*
*/
private String originCode;
/**
*
*/
private String code;
/**
* ID
*/
private String relId;
/**
* DI
*/
private String nameCode;
/**
*
*/
private String batchNo;
/**
*
*/
private String productionDate;
/**
*
*/
private String expireDate;
/**
*
*/
private String serialNo;
/**
*
*/
private Date createTime;
/**
*
*/
private Date updateTime;
/**
*
*/
private String productName;
/**
*
*/
private String invName;
/**
*
*/
private String invSpaceName;
/**
*
*/
private String invSpaceCode;
/**
* /
*/
private String zczbhhzbapzbh;
/**
*
*/
private String ylqxzcrbarmc;
/**
*
*/
private String ggxh;
/**
*
*/
private Boolean editSerialNo;
/**
*
*/
private String deptName;
/**
* ID
*/
private String supId;
/**
*
*/
private String supName;
/**
*
*/
private String manufactory;
/**
*
*/
private String measname;
}

@ -0,0 +1,133 @@
package com.glxp.api.res.dev;
import lombok.Data;
import java.util.Date;
/**
*
*/
@Data
public class DeviceReceiveOrderResponse {
/**
* id
*/
private Integer id;
/**
*
*/
private String orderId;
/**
*
*/
private String fromDeptCode;
/**
*
*/
private String fromInvCode;
/**
*
*/
private String fromInvSpaceCode;
/**
*
*/
private String deptCode;
/**
*
*/
private String invCode;
/**
*
*/
private String invSpaceCode;
/**
* 0稿 1 2
*/
private Integer status;
/**
*
*/
private String createUser;
/**
*
*/
private String createUserName;
/**
*
*/
private String auditUser;
/**
*
*/
private String receiveUserName;
/**
*
*/
private String receiveUser;
/**
*
*/
private Date createTime;
/**
*
*/
private Date updateTime;
/**
*
*/
private String remark;
/**
*
*/
private String deptName;
/**
*
*/
private String invName;
/**
*
*/
private String invSpaceName;
/**
*
*/
private String fromDeptName;
/**
*
*/
private String fromInvName;
/**
*
*/
private String fromInvSpaceName;
private String auditUserName;
private Integer type;
}

@ -0,0 +1,48 @@
package com.glxp.api.res.dev;
import lombok.Data;
import java.util.Date;
/**
* VO
*/
@Data
public class DeviceRepairOrderDetailResponse {
private Long id;
private String orderIdFk;
/**
*
*/
private String code;
/**
*
*/
private String content;
/**
* 12
*/
private Integer type;
/**
*
*/
private String remark;
/**
*
*/
private String updateUser;
/**
*
*/
private Date updateTime;
}

@ -0,0 +1,152 @@
package com.glxp.api.res.dev;
import lombok.Data;
import java.util.Date;
/**
* VO
*/
@Data
public class DeviceRepairOrderResponse {
private Integer id;
/**
*
*/
private String orderId;
/**
*
*/
private String deptCode;
/**
*
*/
private String invCode;
/**
*
*/
private String code;
/**
* 0稿123 4 5
*/
private Integer status;
/**
*
*/
private String createUser;
/**
*
*/
private String auditUser;
/**
*
*/
private String msg;
/**
*
*/
private Date createTime;
/**
*
*/
private Date auditTime;
/**
*
*/
private String remark;
/**
*
*/
private String deptName;
/**
*
*/
private String invName;
/**
*
*/
private String createUserName;
/**
*
*/
private String auditUserName;
/**
*
*/
private String deviceName;
/**
*
*/
private String ggxh;
/**
*
*/
private String batchNo;
// ----------------------新增字段=-------------------------------
/**
* 1:2
*/
private Integer repairType;
/**
* 1,2,3,
*/
private Integer urgencyType;
/**
*
*/
private Date planTime;
/**
*
*/
private String uploadImage;
/**
*
*/
private String repariName;
/**
*
*/
private String repName;
/**
*
*/
private String repariStartTime;
/**
*
*/
private String repariEndTime;
/**
*
*/
private String repariRemark;
/**
*
*/
private String repariImage;
private String inspectUser;
private String inspectUserName;
}

@ -0,0 +1,103 @@
package com.glxp.api.res.dev;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import java.util.Date;
/**
*
*/
@Data
public class InvMAOrderDetailResponse {
@TableId(value = "id", type = IdType.INPUT)
private Integer id;
/**
*
*/
private String orderIdFk;
/**
*
*/
private String code;
/**
* ID
*/
private Long relId;
/**
* DI
*/
private String nameCode;
/**
*
*/
private String batchNo;
/**
*
*/
private String productionDate;
/**
*
*/
private String expireDate;
/**
*
*/
private Integer count;
/**
* 0 1
*/
private Integer maStatus;
/**
* 0 1
*/
private Integer deviceStatus;
/**
*
*/
private Date createTime;
/**
*
*/
private Date updateTime;
/**
*
*/
private String remark;
/**
*
*/
private String productName;
/**
*
*/
private String ggxh;
/**
* /
*/
private String zczbhhzbapzbh;
/**
*
*/
private String ylqxzcrbarmc;
}

@ -0,0 +1,85 @@
package com.glxp.api.res.dev;
import lombok.Data;
import java.util.Date;
/**
*
*/
@Data
public class InvMAOrderResponse {
private Integer id;
/**
*
*/
private String orderId;
/**
*
*/
private String invCode;
/**
*
*/
private String invSpaceCode;
/**
* 0稿 1 2
*/
private Integer status;
/**
*
*/
private Date createTime;
/**
*
*/
private Date updateTime;
/**
*
*/
private Date auditTime;
/**
*
*/
private String createUser;
/**
*
*/
private String auditUser;
/**
*
*/
private String remark;
/**
*
*/
private String invName;
/**
*
*/
private String invSpaceName;
/**
*
*/
private String createUserName;
/**
*
*/
private String auditUserName;
}

@ -0,0 +1,46 @@
package com.glxp.api.res.dev;
import lombok.Data;
/**
* VO
*/
@Data
public class InvMAProductResponse {
/**
* id
*/
private String id;
/**
*
*/
private String nameCode;
/**
*
*/
private String cpmctymc;
/**
*
*/
private String ggxh;
/**
*
*/
private String batchNo;
/**
*
*/
private String productionDate;
/**
*
*/
private String expireDate;
}

@ -1,8 +1,10 @@
package com.glxp.api.res.sync;
import com.glxp.api.entity.dev.*;
import com.glxp.api.entity.inv.*;
import com.glxp.api.entity.inv.DeviceInspectTaskEntity;
import com.glxp.api.entity.inv.DeviceInspectTaskDetailEntity;
import lombok.Data;
import java.util.List;

@ -7,6 +7,7 @@ import com.github.pagehelper.PageHelper;
import com.glxp.api.dao.auth.AuthAdminDao;
import com.glxp.api.dao.auth.SysUserRoleMapper;
import com.glxp.api.entity.auth.AuthAdmin;
import com.glxp.api.entity.auth.DeptEntity;
import com.glxp.api.entity.auth.SysUserRole;
import com.glxp.api.exception.JsonException;
import com.glxp.api.req.auth.FilterAuthUserRequest;
@ -32,6 +33,8 @@ public class AuthAdminServiceImpl implements AuthAdminService {
private AuthAdminDao authAdminDao;
@Resource
SysUserRoleMapper sysUserRoleMapper;
@Resource
DeptServiceImpl deptService;
@Override
public List<AuthAdmin> listAdminPage(FilterAuthUserRequest filterAuthUserRequest) {
@ -64,7 +67,12 @@ public class AuthAdminServiceImpl implements AuthAdminService {
*/
@Override
public AuthAdmin findById(Long id) {
return authAdminDao.findById(id);
AuthAdmin authAdmin = authAdminDao.findById(id);
if (authAdmin != null) {
DeptEntity dept = deptService.selectByCode(authAdmin.getLocDeptCode());
authAdmin.setDeptName(dept.getName());
}
return authAdmin;
}
/**

@ -96,7 +96,7 @@ public interface DeviceInfoService extends IService<DeviceInfoEntity> {
List<DeviceInfoVo> listVoByProductIdAndStatus(Long productId, DeviceStatusEnum status);
List<DeviceInfoVo> listVoByCodes(List<String> deviceCodes, String deptCode, DeviceStatusEnum status);
List<DeviceInfoVo> listVoByCodes(List<String> deviceCodes, String deptCode, List<DeviceStatusEnum> status);
boolean exitOrder(Long orderId, String deviceCode);

@ -6,9 +6,7 @@ import com.glxp.api.entity.dev.DeviceRepairApplyEntity;
import com.glxp.api.enums.dev.DeviceRepairApplyStatusEnum;
import com.glxp.api.req.dev.DeviceRepairApplyAddParam;
import com.glxp.api.req.dev.DeviceRepairApplyConfirmParam;
import com.glxp.api.req.dev.DeviceRepairApplyDetailMiniQuery;
import com.glxp.api.req.dev.DeviceRepairApplyQuery;
import com.glxp.api.res.dev.DeviceRepairApplyDetailMiniResponse;
import java.util.List;
@ -38,5 +36,4 @@ public interface DeviceRepairApplyService extends IService<DeviceRepairApplyEnti
* @param applyId id
*/
void finishDeviceRepair(Long applyId);
}

@ -62,6 +62,7 @@ public class DeviceCheckDetailItemServiceImpl extends ServiceImpl<DeviceCheckDet
return list;
}
@Override
@Transactional
public void finish(DeviceCheckDetailItemFinishParam param, AuthAdmin user) {

@ -25,6 +25,7 @@ import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.List;
@ -37,9 +38,12 @@ import java.util.List;
public class DeviceCheckDetailServiceImpl extends ServiceImpl<DeviceCheckDetailMapper, DeviceCheckDetailEntity>
implements DeviceCheckDetailService {
final DeviceCheckService deviceCheckService;
final DeviceInfoService deviceInfoService;
final DeviceRepairService deviceRepairService;
@Resource
DeviceCheckService deviceCheckService;
@Resource
DeviceInfoService deviceInfoService;
@Resource
DeviceRepairService deviceRepairService;
@Override
public List<DeviceCheckDetailEntity> pageList(DeviceCheckDetailQuery query) {

@ -23,6 +23,7 @@ public class DeviceCheckItemDictServiceImpl extends CustomServiceImpl<DeviceChec
public List<DeviceCheckItemDictEntity> pageList(DeviceCheckItemDictQuery query) {
PageHelper.startPage(query.getPage(), query.getLimit());
List<DeviceCheckItemDictEntity> list = super.list(Wrappers.lambdaQuery(DeviceCheckItemDictEntity.class)
.eq(query.getType().toString() != null, DeviceCheckItemDictEntity::getType, query.getType())
.like(StrUtil.isNotBlank(query.getCode()), DeviceCheckItemDictEntity::getCode, query.getCode())
.like(StrUtil.isNotBlank(query.getName()), DeviceCheckItemDictEntity::getName, query.getName())
.orderByDesc(DeviceCheckItemDictEntity::getCreateTime)

@ -16,7 +16,6 @@ import com.glxp.api.util.SnowflakeUtil;
import com.glxp.api.vo.dev.DeviceCheckPrintVo;
import com.glxp.api.vo.dev.DeviceCheckPrintVo.DetailVo;
import com.glxp.api.vo.dev.DeviceCheckVo;
//import com.glxp.api.vo.dev.DevicePlanDetailVo;
import com.glxp.api.vo.dev.DevicePlanDetailVo;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
@ -95,7 +94,7 @@ public class DeviceCheckServiceImpl extends ServiceImpl<DeviceCheckMapper, Devic
if (CollectionUtil.isEmpty(items)) {
items = new ArrayList<>();
}
List<DevicePlanDetailItemEntity> productItems = finalItemMap.get(d.getProductId() + "_");
List<DevicePlanDetailItemEntity> productItems = finalItemMap.get(d.getProductId() + "_" );
if (CollectionUtil.isNotEmpty(productItems)) {
items.addAll(productItems);
}
@ -107,6 +106,7 @@ public class DeviceCheckServiceImpl extends ServiceImpl<DeviceCheckMapper, Devic
.build();
BeanUtil.copyProperties(d, detailEntity);
boolean opened = deviceInfoService.openCheckLock(d.getDeviceCode(), d.getDeptCode());
if (opened) {
items.forEach(item -> {
DeviceCheckDetailItemEntity deviceCheckDetailItem = DeviceCheckDetailItemEntity.builder()
@ -134,9 +134,11 @@ public class DeviceCheckServiceImpl extends ServiceImpl<DeviceCheckMapper, Devic
deviceCheckDetailService.saveBatch(checkDetailList);
if (CollectionUtil.isNotEmpty(checkDetailItemList)) {
deviceCheckDetailItemService.saveBatch(checkDetailItemList);
}else {
throw new JsonException(String.format("没有配置巡检项目,无法生成巡检单"));
}
} else {
throw new JsonException(String.format("没有配置巡检项目 或者 没有找到处于[%s]状态的设备,无法生成巡检单", DeviceStatusEnum.NORMAL.getDesc()));
throw new JsonException(String.format("没有找到处于[%s]状态的设备,无法生成巡检单", DeviceStatusEnum.NORMAL.getDesc()));
}
}

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save