From 9b50dca2a601d1cf231821e248d3b9fbedd8febe Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期五, 13 九月 2024 13:05:50 +0800 Subject: [PATCH] # --- zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Loc.java | 23 +- zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/StaType.java | 13 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Action.java | 13 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Route.java | 24 +- zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Jam.java | 15 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Segment.java | 15 zy-acs-manager/src/main/java/com/zy/acs/manager/system/entity/Menu.java | 24 -- zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/AgvSts.java | 15 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/AgvDetail.java | 26 +- zy-acs-manager/src/main/java/com/zy/acs/manager/system/entity/Tenant.java | 12 - zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/StaSts.java | 13 zy-acs-manager/src/main/java/com/zy/acs/manager/system/entity/Config.java | 24 -- zy-acs-framework/src/main/resources/templates/react-admin/Entity.txt | 11 - zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java | 14 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/AgvModel.java | 15 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/CodeGap.java | 14 - zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/TaskSts.java | 15 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/LocSts.java | 15 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/TaskType.java | 14 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Zone.java | 14 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Agv.java | 13 + zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Sta.java | 15 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/LocType.java | 15 zy-acs-manager/src/main/java/com/zy/acs/manager/system/entity/Dept.java | 24 -- zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Code.java | 15 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Travel.java | 14 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Bus.java | 15 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/ActionType.java | 15 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/BusSts.java | 15 zy-acs-framework/src/main/java/com/zy/acs/framework/generators/ReactGenerator.java | 30 +- zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/VehFaultRec.java | 14 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/FuncSta.java | 15 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/ActionSts.java | 13 zy-acs-manager/src/main/java/com/zy/acs/manager/system/entity/Host.java | 12 - zy-acs-manager/src/main/java/com/zy/acs/manager/system/entity/Role.java | 24 -- zy-acs-manager/src/main/java/com/zy/acs/manager/system/entity/User.java | 24 -- 36 files changed, 258 insertions(+), 344 deletions(-) diff --git a/zy-acs-framework/src/main/java/com/zy/acs/framework/generators/ReactGenerator.java b/zy-acs-framework/src/main/java/com/zy/acs/framework/generators/ReactGenerator.java index 8a1fcbb..644cdce 100644 --- a/zy-acs-framework/src/main/java/com/zy/acs/framework/generators/ReactGenerator.java +++ b/zy-acs-framework/src/main/java/com/zy/acs/framework/generators/ReactGenerator.java @@ -499,22 +499,24 @@ .append(" }\n\n"); // 鏋氫妇瀛楁澧炲姞$鏍煎紡鍖� } else if (!Cools.isEmpty(column.getEnums())){ - sb.append(" public String get") - .append(column.getHumpName().substring(0, 1).toUpperCase()).append(column.getHumpName().substring(1)) - .append("\\$") - .append("(){\n") - .append(" if (null == this.").append(column.getHumpName()).append("){ return null; }\n") - .append(" switch (this.").append(column.getHumpName()).append("){\n"); - for (Map<String, Object> map : column.getEnums()){ - for (Map.Entry<String, Object> entry : map.entrySet()){ - sb.append(" case ").append(entry.getKey()).append(":\n") - .append(" return \"").append(entry.getValue()).append("\";\n"); + if (!column.getHumpName().equals("deleted")) { + sb.append(" public String get") + .append(column.getHumpName().substring(0, 1).toUpperCase()).append(column.getHumpName().substring(1)) + .append("\\$") + .append("(){\n") + .append(" if (null == this.").append(column.getHumpName()).append("){ return null; }\n") + .append(" switch (this.").append(column.getHumpName()).append("){\n"); + for (Map<String, Object> map : column.getEnums()){ + for (Map.Entry<String, Object> entry : map.entrySet()){ + sb.append(" case ").append(entry.getKey()).append(":\n") + .append(" return \"").append(entry.getValue()).append("\";\n"); + } } + sb.append(" default:\n") + .append(" return String.valueOf(this.").append(column.getHumpName()).append(");\n") + .append(" }\n") + .append(" }\n\n"); } - sb.append(" default:\n") - .append(" return String.valueOf(this.").append(column.getHumpName()).append(");\n") - .append(" }\n") - .append(" }\n\n"); } // 澶栭敭淇グ diff --git a/zy-acs-framework/src/main/resources/templates/react-admin/Entity.txt b/zy-acs-framework/src/main/resources/templates/react-admin/Entity.txt index c2f22f8..f20d0e9 100644 --- a/zy-acs-framework/src/main/resources/templates/react-admin/Entity.txt +++ b/zy-acs-framework/src/main/resources/templates/react-admin/Entity.txt @@ -36,15 +36,4 @@ } } - public Boolean getDeletedBool(){ - if (null == this.deleted){ return null; } - switch (this.deleted){ - case 1: - return true; - case 0: - return false; - default: - return null; - } - } } 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 8eaadbe..60b8eaf 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 @@ -263,17 +263,18 @@ } } - public String getDeleted$(){ - if (null == this.deleted){ return null; } - switch (this.deleted){ + public Boolean getStatusBool(){ + if (null == this.status){ return null; } + switch (this.status){ case 1: - return "鏄�"; + return true; case 0: - return "鍚�"; + return false; default: - return String.valueOf(this.deleted); + return null; } } + } 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 12bcf77..66a1477 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 @@ -122,17 +122,18 @@ } } - public String getDeleted$(){ - if (null == this.deleted){ return null; } - switch (this.deleted){ + public Boolean getStatusBool(){ + if (null == this.status){ return null; } + switch (this.status){ case 1: - return "鏄�"; + return true; case 0: - return "鍚�"; + return false; default: - return String.valueOf(this.deleted); + return null; } } + } 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 6ba1146..f75b2c7 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 @@ -122,17 +122,20 @@ } } - public String getDeleted$(){ - if (null == this.deleted){ return null; } - switch (this.deleted){ + + + public Boolean getStatusBool(){ + if (null == this.status){ return null; } + switch (this.status){ case 1: - return "鏄�"; + return true; case 0: - return "鍚�"; + return false; default: - return String.valueOf(this.deleted); + return null; } } + } 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 5b58abe..9df015a 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 @@ -109,4 +109,17 @@ } } + public Boolean getStatusBool(){ + if (null == this.status){ return null; } + switch (this.status){ + case 1: + return true; + case 0: + return false; + default: + return null; + } + } + + } 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 67d9969..d311e3d 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 @@ -351,17 +351,7 @@ return this.agvStatus.desc; } - public String getDeleted$(){ - if (null == this.deleted){ return null; } - switch (this.deleted){ - case 1: - return "鏄�"; - case 0: - return "鍚�"; - default: - return String.valueOf(this.deleted); - } - } + public Long getRecentCode() { // if (this.code != null) { @@ -379,4 +369,18 @@ return null; } + public Boolean getStatusBool(){ + if (null == this.status){ return null; } + switch (this.status){ + case 1: + return true; + case 0: + return false; + default: + return null; + } + } + + + } 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 b171487..4d00ed9 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 @@ -254,17 +254,20 @@ } } - public String getDeleted$(){ - if (null == this.deleted){ return null; } - switch (this.deleted){ + + + public Boolean getStatusBool(){ + if (null == this.status){ return null; } + switch (this.status){ case 1: - return "鏄�"; + return true; case 0: - return "鍚�"; + return false; default: - return String.valueOf(this.deleted); + return null; } } + } 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 b4e3d78..b31c182 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 @@ -122,17 +122,20 @@ } } - public String getDeleted$(){ - if (null == this.deleted){ return null; } - switch (this.deleted){ + + + public Boolean getStatusBool(){ + if (null == this.status){ return null; } + switch (this.status){ case 1: - return "鏄�"; + return true; case 0: - return "鍚�"; + return false; default: - return String.valueOf(this.deleted); + return null; } } + } 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 a234fa9..3860492 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 @@ -166,17 +166,20 @@ } } - public String getDeleted$(){ - if (null == this.deleted){ return null; } - switch (this.deleted){ + + + public Boolean getStatusBool(){ + if (null == this.status){ return null; } + switch (this.status){ case 1: - return "鏄�"; + return true; case 0: - return "鍚�"; + return false; default: - return String.valueOf(this.deleted); + return null; } } + } 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 2129e92..d7c7e89 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 @@ -122,17 +122,20 @@ } } - public String getDeleted$(){ - if (null == this.deleted){ return null; } - switch (this.deleted){ + + + public Boolean getStatusBool(){ + if (null == this.status){ return null; } + switch (this.status){ case 1: - return "鏄�"; + return true; case 0: - return "鍚�"; + return false; default: - return String.valueOf(this.deleted); + return null; } } + } 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 fa5c7f6..ed979ee 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 @@ -164,17 +164,20 @@ } } - public String getDeleted$(){ - if (null == this.deleted){ return null; } - switch (this.deleted){ + + + public Boolean getStatusBool(){ + if (null == this.status){ return null; } + switch (this.status){ case 1: - return "鏄�"; + return true; case 0: - return "鍚�"; + return false; default: - return String.valueOf(this.deleted); + return null; } } + } 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 d570978..f5b9c01 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 @@ -71,17 +71,7 @@ // null // 绉熸埛 // ); - public String getDeleted$(){ - if (null == this.deleted){ return null; } - switch (this.deleted){ - case 1: - return "鏄�"; - case 0: - return "鍚�"; - default: - return String.valueOf(this.deleted); - } - } + public String getCode0$() { CodeService service = SpringUtils.getBean(CodeService.class); @@ -101,4 +91,6 @@ return null; } + + } 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 93ad4a8..69e604e 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 @@ -155,17 +155,20 @@ } } - public String getDeleted$(){ - if (null == this.deleted){ return null; } - switch (this.deleted){ + + + public Boolean getStatusBool(){ + if (null == this.status){ return null; } + switch (this.status){ case 1: - return "鏄�"; + return true; case 0: - return "鍚�"; + return false; default: - return String.valueOf(this.deleted); + return null; } } + } 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 7975660..f916219 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 @@ -234,17 +234,20 @@ } } - public String getDeleted$(){ - if (null == this.deleted){ return null; } - switch (this.deleted){ + + + public Boolean getStatusBool(){ + if (null == this.status){ return null; } + switch (this.status){ case 1: - return "鏄�"; + return true; case 0: - return "鍚�"; + return false; default: - return String.valueOf(this.deleted); + return null; } } + } 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 b88e34b..826ba35 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 @@ -265,17 +265,7 @@ } } - public String getDeleted$(){ - if (null == this.deleted){ return null; } - switch (this.deleted){ - case 1: - return "鏄�"; - case 0: - return "鍚�"; - default: - return String.valueOf(this.deleted); - } - } + public String getCompDirect$(){ if (null == this.compDirect){ return null; } @@ -289,5 +279,16 @@ } } + public Boolean getStatusBool(){ + if (null == this.status){ return null; } + switch (this.status){ + case 1: + return true; + case 0: + return false; + default: + return null; + } + } } 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 8544ed6..c9087e4 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 @@ -122,17 +122,18 @@ } } - public String getDeleted$(){ - if (null == this.deleted){ return null; } - switch (this.deleted){ + + + public Boolean getStatusBool(){ + if (null == this.status){ return null; } + switch (this.status){ case 1: - return "鏄�"; + return true; case 0: - return "鍚�"; + return false; default: - return String.valueOf(this.deleted); + return null; } } - } 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 49f454a..a664d88 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 @@ -122,17 +122,18 @@ } } - public String getDeleted$(){ - if (null == this.deleted){ return null; } - switch (this.deleted){ + + + public Boolean getStatusBool(){ + if (null == this.status){ return null; } + switch (this.status){ case 1: - return "鏄�"; + return true; case 0: - return "鍚�"; + return false; default: - return String.valueOf(this.deleted); + return null; } } - } 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 0135403..7d4df2a 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 @@ -178,17 +178,7 @@ } } - public String getDeleted$(){ - if (null == this.deleted){ return null; } - switch (this.deleted){ - case 1: - return "鏄�"; - case 0: - return "鍚�"; - default: - return String.valueOf(this.deleted); - } - } + public String getStartCode$() { CodeService service = SpringUtils.getBean(CodeService.class); @@ -208,4 +198,16 @@ return null; } + public Boolean getStatusBool(){ + if (null == this.status){ return null; } + switch (this.status){ + case 1: + return true; + case 0: + return false; + default: + return null; + } + } + } 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 7d66c57..5a34b01 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 @@ -229,17 +229,18 @@ } } - public String getDeleted$(){ - if (null == this.deleted){ return null; } - switch (this.deleted){ + + + public Boolean getStatusBool(){ + if (null == this.status){ return null; } + switch (this.status){ case 1: - return "鏄�"; + return true; case 0: - return "鍚�"; + return false; default: - return String.valueOf(this.deleted); + return null; } } - } 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 2708473..367f898 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 @@ -252,17 +252,18 @@ } } - public String getDeleted$(){ - if (null == this.deleted){ return null; } - switch (this.deleted){ + + + public Boolean getStatusBool(){ + if (null == this.status){ return null; } + switch (this.status){ case 1: - return "鏄�"; + return true; case 0: - return "鍚�"; + return false; default: - return String.valueOf(this.deleted); + return null; } } - } 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 08ca4cb..b2adef6 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 @@ -122,17 +122,16 @@ } } - public String getDeleted$(){ - if (null == this.deleted){ return null; } - switch (this.deleted){ + public Boolean getStatusBool(){ + if (null == this.status){ return null; } + switch (this.status){ case 1: - return "鏄�"; + return true; case 0: - return "鍚�"; + return false; default: - return String.valueOf(this.deleted); + return null; } } - } 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 2d01210..684072e 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 @@ -122,17 +122,16 @@ } } - public String getDeleted$(){ - if (null == this.deleted){ return null; } - switch (this.deleted){ + public Boolean getStatusBool(){ + if (null == this.status){ return null; } + switch (this.status){ case 1: - return "鏄�"; + return true; case 0: - return "鍚�"; + return false; default: - return String.valueOf(this.deleted); + return null; } } - } 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 bd061a7..4c8df17 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 @@ -380,15 +380,17 @@ } } - public String getDeleted$(){ - if (null == this.deleted){ return null; } - switch (this.deleted){ + + + public Boolean getStatusBool(){ + if (null == this.status){ return null; } + switch (this.status){ case 1: - return "鏄�"; + return true; case 0: - return "鍚�"; + return false; default: - return String.valueOf(this.deleted); + return null; } } 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 e76022a..59a781b 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 @@ -122,17 +122,18 @@ } } - public String getDeleted$(){ - if (null == this.deleted){ return null; } - switch (this.deleted){ + + + public Boolean getStatusBool(){ + if (null == this.status){ return null; } + switch (this.status){ case 1: - return "鏄�"; + return true; case 0: - return "鍚�"; + return false; default: - return String.valueOf(this.deleted); + return null; } } - } 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 c95e424..c193738 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 @@ -122,17 +122,17 @@ } } - public String getDeleted$(){ - if (null == this.deleted){ return null; } - switch (this.deleted){ + + public Boolean getStatusBool(){ + if (null == this.status){ return null; } + switch (this.status){ case 1: - return "鏄�"; + return true; case 0: - return "鍚�"; + return false; default: - return String.valueOf(this.deleted); + return null; } } - } 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 9405ddf..c39f2f7 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 @@ -174,17 +174,17 @@ } } - public String getDeleted$(){ - if (null == this.deleted){ return null; } - switch (this.deleted){ + + public Boolean getStatusBool(){ + if (null == this.status){ return null; } + switch (this.status){ case 1: - return "鏄�"; + return true; case 0: - return "鍚�"; + return false; default: - return String.valueOf(this.deleted); + return null; } } - } 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 7320057..0cca695 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 @@ -173,17 +173,17 @@ } } - public String getDeleted$(){ - if (null == this.deleted){ return null; } - switch (this.deleted){ + + public Boolean getStatusBool(){ + if (null == this.status){ return null; } + switch (this.status){ case 1: - return "鏄�"; + return true; case 0: - return "鍚�"; + return false; default: - return String.valueOf(this.deleted); + return null; } } - } 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 14f9dd9..e8be0bd 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 @@ -138,17 +138,17 @@ } } - public String getDeleted$(){ - if (null == this.deleted){ return null; } - switch (this.deleted){ + + public Boolean getStatusBool(){ + if (null == this.status){ return null; } + switch (this.status){ case 1: - return "鏄�"; + return true; case 0: - return "鍚�"; + return false; default: - return String.valueOf(this.deleted); + return null; } } - } diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/system/entity/Config.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/system/entity/Config.java index cb0f3ac..16c1d35 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/system/entity/Config.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/system/entity/Config.java @@ -146,17 +146,7 @@ } } - public String getDeleted$(){ - if (null == this.deleted){ return null; } - switch (this.deleted){ - case 1: - return "鏄�"; - case 0: - return "鍚�"; - default: - return String.valueOf(this.deleted); - } - } + public String getTenantId$(){ TenantService service = SpringUtils.getBean(TenantService.class); @@ -211,16 +201,6 @@ } } - public Boolean getDeletedBool(){ - if (null == this.deleted){ return null; } - switch (this.deleted){ - case 1: - return true; - case 0: - return false; - default: - return null; - } - } + } diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/system/entity/Dept.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/system/entity/Dept.java index 6ff124d..2e97002 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/system/entity/Dept.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/system/entity/Dept.java @@ -175,17 +175,7 @@ } } - public String getDeleted$(){ - if (null == this.deleted){ return null; } - switch (this.deleted){ - case 1: - return "鏄�"; - case 0: - return "鍚�"; - default: - return String.valueOf(this.deleted); - } - } + public String getCreateTime$(){ if (Cools.isEmpty(this.createTime)){ @@ -231,16 +221,6 @@ } } - public Boolean getDeletedBool(){ - if (null == this.deleted){ return null; } - switch (this.deleted){ - case 1: - return true; - case 0: - return false; - default: - return null; - } - } + } diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/system/entity/Host.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/system/entity/Host.java index cd76cdd..8bc32c9 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/system/entity/Host.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/system/entity/Host.java @@ -97,17 +97,7 @@ } } - public Boolean getDeletedBool(){ - if (null == this.deleted){ return null; } - switch (this.deleted){ - case 1: - return true; - case 0: - return false; - default: - return null; - } - } + public String getCreateTime$(){ if (Cools.isEmpty(this.createTime)){ diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/system/entity/Menu.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/system/entity/Menu.java index 6864f5b..f2f13cd 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/system/entity/Menu.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/system/entity/Menu.java @@ -205,17 +205,7 @@ } } - public String getDeleted$(){ - if (null == this.deleted){ return null; } - switch (this.deleted){ - case 1: - return "鏄�"; - case 0: - return "鍚�"; - default: - return String.valueOf(this.deleted); - } - } + public String getCreateTime$(){ if (Cools.isEmpty(this.createTime)){ @@ -261,16 +251,6 @@ } } - public Boolean getDeletedBool(){ - if (null == this.deleted){ return null; } - switch (this.deleted){ - case 1: - return true; - case 0: - return false; - default: - return null; - } - } + } diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/system/entity/Role.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/system/entity/Role.java index 90c7a27..97a9998 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/system/entity/Role.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/system/entity/Role.java @@ -100,17 +100,7 @@ } } - public String getDeleted$(){ - if (null == this.deleted){ return null; } - switch (this.deleted){ - case 1: - return "鏄�"; - case 0: - return "鍚�"; - default: - return String.valueOf(this.deleted); - } - } + public String getCreateTime$(){ if (Cools.isEmpty(this.createTime)){ @@ -138,16 +128,6 @@ } } - public Boolean getDeletedBool(){ - if (null == this.deleted){ return null; } - switch (this.deleted){ - case 1: - return true; - case 0: - return false; - default: - return null; - } - } + } diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/system/entity/Tenant.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/system/entity/Tenant.java index 84765c7..62a526c 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/system/entity/Tenant.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/system/entity/Tenant.java @@ -74,17 +74,7 @@ } } - public Boolean getDeletedBool(){ - if (null == this.deleted){ return null; } - switch (this.deleted){ - case 1: - return true; - case 0: - return false; - default: - return null; - } - } + public String getCreateTime$(){ if (Cools.isEmpty(this.createTime)){ diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/system/entity/User.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/system/entity/User.java index 079d5e6..eca3f33 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/system/entity/User.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/system/entity/User.java @@ -234,17 +234,7 @@ } } - public String getDeleted$(){ - if (null == this.deleted){ return null; } - switch (this.deleted){ - case 1: - return "鏄�"; - case 0: - return "鍚�"; - default: - return String.valueOf(this.deleted); - } - } + public String getCreateTime$(){ if (Cools.isEmpty(this.createTime)){ @@ -320,16 +310,6 @@ } } - public Boolean getDeletedBool(){ - if (null == this.deleted){ return null; } - switch (this.deleted){ - case 1: - return true; - case 0: - return false; - default: - return null; - } - } + } -- Gitblit v1.9.1