From 5d84340c79e7482cd572907d498858ddad0a8f65 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 13 九月 2024 10:46:50 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Loc.java | 8
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/StaType.java | 8
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Action.java | 64 ------------
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Route.java | 8
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Jam.java | 6
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Segment.java | 8
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/AgvSts.java | 8
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/AgvDetail.java | 8
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/StaSts.java | 8
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java | 8
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/AgvModel.java | 8
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/CodeGap.java | 4
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/TaskSts.java | 8
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/LocSts.java | 8
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/TaskType.java | 8
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Zone.java | 8
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Agv.java | 6
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Sta.java | 8
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/LocType.java | 8
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Code.java | 8
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Travel.java | 8
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Bus.java | 8
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/ActionType.java | 8
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/BusSts.java | 8
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/VehFaultRec.java | 6
zy-acs-manager/src/main/java/com/zy/acs/manager/common/CodeBuilder.java | 4
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/FuncSta.java | 6
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/ActionSts.java | 8
28 files changed, 103 insertions(+), 161 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/common/CodeBuilder.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/common/CodeBuilder.java
index 37e20ec..3831362 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/common/CodeBuilder.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/common/CodeBuilder.java
@@ -22,8 +22,8 @@
// generator.username="sa";
// generator.password="Zoneyung@zy56$";
- generator.table="sys_operation_record";
- generator.tableDesc="OperationRecord";
+ generator.table="man_zone";
+ generator.tableDesc="Zone";
generator.packagePath="com.zy.acs.manager.system";
generator.build();
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Action.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Action.java
index 5904324..8eaadbe 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Action.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Action.java
@@ -149,13 +149,13 @@
* 绉熸埛
*/
@ApiModelProperty(value= "绉熸埛")
- private Integer tenantId;
+ private Long tenantId;
/**
* 娣诲姞浜哄憳
*/
@ApiModelProperty(value= "娣诲姞浜哄憳")
- private Integer createBy;
+ private Long createBy;
/**
* 娣诲姞鏃堕棿
@@ -167,7 +167,7 @@
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
- private Integer updateBy;
+ private Long updateBy;
/**
* 淇敼鏃堕棿
@@ -180,36 +180,6 @@
*/
@ApiModelProperty(value= "澶囨敞")
private String memo;
-
- public Action() {}
-
- public Action(String uuid,Long busId,Long taskId,String seqNum,Integer priority,String name,Double val,String code,String params,Long actionType,Long actionSts,Long agvId,Date ioTime,Date startTime,Date endTime,Date errTime,String errDesc,Integer status,Integer deleted,Integer tenantId,Integer createBy,Date createTime,Integer updateBy,Date updateTime,String memo) {
- this.uuid = uuid;
- this.busId = busId;
- this.taskId = taskId;
- this.seqNum = seqNum;
- this.priority = priority;
- this.name = name;
- this.val = val;
- this.code = code;
- this.params = params;
- this.actionType = actionType;
- this.actionSts = actionSts;
- this.agvId = agvId;
- this.ioTime = ioTime;
- this.startTime = startTime;
- this.endTime = endTime;
- this.errTime = errTime;
- this.errDesc = errDesc;
- this.status = status;
- this.deleted = deleted;
- this.tenantId = tenantId;
- this.createBy = createBy;
- this.createTime = createTime;
- this.updateBy = updateBy;
- this.updateTime = updateTime;
- this.memo = memo;
- }
public Action(String uuid, Long busId, Long taskId, String seqNum, Integer priority, String name, Double val, String code, String params, Long actionType, Long actionSts, Long agvId, Date ioTime) {
this.uuid = uuid;
@@ -226,34 +196,6 @@
this.agvId = agvId;
this.ioTime = ioTime;
}
-
- // Action action = new Action(
-// null, // 缂栧彿
-// null, // 鎬荤嚎
-// null, // 浠诲姟
-// null, // 鍔ㄤ綔鍙�
-// null, // 浼樺厛绾�
-// null, // 鍚嶇О
-// null, // 灞炴�у��
-// null, // 鍦伴潰鐮�
-// null, // 鍔ㄤ綔鍙傛暟
-// null, // 鍔ㄤ綔绫诲瀷
-// null, // 鍔ㄤ綔杩涘害
-// null, // AGV
-// null, // 宸ヤ綔鏃堕棿
-// null, // 寮�濮嬫椂闂�
-// null, // 缁撴潫鏃堕棿
-// null, // 寮傚父鏃堕棿
-// null, // 寮傚父鎻忚堪
-// null, // 鐘舵�乕闈炵┖]
-// null, // 鏄惁鍒犻櫎[闈炵┖]
-// null, // 绉熸埛
-// null, // 娣诲姞浜哄憳
-// null, // 娣诲姞鏃堕棿[闈炵┖]
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null // 澶囨敞
-// );
public String getBusId$(){
BusService service = SpringUtils.getBean(BusService.class);
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/ActionSts.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/ActionSts.java
index 3610d42..12bcf77 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/ActionSts.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/ActionSts.java
@@ -50,13 +50,13 @@
* 绉熸埛
*/
@ApiModelProperty(value= "绉熸埛")
- private Integer tenantId;
+ private Long tenantId;
/**
* 娣诲姞浜哄憳
*/
@ApiModelProperty(value= "娣诲姞浜哄憳")
- private Integer createBy;
+ private Long createBy;
/**
* 娣诲姞鏃堕棿
@@ -68,7 +68,7 @@
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
- private Integer updateBy;
+ private Long updateBy;
/**
* 淇敼鏃堕棿
@@ -84,7 +84,7 @@
public ActionSts() {}
- public ActionSts(String uuid,String name,Integer status,Integer deleted,Integer tenantId,Integer createBy,Date createTime,Integer updateBy,Date updateTime,String memo) {
+ public ActionSts(String uuid,String name,Integer status,Integer deleted,Long tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.uuid = uuid;
this.name = name;
this.status = status;
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/ActionType.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/ActionType.java
index d5e7fe1..6ba1146 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/ActionType.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/ActionType.java
@@ -50,13 +50,13 @@
* 绉熸埛
*/
@ApiModelProperty(value= "绉熸埛")
- private Integer tenantId;
+ private Long tenantId;
/**
* 娣诲姞浜哄憳
*/
@ApiModelProperty(value= "娣诲姞浜哄憳")
- private Integer createBy;
+ private Long createBy;
/**
* 娣诲姞鏃堕棿
@@ -68,7 +68,7 @@
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
- private Integer updateBy;
+ private Long updateBy;
/**
* 淇敼鏃堕棿
@@ -84,7 +84,7 @@
public ActionType() {}
- public ActionType(String uuid,String name,Integer status,Integer deleted,Integer tenantId,Integer createBy,Date createTime,Integer updateBy,Date updateTime,String memo) {
+ public ActionType(String uuid,String name,Integer status,Integer deleted,Long tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.uuid = uuid;
this.name = name;
this.status = status;
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Agv.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Agv.java
index 460d046..5b58abe 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Agv.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Agv.java
@@ -62,16 +62,16 @@
private Integer deleted;
@ApiModelProperty(value = "绉熸埛[sys_tenant]")
- private Integer tenantId;
+ private Long tenantId;
@ApiModelProperty(value = "娣诲姞浜哄憳[sys_user]")
- private Integer createBy;
+ private Long createBy;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
private Date createTime;
@ApiModelProperty(value = "淇敼浜哄憳[sys_user]")
- private Integer updateBy;
+ private Long updateBy;
@ApiModelProperty(value = "淇敼鏃堕棿")
private Date updateTime;
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/AgvDetail.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/AgvDetail.java
index a1ece62..67d9969 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/AgvDetail.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/AgvDetail.java
@@ -197,13 +197,13 @@
* 绉熸埛
*/
@ApiModelProperty(value= "绉熸埛")
- private Integer tenantId;
+ private Long tenantId;
/**
* 娣诲姞浜哄憳
*/
@ApiModelProperty(value= "娣诲姞浜哄憳")
- private Integer createBy;
+ private Long createBy;
/**
* 娣诲姞鏃堕棿
@@ -215,7 +215,7 @@
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
- private Integer updateBy;
+ private Long updateBy;
/**
* 淇敼鏃堕棿
@@ -231,7 +231,7 @@
public AgvDetail() {}
- public AgvDetail(String uuid,Long agvId,String title,Long code,Long lastCode,String codeOffsert,Double straightVal,Double agvAngle,Double gyroAngle,Double encoderAngle,Integer high,Long sensorSts,Integer vol,Integer soc,Integer soh,Integer batteryFail,String tempe,String motorFail,String failSign,Integer bootTime,Integer workTime,Double workDistance,Integer tempQua,String password,Integer status,Integer deleted,Integer tenantId,Integer createBy,Date createTime,Integer updateBy,Date updateTime,String memo) {
+ public AgvDetail(String uuid,Long agvId,String title,Long code,Long lastCode,String codeOffsert,Double straightVal,Double agvAngle,Double gyroAngle,Double encoderAngle,Integer high,Long sensorSts,Integer vol,Integer soc,Integer soh,Integer batteryFail,String tempe,String motorFail,String failSign,Integer bootTime,Integer workTime,Double workDistance,Integer tempQua,String password,Integer status,Integer deleted,Long tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.uuid = uuid;
this.agvId = agvId;
this.title = title;
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/AgvModel.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/AgvModel.java
index afce2f9..b171487 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/AgvModel.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/AgvModel.java
@@ -140,13 +140,13 @@
* 绉熸埛
*/
@ApiModelProperty(value= "绉熸埛")
- private Integer tenantId;
+ private Long tenantId;
/**
* 娣诲姞浜哄憳
*/
@ApiModelProperty(value= "娣诲姞浜哄憳")
- private Integer createBy;
+ private Long createBy;
/**
* 娣诲姞鏃堕棿
@@ -158,7 +158,7 @@
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
- private Integer updateBy;
+ private Long updateBy;
/**
* 淇敼鏃堕棿
@@ -174,7 +174,7 @@
public AgvModel() {}
- public AgvModel(String uuid,String type,String name,Integer length,Integer width,Integer height,Integer liftHeight,Integer diameter,String password,Integer backpack,Integer lowBattery,Integer quaBattery,Integer travelSpeed,Double workDirection,Integer allDirection,String protocol,String mqttTopic,Integer status,Integer deleted,Integer tenantId,Integer createBy,Date createTime,Integer updateBy,Date updateTime,String memo) {
+ public AgvModel(String uuid,String type,String name,Integer length,Integer width,Integer height,Integer liftHeight,Integer diameter,String password,Integer backpack,Integer lowBattery,Integer quaBattery,Integer travelSpeed,Double workDirection,Integer allDirection,String protocol,String mqttTopic,Integer status,Integer deleted,Long tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.uuid = uuid;
this.type = type;
this.name = name;
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/AgvSts.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/AgvSts.java
index 7e16a3d..b4e3d78 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/AgvSts.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/AgvSts.java
@@ -50,13 +50,13 @@
* 绉熸埛
*/
@ApiModelProperty(value= "绉熸埛")
- private Integer tenantId;
+ private Long tenantId;
/**
* 娣诲姞浜哄憳
*/
@ApiModelProperty(value= "娣诲姞浜哄憳")
- private Integer createBy;
+ private Long createBy;
/**
* 娣诲姞鏃堕棿
@@ -68,7 +68,7 @@
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
- private Integer updateBy;
+ private Long updateBy;
/**
* 淇敼鏃堕棿
@@ -84,7 +84,7 @@
public AgvSts() {}
- public AgvSts(String uuid,String name,Integer status,Integer deleted,Integer tenantId,Integer createBy,Date createTime,Integer updateBy,Date updateTime,String memo) {
+ public AgvSts(String uuid,String name,Integer status,Integer deleted,Long tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.uuid = uuid;
this.name = name;
this.status = status;
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Bus.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Bus.java
index 9dfb9cf..a234fa9 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Bus.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Bus.java
@@ -77,13 +77,13 @@
* 绉熸埛
*/
@ApiModelProperty(value= "绉熸埛")
- private Integer tenantId;
+ private Long tenantId;
/**
* 娣诲姞浜哄憳
*/
@ApiModelProperty(value= "娣诲姞浜哄憳")
- private Integer createBy;
+ private Long createBy;
/**
* 娣诲姞鏃堕棿
@@ -95,7 +95,7 @@
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
- private Integer updateBy;
+ private Long updateBy;
/**
* 淇敼鏃堕棿
@@ -111,7 +111,7 @@
public Bus() {}
- public Bus(String uuid,String seqNum,Date startTime,Date endTime,Long busSts,String phase,Integer status,Integer deleted,Integer tenantId,Integer createBy,Date createTime,Integer updateBy,Date updateTime,String memo) {
+ public Bus(String uuid,String seqNum,Date startTime,Date endTime,Long busSts,String phase,Integer status,Integer deleted,Long tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.uuid = uuid;
this.seqNum = seqNum;
this.startTime = startTime;
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/BusSts.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/BusSts.java
index 63ff9db..2129e92 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/BusSts.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/BusSts.java
@@ -50,13 +50,13 @@
* 绉熸埛
*/
@ApiModelProperty(value= "绉熸埛")
- private Integer tenantId;
+ private Long tenantId;
/**
* 娣诲姞浜哄憳
*/
@ApiModelProperty(value= "娣诲姞浜哄憳")
- private Integer createBy;
+ private Long createBy;
/**
* 娣诲姞鏃堕棿
@@ -68,7 +68,7 @@
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
- private Integer updateBy;
+ private Long updateBy;
/**
* 淇敼鏃堕棿
@@ -84,7 +84,7 @@
public BusSts() {}
- public BusSts(String uuid,String name,Integer status,Integer deleted,Integer tenantId,Integer createBy,Date createTime,Integer updateBy,Date updateTime,String memo) {
+ public BusSts(String uuid,String name,Integer status,Integer deleted,Long tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.uuid = uuid;
this.name = name;
this.status = status;
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Code.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Code.java
index 19a1636..fa5c7f6 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Code.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Code.java
@@ -74,13 +74,13 @@
* 绉熸埛
*/
@ApiModelProperty(value= "绉熸埛")
- private Integer tenantId;
+ private Long tenantId;
/**
* 娣诲姞浜哄憳
*/
@ApiModelProperty(value= "娣诲姞浜哄憳")
- private Integer createBy;
+ private Long createBy;
/**
* 娣诲姞鏃堕棿
@@ -92,7 +92,7 @@
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
- private Integer updateBy;
+ private Long updateBy;
/**
* 淇敼鏃堕棿
@@ -108,7 +108,7 @@
public Code() {}
- public Code(String uuid,String data,Double x,Double y,Integer concer,Integer status,Integer deleted,Integer tenantId,Integer createBy,Date createTime,Integer updateBy,Date updateTime,String memo) {
+ public Code(String uuid,String data,Double x,Double y,Integer concer,Integer status,Integer deleted,Long tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.uuid = uuid;
this.data = data;
this.x = x;
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/CodeGap.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/CodeGap.java
index a67c964..d570978 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/CodeGap.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/CodeGap.java
@@ -51,11 +51,11 @@
* 绉熸埛
*/
@ApiModelProperty(value= "绉熸埛")
- private Integer tenantId;
+ private Long tenantId;
public CodeGap() {}
- public CodeGap(Long code0,Long code1,Double distance,Integer deleted,Integer tenantId) {
+ public CodeGap(Long code0,Long code1,Double distance,Integer deleted,Long tenantId) {
this.code0 = code0;
this.code1 = code1;
this.distance = distance;
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/FuncSta.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/FuncSta.java
index af99ada..93ad4a8 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/FuncSta.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/FuncSta.java
@@ -90,13 +90,13 @@
* 绉熸埛
*/
@ApiModelProperty(value= "绉熸埛")
- private Integer tenantId;
+ private Long tenantId;
/**
* 娣诲姞浜哄憳
*/
@ApiModelProperty(value= "娣诲姞浜哄憳")
- private Integer createBy;
+ private Long createBy;
/**
* 娣诲姞鏃堕棿
@@ -108,7 +108,7 @@
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
- private Integer updateBy;
+ private Long updateBy;
/**
* 淇敼鏃堕棿
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Jam.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Jam.java
index 2649f81..7975660 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Jam.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Jam.java
@@ -133,13 +133,13 @@
* 绉熸埛
*/
@ApiModelProperty(value= "绉熸埛")
- private Integer tenantId;
+ private Long tenantId;
/**
* 娣诲姞浜哄憳
*/
@ApiModelProperty(value= "娣诲姞浜哄憳")
- private Integer createBy;
+ private Long createBy;
/**
* 娣诲姞鏃堕棿
@@ -151,7 +151,7 @@
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
- private Integer updateBy;
+ private Long updateBy;
/**
* 淇敼鏃堕棿
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Loc.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Loc.java
index b287147..b88e34b 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Loc.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Loc.java
@@ -128,13 +128,13 @@
* 绉熸埛
*/
@ApiModelProperty(value= "绉熸埛")
- private Integer tenantId;
+ private Long tenantId;
/**
* 娣诲姞浜哄憳
*/
@ApiModelProperty(value= "娣诲姞浜哄憳")
- private Integer createBy;
+ private Long createBy;
/**
* 娣诲姞鏃堕棿
@@ -146,7 +146,7 @@
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
- private Integer updateBy;
+ private Long updateBy;
/**
* 淇敼鏃堕棿
@@ -162,7 +162,7 @@
public Loc() {}
- public Loc(String uuid,Long zoneId,String locNo,String name,Long code,Long locSts,Double offset,Integer row,Integer bay,Integer lev,String zpallet,Long locType,Integer status,Integer deleted,Integer tenantId,Integer createBy,Date createTime,Integer updateBy,Date updateTime,String memo) {
+ public Loc(String uuid,Long zoneId,String locNo,String name,Long code,Long locSts,Double offset,Integer row,Integer bay,Integer lev,String zpallet,Long locType,Integer status,Integer deleted,Long tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.uuid = uuid;
this.zoneId = zoneId;
this.locNo = locNo;
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/LocSts.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/LocSts.java
index 4157cac..8544ed6 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/LocSts.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/LocSts.java
@@ -50,13 +50,13 @@
* 绉熸埛
*/
@ApiModelProperty(value= "绉熸埛")
- private Integer tenantId;
+ private Long tenantId;
/**
* 娣诲姞浜哄憳
*/
@ApiModelProperty(value= "娣诲姞浜哄憳")
- private Integer createBy;
+ private Long createBy;
/**
* 娣诲姞鏃堕棿
@@ -68,7 +68,7 @@
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
- private Integer updateBy;
+ private Long updateBy;
/**
* 淇敼鏃堕棿
@@ -84,7 +84,7 @@
public LocSts() {}
- public LocSts(String uuid,String name,Integer status,Integer deleted,Integer tenantId,Integer createBy,Date createTime,Integer updateBy,Date updateTime,String memo) {
+ public LocSts(String uuid,String name,Integer status,Integer deleted,Long tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.uuid = uuid;
this.name = name;
this.status = status;
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/LocType.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/LocType.java
index df279d1..49f454a 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/LocType.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/LocType.java
@@ -50,13 +50,13 @@
* 绉熸埛
*/
@ApiModelProperty(value= "绉熸埛")
- private Integer tenantId;
+ private Long tenantId;
/**
* 娣诲姞浜哄憳
*/
@ApiModelProperty(value= "娣诲姞浜哄憳")
- private Integer createBy;
+ private Long createBy;
/**
* 娣诲姞鏃堕棿
@@ -68,7 +68,7 @@
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
- private Integer updateBy;
+ private Long updateBy;
/**
* 淇敼鏃堕棿
@@ -84,7 +84,7 @@
public LocType() {}
- public LocType(String uuid,String name,Integer status,Integer deleted,Integer tenantId,Integer createBy,Date createTime,Integer updateBy,Date updateTime,String memo) {
+ public LocType(String uuid,String name,Integer status,Integer deleted,Long tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.uuid = uuid;
this.name = name;
this.status = status;
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Route.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Route.java
index c812f61..0135403 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Route.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Route.java
@@ -82,13 +82,13 @@
* 绉熸埛
*/
@ApiModelProperty(value= "绉熸埛")
- private Integer tenantId;
+ private Long tenantId;
/**
* 娣诲姞浜哄憳
*/
@ApiModelProperty(value= "娣诲姞浜哄憳")
- private Integer createBy;
+ private Long createBy;
/**
* 娣诲姞鏃堕棿
@@ -100,7 +100,7 @@
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
- private Integer updateBy;
+ private Long updateBy;
/**
* 淇敼鏃堕棿
@@ -116,7 +116,7 @@
public Route() {}
- public Route(String uuid,String name,Long startCode,Long endCode,String codeArr,String codeDataArr,Integer direction,Integer status,Integer deleted,Integer tenantId,Integer createBy,Date createTime,Integer updateBy,Date updateTime,String memo) {
+ public Route(String uuid,String name,Long startCode,Long endCode,String codeArr,String codeDataArr,Integer direction,Integer status,Integer deleted,Long tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.uuid = uuid;
this.name = name;
this.startCode = startCode;
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Segment.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Segment.java
index 417eab2..7d66c57 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Segment.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Segment.java
@@ -109,13 +109,13 @@
* 绉熸埛
*/
@ApiModelProperty(value= "绉熸埛")
- private Integer tenantId;
+ private Long tenantId;
/**
* 娣诲姞浜哄憳
*/
@ApiModelProperty(value= "娣诲姞浜哄憳")
- private Integer createBy;
+ private Long createBy;
/**
* 娣诲姞鏃堕棿
@@ -127,7 +127,7 @@
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
- private Integer updateBy;
+ private Long updateBy;
/**
* 淇敼鏃堕棿
@@ -143,7 +143,7 @@
public Segment() {}
- public Segment(String uuid,Long travelId,Long taskId,Long agvId,Integer serial,Long startNode,Long endNode,String state,Integer status,Integer deleted,Integer tenantId,Integer createBy,Date createTime,Integer updateBy,Date updateTime,String memo) {
+ public Segment(String uuid,Long travelId,Long taskId,Long agvId,Integer serial,Long startNode,Long endNode,String state,Integer status,Integer deleted,Long tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.uuid = uuid;
this.travelId = travelId;
this.taskId = taskId;
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Sta.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Sta.java
index 28f76b5..2708473 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Sta.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Sta.java
@@ -122,13 +122,13 @@
* 绉熸埛
*/
@ApiModelProperty(value= "绉熸埛")
- private Integer tenantId;
+ private Long tenantId;
/**
* 娣诲姞浜哄憳
*/
@ApiModelProperty(value= "娣诲姞浜哄憳")
- private Integer createBy;
+ private Long createBy;
/**
* 娣诲姞鏃堕棿
@@ -140,7 +140,7 @@
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
- private Integer updateBy;
+ private Long updateBy;
/**
* 淇敼鏃堕棿
@@ -156,7 +156,7 @@
public Sta() {}
- public Sta(String uuid,Long zoneId,String staNo,String name,Long staType,Long code,Double offset,String autoing,String loading,String inEnable,String outEnable,String zpallet,Long staSts,Integer status,Integer deleted,Integer tenantId,Integer createBy,Date createTime,Integer updateBy,Date updateTime,String memo) {
+ public Sta(String uuid,Long zoneId,String staNo,String name,Long staType,Long code,Double offset,String autoing,String loading,String inEnable,String outEnable,String zpallet,Long staSts,Integer status,Integer deleted,Long tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.uuid = uuid;
this.zoneId = zoneId;
this.staNo = staNo;
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/StaSts.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/StaSts.java
index 70ced33..08ca4cb 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/StaSts.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/StaSts.java
@@ -50,13 +50,13 @@
* 绉熸埛
*/
@ApiModelProperty(value= "绉熸埛")
- private Integer tenantId;
+ private Long tenantId;
/**
* 娣诲姞浜哄憳
*/
@ApiModelProperty(value= "娣诲姞浜哄憳")
- private Integer createBy;
+ private Long createBy;
/**
* 娣诲姞鏃堕棿
@@ -68,7 +68,7 @@
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
- private Integer updateBy;
+ private Long updateBy;
/**
* 淇敼鏃堕棿
@@ -84,7 +84,7 @@
public StaSts() {}
- public StaSts(String uuid,String name,Integer status,Integer deleted,Integer tenantId,Integer createBy,Date createTime,Integer updateBy,Date updateTime,String memo) {
+ public StaSts(String uuid,String name,Integer status,Integer deleted,Long tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.uuid = uuid;
this.name = name;
this.status = status;
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/StaType.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/StaType.java
index 1d1d927..2d01210 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/StaType.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/StaType.java
@@ -50,13 +50,13 @@
* 绉熸埛
*/
@ApiModelProperty(value= "绉熸埛")
- private Integer tenantId;
+ private Long tenantId;
/**
* 娣诲姞浜哄憳
*/
@ApiModelProperty(value= "娣诲姞浜哄憳")
- private Integer createBy;
+ private Long createBy;
/**
* 娣诲姞鏃堕棿
@@ -68,7 +68,7 @@
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
- private Integer updateBy;
+ private Long updateBy;
/**
* 淇敼鏃堕棿
@@ -84,7 +84,7 @@
public StaType() {}
- public StaType(String uuid,String name,Integer status,Integer deleted,Integer tenantId,Integer createBy,Date createTime,Integer updateBy,Date updateTime,String memo) {
+ public StaType(String uuid,String name,Integer status,Integer deleted,Long tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.uuid = uuid;
this.name = name;
this.status = status;
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java
index 6084e4a..bd061a7 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java
@@ -173,13 +173,13 @@
* 绉熸埛
*/
@ApiModelProperty(value= "绉熸埛")
- private Integer tenantId;
+ private Long tenantId;
/**
* 娣诲姞浜哄憳
*/
@ApiModelProperty(value= "娣诲姞浜哄憳")
- private Integer createBy;
+ private Long createBy;
/**
* 娣诲姞鏃堕棿
@@ -191,7 +191,7 @@
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
- private Integer updateBy;
+ private Long updateBy;
/**
* 淇敼鏃堕棿
@@ -207,7 +207,7 @@
public Task() {}
- public Task(String uuid,Long busId,String seqNum,Integer priority,String name,Long taskSts,Long taskType,Long agvId,Date ioTime,Date startTime,Date endTime,Date errTime,Long oriSta,Long oriLoc,Long destSta,Long destLoc,String emptyMk,String zpallet,String phase,String errDesc,Integer status,Integer deleted,Integer tenantId,Integer createBy,Date createTime,Integer updateBy,Date updateTime,String memo) {
+ public Task(String uuid,Long busId,String seqNum,Integer priority,String name,Long taskSts,Long taskType,Long agvId,Date ioTime,Date startTime,Date endTime,Date errTime,Long oriSta,Long oriLoc,Long destSta,Long destLoc,String emptyMk,String zpallet,String phase,String errDesc,Integer status,Integer deleted,Long tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.uuid = uuid;
this.busId = busId;
this.seqNum = seqNum;
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/TaskSts.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/TaskSts.java
index 666dab9..e76022a 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/TaskSts.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/TaskSts.java
@@ -50,13 +50,13 @@
* 绉熸埛
*/
@ApiModelProperty(value= "绉熸埛")
- private Integer tenantId;
+ private Long tenantId;
/**
* 娣诲姞浜哄憳
*/
@ApiModelProperty(value= "娣诲姞浜哄憳")
- private Integer createBy;
+ private Long createBy;
/**
* 娣诲姞鏃堕棿
@@ -68,7 +68,7 @@
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
- private Integer updateBy;
+ private Long updateBy;
/**
* 淇敼鏃堕棿
@@ -84,7 +84,7 @@
public TaskSts() {}
- public TaskSts(String uuid,String name,Integer status,Integer deleted,Integer tenantId,Integer createBy,Date createTime,Integer updateBy,Date updateTime,String memo) {
+ public TaskSts(String uuid,String name,Integer status,Integer deleted,Long tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.uuid = uuid;
this.name = name;
this.status = status;
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/TaskType.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/TaskType.java
index 6dde3d1..c95e424 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/TaskType.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/TaskType.java
@@ -50,13 +50,13 @@
* 绉熸埛
*/
@ApiModelProperty(value= "绉熸埛")
- private Integer tenantId;
+ private Long tenantId;
/**
* 娣诲姞浜哄憳
*/
@ApiModelProperty(value= "娣诲姞浜哄憳")
- private Integer createBy;
+ private Long createBy;
/**
* 娣诲姞鏃堕棿
@@ -68,7 +68,7 @@
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
- private Integer updateBy;
+ private Long updateBy;
/**
* 淇敼鏃堕棿
@@ -84,7 +84,7 @@
public TaskType() {}
- public TaskType(String uuid,String name,Integer status,Integer deleted,Integer tenantId,Integer createBy,Date createTime,Integer updateBy,Date updateTime,String memo) {
+ public TaskType(String uuid,String name,Integer status,Integer deleted,Long tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.uuid = uuid;
this.name = name;
this.status = status;
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Travel.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Travel.java
index caeac02..9405ddf 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Travel.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Travel.java
@@ -83,13 +83,13 @@
* 绉熸埛
*/
@ApiModelProperty(value= "绉熸埛")
- private Integer tenantId;
+ private Long tenantId;
/**
* 娣诲姞浜哄憳
*/
@ApiModelProperty(value= "娣诲姞浜哄憳")
- private Integer createBy;
+ private Long createBy;
/**
* 娣诲姞鏃堕棿
@@ -101,7 +101,7 @@
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
- private Integer updateBy;
+ private Long updateBy;
/**
* 淇敼鏃堕棿
@@ -117,7 +117,7 @@
public Travel() {}
- public Travel(String uuid,String travelId,Long agvId,Long currSeg,String taskContent,String taskIds,String state,Integer status,Integer deleted,Integer tenantId,Integer createBy,Date createTime,Integer updateBy,Date updateTime,String memo) {
+ public Travel(String uuid,String travelId,Long agvId,Long currSeg,String taskContent,String taskIds,String state,Integer status,Integer deleted,Long tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.uuid = uuid;
this.travelId = travelId;
this.agvId = agvId;
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/VehFaultRec.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/VehFaultRec.java
index 0e7e1fc..7320057 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/VehFaultRec.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/VehFaultRec.java
@@ -119,13 +119,13 @@
* 绉熸埛
*/
@ApiModelProperty(value= "绉熸埛")
- private Integer tenantId;
+ private Long tenantId;
/**
* 娣诲姞浜哄憳
*/
@ApiModelProperty(value= "娣诲姞浜哄憳")
- private Integer createBy;
+ private Long createBy;
/**
* 娣诲姞鏃堕棿
@@ -137,7 +137,7 @@
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
- private Integer updateBy;
+ private Long updateBy;
/**
* 淇敼鏃堕棿
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Zone.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Zone.java
index 25bb5e4..14f9dd9 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Zone.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Zone.java
@@ -62,13 +62,13 @@
* 绉熸埛
*/
@ApiModelProperty(value= "绉熸埛")
- private Integer tenantId;
+ private Long tenantId;
/**
* 娣诲姞浜哄憳
*/
@ApiModelProperty(value= "娣诲姞浜哄憳")
- private Integer createBy;
+ private Long createBy;
/**
* 娣诲姞鏃堕棿
@@ -80,7 +80,7 @@
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
- private Integer updateBy;
+ private Long updateBy;
/**
* 淇敼鏃堕棿
@@ -96,7 +96,7 @@
public Zone() {}
- public Zone(String uuid,String name,Double area,Integer capacity,Integer status,Integer deleted,Integer tenantId,Integer createBy,Date createTime,Integer updateBy,Date updateTime,String memo) {
+ public Zone(String uuid,String name,Double area,Integer capacity,Integer status,Integer deleted,Long tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.uuid = uuid;
this.name = name;
this.area = area;
--
Gitblit v1.9.1