更新

dev-allot/src/main/java/com/tykj/dev/device/allot/subject/domin/AllotBackBill.java

@@ -28,6 +28,7 @@ public class AllotBackBill {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @ApiModelProperty(name = "主键id")
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
     private Integer id;
 
     @ApiModelProperty(name = "配发单主键id")
@@ -60,21 +61,21 @@ public class AllotBackBill {
     @ApiModelProperty(value = "出库附件文件名")
     private String fileName;
 
-    @Column(columnDefinition = "TEXT")
+    @Column(name = "file_url",columnDefinition = "TEXT")
     @ApiModelProperty(value = "出库附件文件地址URL")
     private String fileUrl;
 
     @ApiModelProperty(value = "入库附件文件名")
     private String receiveFileName;
 
-    @Column(columnDefinition = "TEXT")
+    @Column(name = "receive_file_url",columnDefinition = "TEXT")
     @ApiModelProperty(value = "入库附件文件地址URL")
     private String receiveFileUrl;
 
     @ApiModelProperty(value = "账单文件名")
     private String billFileName;
 
-    @Column(columnDefinition = "TEXT")
+    @Column(name = "bill_file_url",columnDefinition = "TEXT")
     @ApiModelProperty(value = "账单文件地址URL")
     private String billFileUrl;
 
@@ -106,14 +107,14 @@ public class AllotBackBill {
     @ApiModelProperty(value = "已接收装备数量")
     private Integer receiveCount;
 
-    @Column(columnDefinition = "TEXT")
+    @Column(name = "back_check_detail",columnDefinition = "TEXT")
     @ApiModelProperty(value = "退回出库检查详情(装备主键id+核对结果(0缺失1无误3不匹配,字符x作为分隔符)),例如10x21x32,意为主键id为1的装备缺失,为2的无误,为3的不匹配")
     private String backCheckDetail;
 
     @ApiModelProperty(value = "退回出库检查结果")
     private String backCheckResult;
 
-    @Column(columnDefinition = "TEXT")
+    @Column(name = "receive_check_detail",columnDefinition = "TEXT")
     @ApiModelProperty(value = "退回接收方检查详情(装备主键id+核对结果(0缺失1无误3不匹配,字符x作为分隔符)),例如10x21x32,意为主键id为1的装备缺失,为2的无误,为3的不匹配")
     private String receiveCheckDetail;
 

dev-allot/src/main/java/com/tykj/dev/device/allot/subject/domin/AllotBill.java

@@ -36,6 +36,7 @@ public class AllotBill {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @ApiModelProperty(name = "主键id")
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
     private Integer id;
     /**
      * 配发标题
@@ -110,7 +111,7 @@ public class AllotBill {
     /**
      * 出库附件文件地址URL
      */
-    @Column(columnDefinition = "TEXT")
+    @Column(name = "file_url",columnDefinition = "TEXT")
     @ApiModelProperty(value = "出库附件文件地址URL")
     private String fileUrl;
     /**
@@ -121,7 +122,7 @@ public class AllotBill {
     /**
      * 入库附件文件地址URL
      */
-    @Column(columnDefinition = "TEXT")
+    @Column(name = "receive_file_url",columnDefinition = "TEXT")
     @ApiModelProperty(value = "入库附件文件地址URL")
     private String receiveFileUrl;
     /**
@@ -132,7 +133,7 @@ public class AllotBill {
     /**
      * 账单文件地址URL
      */
-    @Column(columnDefinition = "TEXT")
+    @Column(name = "bill_file_url",columnDefinition = "TEXT")
     @ApiModelProperty(value = "账单文件地址URL")
     private String billFileUrl;
     /**
@@ -182,7 +183,7 @@ public class AllotBill {
     /**
      * 配发出库检查详情(装备主键id+核对结果(0缺失1无误3不匹配,字符x作为分隔符)),例如10x21x32,意为主键id为1的装备缺失,为2的无误,为3的不匹配
      */
-    @Column(columnDefinition = "TEXT")
+    @Column(name = "allot_check_detail",columnDefinition = "TEXT")
     @ApiModelProperty(value = "配发出库检查详情(装备主键id+核对结果(0缺失1无误3不匹配,字符x作为分隔符)),例如10x21x32,意为主键id为1的装备缺失,为2的无误,为3的不匹配")
     private String allotCheckDetail;
     /**
@@ -193,7 +194,7 @@ public class AllotBill {
     /**
      * 配发接收方检查详情(装备主键id+核对结果(0缺失1无误3不匹配,字符x作为分隔符)),例如10x21x32,意为主键id为1的装备缺失,为2的无误,为3的不匹配
      */
-    @Column(columnDefinition = "TEXT")
+    @Column(name = "receive_check_detail",columnDefinition = "TEXT")
     @ApiModelProperty(value = "配发接收方检查详情(装备主键id+核对结果(0缺失1无误3不匹配,字符x作为分隔符)),例如10x21x32,意为主键id为1的装备缺失,为2的无误,为3的不匹配")
     private String receiveCheckDetail;
     /**

dev-apply/src/main/java/com/tykj/dev/device/apply/subject/domin/DeviceApplyBill.java

@@ -32,6 +32,7 @@ public class DeviceApplyBill {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @ApiModelProperty(name = "主键id")
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
     private Integer id;
     /**
      * 申请文号
@@ -81,7 +82,7 @@ public class DeviceApplyBill {
     /**
      * 列装库主键idx数量(,作为分隔符),例如1x2,2x3,意为列装库id为1的申请2件,id为2的申请3件
      */
-    @Column(columnDefinition = "TEXT")
+    @Column(name = "apply_detail",columnDefinition = "TEXT")
     @ApiModelProperty(value = "列装库主键idx数量(,作为分隔符),例如1x2,2x3,意为列装库id为1的申请2件,id为2的申请3件")
     private String applyDetail;
     /**

dev-config/src/main/java/com/tykj/dev/config/LogType.java

@@ -64,7 +64,7 @@ public enum LogType {
 
     APPLY_3(23,APPLY.id, DEVICE_APPLY_CONFIRM.id, ARCHIVE.id, "装备申请批复驳回"),
 
-    DESTROY_1(24,DESTROY.id, ORIGIN_STATUS.id, DESTROY_BUSINESS_NEED_CONFIRM.id, "发起销毁"),
+    DESTROY_1(24,DESTROY.id, ORIGIN_STATUS.id, WAIT_UPLOAD_BILL_FILE.id, "发起销毁"),
 
     DESTROY_3(26,DESTROY.id, DESTROY_BUSINESS_NEED_CONFIRM.id, ARCHIVE.id, "销毁出库审核失败"),
 

dev-config/src/main/java/com/tykj/dev/config/domin/SystemVariable.java

@@ -19,6 +19,7 @@ public class SystemVariable {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @ApiModelProperty(name = "主键id")
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
     private Integer id;
 
     @ApiModelProperty(value = "变量名")

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/entity/domain/DeviceCheckStat.java

@@ -52,7 +52,7 @@ public class DeviceCheckStat extends BaseEntity {
     /**
      * 统计信息以JSON形式存储
      */
-    @Column(columnDefinition="TEXT")
+    @Column(name = "stat_info",columnDefinition="TEXT")
     private String statInfo;
 
     /**

dev-destroy/src/main/java/com/tykj/dev/device/destroy/controller/DeviceDestroyController.java

@@ -85,12 +85,19 @@ public class DeviceDestroyController {
     @ApiOperation(value = "提交销毁表单", notes = "可以通过这个接口提交销毁表单发起销毁流程")
     @PostMapping(value = "/form")
     @Transactional(rollbackFor = Exception.class)
-    public ResponseEntity selectRepairBill(@Validated @RequestBody DeviceDestroyFormVo formVo) {
+    public ResponseEntity selectRepairBill(@Validated @RequestBody DeviceDestroyFormVo formVo) throws ParseException {
         //生成销毁账单
         User currentUserInfo = AuthenticationUtils.getAuthentication().getCurrentUserInfo();
         DeviceDestroyBill destroyBill = DeviceDestroyBill.formVoToBill(formVo, currentUserInfo);
+        //更改账单状态
+        destroyBill.setDestroyStatus(DestroyStatus.CONFIRM_SUCCESS.getStatus());
+        //设置销毁时间
+        destroyBill.setDestroyTime(new Date());
         //保存销毁账单
         DeviceDestroyBill deviceDestroyBillEntitySaved = deviceDestroyBillService.addEntity(destroyBill);
+        //为账单新增文号
+        deviceDestroyBillEntitySaved.setDocNumber(this.deviceDestroyBillService.getNewDocNumber());
+        deviceDestroyBillService.updateEntity(deviceDestroyBillEntitySaved);
         //生成日志所需的文件列表
         ArrayList<FileVo> billList = ListUtil.createList(
                 new FileVo("出库确认单", deviceDestroyBillEntitySaved.getFileName(), deviceDestroyBillEntitySaved.getFileUrl())
@@ -99,10 +106,12 @@ public class DeviceDestroyController {
         formVo.getDevices().forEach(d -> {
             deviceLogService.addLog(new DeviceLogDto(d, "发起销毁", billList));
         });
-        //生成销毁审核任务
+        //更改对应装备的状态为销毁
+        handleDeviceDetail(deviceDestroyBillEntitySaved, null, 0);
+        //生成上传销毁单任务
         TaskBto task = taskService.start(initTaskBto(deviceDestroyBillEntitySaved));
         myWebSocket.sendMessage1();
-        return ResultUtil.success(task.getBillId());
+        return ResponseEntity.ok(deviceDestroyBillEntitySaved.getId());
     }
 
     @ApiOperation(value = "查询可销毁装备列表", notes = "通过这个接口查询可销毁装备接口")
@@ -258,7 +267,7 @@ public class DeviceDestroyController {
 
         //生成Task
         TaskBto taskBto = new TaskBto(
-                StatusEnum.DESTROY_BUSINESS_NEED_CONFIRM.id,
+                StatusEnum.WAIT_UPLOAD_BILL_FILE.id,
                 "销毁业务",
                 0,
                 ".",
@@ -267,7 +276,7 @@ public class DeviceDestroyController {
                 userUtils.getCurrentUnitId(),
                 1,
                 "",
-                ListUtil.createList(destroyBill.getStartUserAId(), destroyBill.getStartUserBId()));
+                ListUtil.createList(destroyBill.getStartUserAId(), destroyBill.getStartUserAId()));
         return taskBto;
     }
 

dev-destroy/src/main/java/com/tykj/dev/device/destroy/entity/domain/DeviceDestroyBill.java

@@ -43,6 +43,7 @@ public class DeviceDestroyBill {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @ApiModelProperty(name = "主键id")
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
     private Integer id;
     /**
      * 发起销毁业务经办人id(A岗)
@@ -67,7 +68,7 @@ public class DeviceDestroyBill {
     /**
      * 出库附件文件地址URL
      */
-    @Column(columnDefinition = "TEXT")
+    @Column(name = "file_url",columnDefinition = "TEXT")
     @ApiModelProperty(value = "出库附件文件地址URL")
     private String fileUrl;
     /**
@@ -78,13 +79,13 @@ public class DeviceDestroyBill {
     /**
      * 出库附件文件地址URL
      */
-    @Column(columnDefinition = "TEXT")
+    @Column(name = "destroy_file_url",columnDefinition = "TEXT")
     @ApiModelProperty(value = "销毁附件文件地址URL")
     private String destroyFileUrl;
     /**
      * 装备销毁出库详情(装备主键id+核对结果(0缺失1无误2新增,字符x作为分隔符)),例如10x21x32,意为主键id为1的装备缺失,为2的无误,为3的新增
      */
-    @Column(columnDefinition = "TEXT")
+    @Column(name = "destroy_device_detail",columnDefinition = "TEXT")
     @ApiModelProperty(value = "装备销毁出库详情(装备主键id+核对结果(0缺失1无误2新增,字符x作为分隔符)),例如10x21x32,意为主键id为1的装备缺失,为2的无误,为3的新增")
     private String destroyDeviceDetail;
     /**

dev-destroy/src/main/java/com/tykj/dev/device/destroy/entity/vo/DeviceDestroyFormVo.java

@@ -16,7 +16,7 @@ import java.util.List;
 @Data
 public class DeviceDestroyFormVo {
 
-    @NotNull(message = "confirmUserId不能为空")
+//    @NotNull(message = "confirmUserId不能为空")
     @ApiModelProperty(value = "待审核人ID", example = "1")
     private Integer confirmUserId;
 

dev-library/src/main/java/com/tykj/dev/device/library/subject/domin/DeviceChange.java

@@ -24,6 +24,7 @@ public class DeviceChange {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @ApiModelProperty(name = "主键id")
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
     private Integer id;
 
     @ApiModelProperty(name = "旧装备id")

dev-library/src/main/java/com/tykj/dev/device/library/subject/domin/DeviceLibrary.java

@@ -34,6 +34,7 @@ public class DeviceLibrary {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @ApiModelProperty(name = "主键id")
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
     private Integer id;
     /**
      * 入库单id
@@ -143,7 +144,7 @@ public class DeviceLibrary {
     /**
      * 图片url地址
      */
-    @Column(columnDefinition = "TEXT")
+    @Column(name = "image_url",columnDefinition = "TEXT")
     @ApiModelProperty(value = "图片url地址")
     private String imageUrl;
     /**

dev-library/src/main/java/com/tykj/dev/device/library/subject/domin/DeviceLog.java

@@ -38,6 +38,7 @@ public class DeviceLog {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @ApiModelProperty(name = "主键id")
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
     private Integer id;
     /**
      * 日志类型(默认0为装备日志,1为设备日志)
@@ -57,7 +58,7 @@ public class DeviceLog {
     /**
      * 相关附件信息(Ǵ作为每个附件分隔符,Ǒ作为附件内部分隔符,例如name1Ǒurl1Ǒ配发单Ǵname2Ǒurl2Ǒ入库确认单Ǵ)
      */
-    @Column(columnDefinition = "TEXT")
+    @Column(name = "file_detail",columnDefinition = "TEXT")
     @ApiModelProperty(value = "相关附件信息(Ǵ作为每个附件分隔符,Ǒ作为附件内部分隔符,例如name1Ǒurl1Ǒ配发单Ǵname2Ǒurl2Ǒ入库确认单Ǵ)")
     private String fileDetail;
     /**

dev-matching/src/main/java/com/tykj/dev/device/matching/subject/domin/MatchingDeviceBill.java

@@ -32,6 +32,7 @@ public class MatchingDeviceBill {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @ApiModelProperty(name = "主键id")
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
     private Integer id;
     /**
      * 发起人id
@@ -46,7 +47,7 @@ public class MatchingDeviceBill {
     /**
      * 设备主键id以x拼接
      */
-    @Column(columnDefinition = "TEXT")
+    @Column(name = "device_detail",columnDefinition = "TEXT")
     @ApiModelProperty(value = "设备主键id以x拼接")
     private String deviceDetail;
     /**
@@ -62,7 +63,7 @@ public class MatchingDeviceBill {
     /**
      * 附件url地址
      */
-    @Column(columnDefinition = "TEXT")
+    @Column(name = "file_url",columnDefinition = "TEXT")
     @ApiModelProperty(value = "附件url地址")
     private String fileUrl;
     /**

dev-matching/src/main/java/com/tykj/dev/device/matching/subject/domin/MatchingDeviceLibrary.java

@@ -32,6 +32,7 @@ public class MatchingDeviceLibrary {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @ApiModelProperty(name = "主键id")
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
     private Integer id;
     /**
      * 绑定装备的主键id

dev-matching/src/main/java/com/tykj/dev/device/matching/subject/domin/MatchingRepairBill.java

@@ -28,6 +28,7 @@ public class MatchingRepairBill {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @ApiModelProperty(name = "主键id")
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
     private Integer id;
 
     @ApiModelProperty(name = "配套设备id")
@@ -39,7 +40,7 @@ public class MatchingRepairBill {
     @ApiModelProperty(name = "维修单名字")
     private String fileName;
 
-    @Column(columnDefinition = "TEXT")
+    @Column(name = "file_url",columnDefinition = "TEXT")
     @ApiModelProperty(name = "维修单URL")
     private String fileUrl;
 

dev-misc/src/main/java/com/tykj/dev/misc/base/BaseEntity.java

@@ -10,10 +10,7 @@ import org.springframework.data.annotation.LastModifiedBy;
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
-import javax.persistence.EntityListeners;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.MappedSuperclass;
+import javax.persistence.*;
 import java.time.LocalDateTime;
 
 /**
@@ -36,6 +33,7 @@ public class BaseEntity {
      */
     @Id
     @GeneratedValue
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
     private Integer id;
 
     /**

dev-misc/src/main/java/com/tykj/dev/misc/base/BaseEntityNoDelete.java

@@ -3,17 +3,13 @@ package com.tykj.dev.misc.base;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.hibernate.annotations.Where;
 import org.springframework.data.annotation.CreatedBy;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedBy;
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
-import javax.persistence.EntityListeners;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.MappedSuperclass;
+import javax.persistence.*;
 import java.time.LocalDateTime;
 
 /**
@@ -34,6 +30,7 @@ public class BaseEntityNoDelete {
      */
     @Id
     @GeneratedValue
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
     private Integer id;
 
     /**

dev-packing/src/main/java/com/tykj/dev/device/packing/subject/domin/PackingLibrary.java

@@ -36,6 +36,7 @@ public class PackingLibrary {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @ApiModelProperty(value = "主键id")
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
     private Integer id;
     /**
      * 经办人省A岗id
@@ -139,7 +140,7 @@ public class PackingLibrary {
     /**
      * 图片url地址
      */
-    @Column(columnDefinition = "TEXT")
+    @Column(name = "image_url",columnDefinition = "TEXT")
     @ApiModelProperty(value = "图片url地址")
     private String imageUrl;
     /**
@@ -150,7 +151,7 @@ public class PackingLibrary {
     /**
      * 附件url地址
      */
-    @Column(columnDefinition = "TEXT")
+    @Column(name = "file_url",columnDefinition = "TEXT")
     @ApiModelProperty(value = "附件url地址")
     private String fileUrl;
     /**

dev-repair/src/main/java/com/tykj/dev/device/repair/subject/domin/RepairBackBill.java

@@ -32,6 +32,7 @@ public class RepairBackBill {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @ApiModelProperty(name = "主键id")
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
     private Integer id;
     /**
      * 维修退回标题
@@ -101,7 +102,7 @@ public class RepairBackBill {
     /**
      * 出库附件文件地址URL
      */
-    @Column(columnDefinition = "TEXT")
+    @Column(name = "file_url",columnDefinition = "TEXT")
     @ApiModelProperty(value = "出库附件文件地址URL")
     private String fileUrl;
     /**
@@ -112,7 +113,7 @@ public class RepairBackBill {
     /**
      * 入库附件文件地址URL
      */
-    @Column(columnDefinition = "TEXT")
+    @Column(name = "receive_file_url",columnDefinition = "TEXT")
     @ApiModelProperty(value = "入库附件文件地址URL")
     private String receiveFileUrl;
     /**
@@ -123,7 +124,7 @@ public class RepairBackBill {
     /**
      * 账单文件地址URL
      */
-    @Column(columnDefinition = "TEXT")
+    @Column(name = "bill_file_url",columnDefinition = "TEXT")
     @ApiModelProperty(value = "账单文件地址URL")
     private String billFileUrl;
     /**
@@ -149,7 +150,7 @@ public class RepairBackBill {
     /**
      * 维修完成出库详情(装备主键id+核对结果(0缺失1无误3不匹配,字符x作为分隔符)),例如10x21x32,意为主键id为1的装备缺失,为2的无误,为3的不匹配
      */
-    @Column(columnDefinition = "TEXT")
+    @Column(name = "back_check_detail",columnDefinition = "TEXT")
     @ApiModelProperty(value = "维修完成出库详情(装备主键id+核对结果(0缺失1无误3不匹配,字符x作为分隔符)),例如10x21x32,意为主键id为1的装备缺失,为2的无误,为3的不匹配")
     private String backCheckDetail;
     /**
@@ -160,7 +161,7 @@ public class RepairBackBill {
     /**
      * 维修完成接收入库详情(装备主键id+核对结果(0缺失1无误3不匹配,字符x作为分隔符)),例如10x21x32,意为主键id为1的装备缺失,为2的无误,为3的不匹配
      */
-    @Column(columnDefinition = "TEXT")
+    @Column(name = "back_recive_check_detail",columnDefinition = "TEXT")
     @ApiModelProperty(value = "维修完成接收入库详情(装备主键id+核对结果(0缺失1无误3不匹配,字符x作为分隔符)),例如10x21x32,意为主键id为1的装备缺失,为2的无误,为3的不匹配")
     private String backReciveCheckDetail;
     /**

dev-repair/src/main/java/com/tykj/dev/device/repair/subject/domin/RepairBill.java

@@ -32,6 +32,7 @@ public class RepairBill {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @ApiModelProperty(name = "主键id")
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
     private Integer id;
     /**
      * 申请文号

dev-repair/src/main/java/com/tykj/dev/device/repair/subject/domin/RepairDetail.java

@@ -32,6 +32,7 @@ public class RepairDetail {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @ApiModelProperty(name = "主键id")
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
     private Integer id;
 
     @ApiModelProperty(name = "父id")

dev-repair/src/main/java/com/tykj/dev/device/repair/subject/domin/RepairSendBill.java

@@ -31,6 +31,7 @@ public class RepairSendBill {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @ApiModelProperty(name = "主键id")
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
     private Integer id;
     /**
      * 维修标题
@@ -99,13 +100,13 @@ public class RepairSendBill {
     @ApiModelProperty(value = "维修状态(0:维修任务待审核,1:维修任务审核失败,2:维修装备送到上级中,3:上级接收维修装备待审核,4:上级接收维修装备审核失败,5:维修中,6:维修完成退回中,7:维修完成)")
     private Integer repairStatus;
 
-    @Column(columnDefinition = "TEXT")
+    @Column(name = "repair_device_detail",columnDefinition = "TEXT")
     @ApiModelProperty(value = "Ǵ作为分隔符,维修装备的主键id加备注,例如x1Ǵ备注1Ǵx2Ǵ备注2Ǵx,意为id为1的装备在维修，备注为备注1,id为2的装备在维修，备注为备注2")
     private String repairDeviceDetail;
     /**
      * 送修装备出库详情(装备主键id+核对结果(0缺失1无误3不匹配,字符x作为分隔符)),例如10x21x32,意为主键id为1的装备缺失,为2的无误,为3的不匹配
      */
-    @Column(columnDefinition = "TEXT")
+    @Column(name = "repair_device_check_detail",columnDefinition = "TEXT")
     @ApiModelProperty(value = "送修装备出库详情(装备主键id+核对结果(0缺失1无误3不匹配,字符x作为分隔符)),例如10x21x32,意为主键id为1的装备缺失,为2的无误,为3的不匹配")
     private String repairDeviceCheckDetail;
     /**
@@ -116,7 +117,7 @@ public class RepairSendBill {
     /**
      * 送修装备接收入库详情(装备主键id+核对结果(0缺失1无误3不匹配,字符x作为分隔符)),例如10x21x32,意为主键id为1的装备缺失,为2的无误,为3的不匹配
      */
-    @Column(columnDefinition = "TEXT")
+    @Column(name = "repair_recive_check_detail",columnDefinition = "TEXT")
     @ApiModelProperty(value = "送修装备接收入库详情(装备主键id+核对结果(0缺失1无误3不匹配,字符x作为分隔符)),例如10x21x32,意为主键id为1的装备缺失,为2的无误,为3的不匹配")
     private String repairReciveCheckDetail;
     /**
@@ -132,7 +133,7 @@ public class RepairSendBill {
     /**
      * 出库附件文件地址URL
      */
-    @Column(columnDefinition = "TEXT")
+    @Column(name = "file_url",columnDefinition = "TEXT")
     @ApiModelProperty(value = "出库附件文件地址URL")
     private String fileUrl;
     /**
@@ -143,7 +144,7 @@ public class RepairSendBill {
     /**
      * 入库附件文件地址URL
      */
-    @Column(columnDefinition = "TEXT")
+    @Column(name = "receive_file_url",columnDefinition = "TEXT")
     @ApiModelProperty(value = "入库附件文件地址URL")
     private String receiveFileUrl;
     /**
@@ -154,7 +155,7 @@ public class RepairSendBill {
     /**
      * 账单文件地址URL
      */
-    @Column(columnDefinition = "TEXT")
+    @Column(name = "bill_file_url",columnDefinition = "TEXT")
     @ApiModelProperty(value = "账单文件地址URL")
     private String billFileUrl;
     /**

dev-retired/src/main/java/com/tykj/dev/device/retired/entity/domain/DeviceRetiredBill.java

@@ -42,6 +42,7 @@ public class DeviceRetiredBill {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @ApiModelProperty(name = "主键id")
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
     private Integer id;
     /**
      * 省A岗id
@@ -61,7 +62,7 @@ public class DeviceRetiredBill {
     /**
      * 列装库主键id(x作为分隔符)，例如1x2,意为列装库id为1和2的退装
      */
-    @Column(columnDefinition = "TEXT")
+    @Column(name = "retired_detail",columnDefinition = "TEXT")
     @ApiModelProperty(value = "列装库主键id(x作为分隔符)，例如x1x2,意为列装库id为1和2的退装")
     private String retiredDetail;
     /**

dev-rfid/src/main/java/com/tykj/dev/rfid/entity/domin/AccessControlName.java

@@ -3,8 +3,6 @@ package com.tykj.dev.rfid.entity.domin;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.hibernate.annotations.SQLDelete;
-import org.hibernate.annotations.Where;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 import javax.persistence.*;
@@ -20,6 +18,7 @@ public class AccessControlName {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @ApiModelProperty(name = "主键id")
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
     private Integer id;
 
     @ApiModelProperty(value = "门禁名称")

dev-rfid/src/main/java/com/tykj/dev/rfid/entity/domin/InputOutputDevice.java

@@ -29,6 +29,7 @@ public class InputOutputDevice {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @ApiModelProperty(name = "主键id")
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
     private Integer id;
 
     /**

dev-rfid/src/main/java/com/tykj/dev/rfid/entity/domin/InventoryTime.java

@@ -32,6 +32,7 @@ public class InventoryTime {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @ApiModelProperty(name = "主键id")
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
     private Integer id;
 
     @ApiModelProperty(value = "盘存时间")

dev-rfid/src/main/java/com/tykj/dev/rfid/entity/domin/LibraryWarningLog.java

@@ -30,6 +30,7 @@ public class LibraryWarningLog {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @ApiModelProperty(name = "主键id")
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
     private Integer id;
     /**
      * 告警单位

dev-rfid/src/main/java/com/tykj/dev/rfid/entity/domin/LibraryWarningLogDetail.java

@@ -36,6 +36,7 @@ public class LibraryWarningLogDetail {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @ApiModelProperty(name = "主键id")
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
     private Integer id;
     /**
      * 告警日志ID

dev-rfid/src/main/java/com/tykj/dev/rfid/entity/domin/RfidChangeBill.java

@@ -42,6 +42,7 @@ public class RfidChangeBill {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @ApiModelProperty(name = "主键id")
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
     private Integer id;
     /**
      * 经办人id(A岗)
@@ -100,7 +101,7 @@ public class RfidChangeBill {
     /**
      * 附件文件地址URL
      */
-    @Column(columnDefinition = "TEXT")
+    @Column(name = "file_url",columnDefinition = "TEXT")
     @ApiModelProperty(value = "附件文件地址URL")
     private String fileUrl;
 

dev-rfid/src/main/java/com/tykj/dev/rfid/entity/domin/RfidChangeLog.java

@@ -39,6 +39,7 @@ public class RfidChangeLog {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @ApiModelProperty(name = "主键id")
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
     private Integer id;
     /**
      * 对应装备IDid

dev-scrap/src/main/java/com/tykj/dev/device/scrap/controller/DeviceScrapController.java

@@ -108,7 +108,7 @@ public class DeviceScrapController {
             DeviceLogDto deviceLogDto = new DeviceLogDto(id,"发起报废",null);
             deviceLogService.addLog(deviceLogDto);
         }
-        return ResponseEntity.ok("发起报废成功");
+        return ResponseEntity.ok(taskBto.getBillId());
     }
 
     @ApiOperation(value = "上传报废单", notes = "上传报废单")

dev-scrap/src/main/java/com/tykj/dev/device/scrap/subject/domin/ScrapBill.java

@@ -32,6 +32,7 @@ public class ScrapBill {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @ApiModelProperty(name = "主键id")
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
     private Integer id;
 
     @ApiModelProperty(value = "维修单id")
@@ -61,19 +62,19 @@ public class ScrapBill {
     @ApiModelProperty(value = "报废单文件名")
     private String fileName;
 
-    @Column(columnDefinition = "TEXT")
+    @Column(name = "file_url",columnDefinition = "TEXT")
     @ApiModelProperty(value = "报废单文件URL")
     private String fileUrl;
 
-    @Column(columnDefinition = "TEXT")
+    @Column(name = "scrap_detail",columnDefinition = "TEXT")
     @ApiModelProperty(value = "报废装备主键Id以x拼接")
     private String scrapDetail;
 
-    @Column(columnDefinition = "TEXT")
+    @Column(name = "models",columnDefinition = "TEXT")
     @ApiModelProperty(value = "报废型号，以,拼接")
     private String models;
 
-    @Column(columnDefinition = "TEXT")
+    @Column(name = "names",columnDefinition = "TEXT")
     @ApiModelProperty(value = "报废名称，以,拼接")
     private String names;
 

dev-selfcheck/src/main/java/com/tykj/dev/device/selfcheck/subject/domin/SelfCheckBill.java

@@ -32,6 +32,7 @@ public class SelfCheckBill {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @ApiModelProperty(name = "主键id")
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
     private Integer id;
     /**
      * 自查周期(1:月度,2:季度,3:年度,0:未设定周期)
@@ -81,7 +82,7 @@ public class SelfCheckBill {
     /**
      * 自查详情(装备主键id+核对结果(0缺失1无误2新增,字符x作为分隔符)),例如10x21x32,意为主键id为1的装备缺失,为2的无误,为3的新增
      */
-    @Column(columnDefinition = "TEXT")
+    @Column(name = "check_detail",columnDefinition = "TEXT")
     @ApiModelProperty(value = "自查详情(装备主键id+核对结果(0缺失1无误2新增,字符x作为分隔符)),例如10x21x32,意为主键id为1的装备缺失,为2的无误,为3的新增")
     private String checkDetail;
     /**
@@ -126,7 +127,7 @@ public class SelfCheckBill {
     /**
      * 自查未入库新增装备详情(RFID卡号以.为分隔符)
      */
-    @Column(columnDefinition = "TEXT")
+    @Column(name = "new_device_detail",columnDefinition = "TEXT")
     @ApiModelProperty(value = "自查未入库新增装备详情(RFID卡号以.为分隔符)")
     private String newDeviceDetail;
 

dev-sendback/src/main/java/com/tykj/dev/device/sendback/entity/domain/DeviceRepel.java

@@ -6,7 +6,6 @@ import com.tykj.dev.misc.base.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.SQLDelete;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
@@ -32,6 +31,7 @@ public class DeviceRepel extends BaseEntity {
      */
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
     private Integer id;
 
     /**
@@ -64,7 +64,7 @@ public class DeviceRepel extends BaseEntity {
      *
      */
     @ApiModelProperty(value = "正文")
-    @Column(columnDefinition = "TEXT")
+    @Column(name = "files",columnDefinition = "TEXT")
     private String files;
 
 

dev-sendback/src/main/java/com/tykj/dev/device/sendback/entity/domain/DeviceRepelDetail.java

@@ -32,6 +32,7 @@ public class DeviceRepelDetail extends BaseEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @ApiModelProperty(name = "主键id")
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
     private Integer id;
 
     /**

dev-sendback/src/main/java/com/tykj/dev/device/sendback/entity/domain/RepelDeviceUnit.java

@@ -24,6 +24,7 @@ import javax.persistence.*;
 public class RepelDeviceUnit {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
     private Integer id;
 
     private Integer deviceId;

dev-sendback/src/main/java/com/tykj/dev/device/sendback/entity/domain/RepelTaskStatistical.java

 package com.tykj.dev.device.sendback.entity.domain;
 
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.tykj.dev.device.sendback.entity.vo.ModelCount;
 import com.tykj.dev.misc.base.BaseEntity;
-import com.tykj.dev.misc.utils.JacksonUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -11,10 +9,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.Id;
-import javax.persistence.Transient;
+import javax.persistence.*;
 import java.util.List;
 
 /**
@@ -36,6 +31,7 @@ public class RepelTaskStatistical extends BaseEntity {
      */
     @Id
     @ApiModelProperty(value = "数据id")
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
     private  Integer id;
 
     /**

dev-sendback/src/main/java/com/tykj/dev/device/sendback/entity/domain/SendBackBill.java

@@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.checkerframework.checker.units.qual.A;
 import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.Where;
 import org.springframework.data.annotation.CreatedBy;
@@ -34,6 +33,7 @@ public class SendBackBill {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @ApiModelProperty(name = "主键id")
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
     private Integer id;
     /**
      * 清退标题

dev-sendback/src/main/java/com/tykj/dev/device/sendback/entity/domain/SendBackBillDetail.java

@@ -36,6 +36,7 @@ public class SendBackBillDetail {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @ApiModelProperty(name = "主键id")
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
     private Integer id;
     /**
      * 申请文号

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/RepelQueryServiceImpl.java

@@ -4,8 +4,6 @@ import com.tykj.dev.device.library.repository.DeviceLibraryDao;
 import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
 import com.tykj.dev.device.sendback.entity.domain.DeviceRepel;
 import com.tykj.dev.device.sendback.entity.domain.DeviceRepelDetail;
-import com.tykj.dev.device.sendback.entity.domain.RepelDeviceUnit;
-import com.tykj.dev.device.sendback.entity.domain.RepelTaskStatistical;
 import com.tykj.dev.device.sendback.entity.vo.DeviceChooseRepel;
 import com.tykj.dev.device.sendback.entity.vo.DirectlyUnderNavigation;
 import com.tykj.dev.device.sendback.entity.vo.RepelStatisticsVo;
@@ -16,7 +14,6 @@ import com.tykj.dev.device.task.subject.bto.TaskBto;
 import com.tykj.dev.device.user.subject.entity.Units;
 import com.tykj.dev.device.user.subject.service.UnitsService;
 import lombok.extern.slf4j.Slf4j;
-import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -98,7 +95,7 @@ public class RepelQueryServiceImpl implements RepelQueryService {
     @Override
     public List<DeviceLibrary> toRepelList(Integer unitId) {
         Units units=  unitsService.findById(unitId);
-        return deviceLibraryDao.findAllByOwnUnitAndLocationUnitAndLifeStatus(units.getName(),units.getName(),12);
+        return deviceLibraryDao.findAllByOwnUnitAndLocationUnitAndLifeStatus(units.getName(),units.getName(),15);
     }
 
     @Override

dev-storage/src/main/java/com/tykj/dev/device/storage/subject/domin/StorageBill.java

@@ -36,6 +36,7 @@ public class StorageBill {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @ApiModelProperty(name = "主键id")
+    @Column(name = "id",columnDefinition = "integer NOT NULL AUTO_INCREMENT")
     private Integer id;
     /**
      * 申请文号
@@ -89,7 +90,7 @@ public class StorageBill {
     /**
      * 账单文件地址URL
      */
-    @Column(columnDefinition = "TEXT")
+    @Column(name = "file_url",columnDefinition = "TEXT")
     @ApiModelProperty(value = "账单文件地址URL")
     private String fileUrl;
     /**
@@ -100,7 +101,7 @@ public class StorageBill {
     /**
      * 入库附件文件地址URL
      */
-    @Column(columnDefinition = "TEXT")
+    @Column(name = "receive_file_url",columnDefinition = "TEXT")
     @ApiModelProperty(value = "入库附件文件地址URL")
     private String receiveFileUrl;
     /**
@@ -116,7 +117,7 @@ public class StorageBill {
     /**
      * 入库详情(列装主键idx列装数量x装备主键id(字符,作为不同列装的分隔符)),例如1x2x3x4,2x1x5,意为列装库中id为1的入库2件(装备id分别为3，4),列装库中id为2的入库1件(装备id为5)
      */
-    @Column(columnDefinition = "TEXT")
+    @Column(name = "storage_detail",columnDefinition = "TEXT")
     @ApiModelProperty(value = "入库详情(装备主键id+核对结果(0缺失1无误2不匹配,字符x作为分隔符)),例如10x21x32,意为主键id为1的装备缺失,为2的无误,为3的不匹配")
     private String storageDetail;
     /**

dev-task/src/main/java/com/tykj/dev/device/task/subject/domin/Task.java

@@ -37,6 +37,7 @@ public class Task {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @ApiModelProperty(value = "主键id")
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
     private Integer id;
 
     @ApiModelProperty(value = "任务状态")
@@ -79,22 +80,22 @@ public class Task {
     @ApiModelProperty(value = "所属单位")
     private Integer ownUnit;
 
-    @Column(columnDefinition = "TEXT")
+    @Column(name = "top_flag_detail",columnDefinition = "TEXT")
     @ApiModelProperty(value = "用户置顶信息")
     private String topFlagDetail;
 
-    @Column(columnDefinition = "TEXT")
+    @Column(name = "user_read_detail",columnDefinition = "TEXT")
     @ApiModelProperty(value = "用户阅读信息")
     private String userReadDetail;
 
     @ApiModelProperty(value = "数字类型，用于代表指针目前的下标")
     private Integer currentPoint;
 
-    @Column(columnDefinition = "TEXT")
+    @Column(name = "custom_info",columnDefinition = "TEXT")
     @ApiModelProperty(value = "自定义信息，针对不同业务需要保存一些自定信息")
     private String customInfo;
 
-    @Column(columnDefinition = "TEXT")
+    @Column(name = "involve_users",columnDefinition = "TEXT")
     @ApiModelProperty(value = "工作涉及人员id(x作为分隔符),例如x1x2x,意为id为1,2的用户参与了该任务")
     private String involveUsers;
 

dev-task/src/main/java/com/tykj/dev/device/task/subject/domin/TaskLog.java

@@ -37,6 +37,7 @@ public class TaskLog {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @ApiModelProperty(name = "主键id")
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
     private Integer id;
     /**
      * 业务id
@@ -51,7 +52,7 @@ public class TaskLog {
     /**
      * 相关附件信息(Ǵ作为每个附件分隔符,Ǒ作为附件内部分隔符,例如name1Ǒurl1Ǒ配发单Ǵname2Ǒurl2Ǒ入库确认单Ǵ)
      */
-    @Column(columnDefinition = "TEXT")
+    @Column(name = "file_detail",columnDefinition = "TEXT")
     @ApiModelProperty(value = "相关附件信息(Ǵ作为每个附件分隔符,Ǒ作为附件内部分隔符,例如name1Ǒurl1Ǒ配发单Ǵname2Ǒurl2Ǒ入库确认单Ǵ)")
     private String fileDetail;
     /**

dev-train/src/main/java/com/tykj/dev/device/train/entity/TrainTheme.java

@@ -10,10 +10,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.modelmapper.ModelMapper;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import javax.persistence.*;
 import java.util.Date;
 
 /**
@@ -35,6 +32,7 @@ public class TrainTheme {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @ApiModelProperty(value = "培训id")
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
     private Integer trainId;
 
     /**

dev-train/src/main/java/com/tykj/dev/device/train/entity/TrainUser.java

@@ -28,6 +28,7 @@ public class TrainUser {
     @Id
     @ApiModelProperty(value = "数据ID", name = "id", example = "12321L")
     @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
     private Integer id;
 
     /**

dev-train/src/main/java/com/tykj/dev/device/train/entity/WorkHandover.java

@@ -10,10 +10,7 @@ import org.modelmapper.ModelMapper;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedDate;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import javax.persistence.*;
 
 /**
  * @author zjm
@@ -33,6 +30,7 @@ public class WorkHandover {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @ApiModelProperty(value = "工作交接id")
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
     private Integer workHandoverId;
 
     /**

dev-union/src/main/java/com/tykj/dev/union/LogAspect.java

@@ -390,7 +390,7 @@ public class LogAspect {
                 if (deviceDestroyBillService != null) {
                     DeviceDestroyBill deviceDestroyBill = deviceDestroyBillService.getOne(outPutTask.getBillId());
                     getFieldsParam(deviceDestroyBill);
-                    if ((this.oldStatus.equals(StatusEnum.ORIGIN_STATUS.id) && this.newStatus.equals(StatusEnum.DESTROY_BUSINESS_NEED_CONFIRM.id))) {
+                    if ((this.oldStatus.equals(StatusEnum.ORIGIN_STATUS.id) && this.newStatus.equals(StatusEnum.WAIT_UPLOAD_BILL_FILE.id))) {
                         this.fileVos.add(new FileVo("出库确认单", deviceDestroyBill.getFileName(), deviceDestroyBill.getFileUrl()));
                     }
                     if ((this.oldStatus.equals(StatusEnum.WAIT_UPLOAD_BILL_FILE.id) && this.newStatus.equals(StatusEnum.END.id))) {

dev-user/src/main/java/com/tykj/dev/device/user/subject/entity/Area.java

@@ -30,6 +30,7 @@ public class Area {
      */
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
     private Integer id;
 
     /**

dev-user/src/main/java/com/tykj/dev/device/user/subject/entity/Groups.java

@@ -5,6 +5,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Transient;
@@ -27,6 +28,7 @@ public class Groups {
      * 组id
      */
     @Id
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
     private Integer id;
 
     /**

dev-user/src/main/java/com/tykj/dev/device/user/subject/entity/Permissions.java

@@ -6,10 +6,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import javax.persistence.*;
 
 /**
  * @author zjm
@@ -30,6 +27,7 @@ public class Permissions {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @ApiModelProperty(value = "数据ID", name = "permissionsId", example = "12321L")
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
 //    @GeneratedValue(generator="UserIdentityGenerator",strategy = GenerationType.AUTO)
 //    @GenericGenerator(name = "UserIdentityGenerator", strategy = "UserIdentityGenerator")
     private Integer permissionsId;

dev-user/src/main/java/com/tykj/dev/device/user/subject/entity/Role.java

@@ -27,6 +27,7 @@ public class Role {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @ApiModelProperty(value = "数据ID", name = "roleId", example = "12321L")
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
 //    @GeneratedValue(generator="UserIdentityGenerator",strategy = GenerationType.AUTO)
 //    @GenericGenerator(name = "UserIdentityGenerator", strategy = "UserIdentityGenerator")
     private Integer roleId;

dev-user/src/main/java/com/tykj/dev/device/user/subject/entity/RolePermissions.java

@@ -6,10 +6,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import javax.persistence.*;
 
 /**
  * @author zjm
@@ -30,6 +27,7 @@ public class RolePermissions {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @ApiModelProperty(value = "数据ID", name = "rpId", example = "12321L")
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
 //    @GeneratedValue(generator="UserIdentityGenerator",strategy = GenerationType.AUTO)
 //    @GenericGenerator(name = "UserIdentityGenerator", strategy = "UserIdentityGenerator")
     private Integer rpId;

dev-user/src/main/java/com/tykj/dev/device/user/subject/entity/Units.java

@@ -33,6 +33,7 @@ public class Units {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @ApiModelProperty(value = "单位id", name = "unitId", example = "12321L")
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
 //    @GeneratedValue(generator="UserIdentityGenerator",strategy = GenerationType.AUTO)
 //    @GenericGenerator(name = "UserIdentityGenerator", strategy = "UserIdentityGenerator")
     private Integer unitId;

dev-user/src/main/java/com/tykj/dev/device/user/subject/entity/UserLog.java

@@ -6,10 +6,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import javax.persistence.*;
 import java.util.Date;
 
 /**
@@ -28,6 +25,7 @@ public class UserLog {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @ApiModelProperty(value = "id", name = "id")
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
     private Integer id;
     @ApiModelProperty(value = "用户id", name = "userId")
     private Integer userId;

dev-user/src/main/java/com/tykj/dev/device/user/subject/entity/UserRole.java

@@ -6,10 +6,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import javax.persistence.*;
 
 /**
  * @author zjm
@@ -30,6 +27,7 @@ public class UserRole {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @ApiModelProperty(value = "数据ID", name = "urId", example = "12321L")
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
 //    @GeneratedValue(generator="UserIdentityGenerator",strategy = GenerationType.AUTO)
 //    @GenericGenerator(name = "UserIdentityGenerator", strategy = "UserIdentityGenerator")
     private Integer urId;

dev-usereport/src/main/java/com/tykj/dev/device/usereport/subject/domin/DeviceUseReport.java

@@ -32,6 +32,7 @@ public class DeviceUseReport {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @ApiModelProperty(name = "主键id")
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
     private Integer id;
     /**
      * 报告标题