From 991dfce093f460662b287339e1adf2c0f5c8cfc0 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 09 四月 2025 10:17:57 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/system/entity/RolePermission.java | 8 +-
src/main/java/com/zy/system/entity/Resource.java | 11 ++-
src/main/java/com/zy/system/entity/Role.java | 9 ++
src/main/java/com/zy/system/entity/User.java | 14 +++-
src/main/java/com/zy/system/entity/OperateLog.java | 12 ++-
src/main/resources/application-prod.yml | 1
src/main/java/com/zy/system/entity/Permission.java | 9 ++-
src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java | 20 +++---
src/main/java/com/zy/system/entity/UserLogin.java | 9 +-
src/main/java/com/zy/system/entity/RoleResource.java | 8 +-
src/main/java/com/zy/system/entity/Api.java | 13 +++-
src/main/java/com/zy/system/entity/Host.java | 11 ++-
src/main/java/com/zy/system/entity/Config.java | 10 ++
13 files changed, 86 insertions(+), 49 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
index b234685..24a4740 100644
--- a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
@@ -29,17 +29,17 @@
public List<ViewStayTimeBean> getViewStayTimeAll(ViewStayTimeBean viewStayTime);
// // 搴撲綅Map
- @Select("select distinct row1 from asr_loc_mast order by row1 asc")
+ @Select("select distinct row1 from \"SOURCE\".\"asr_loc_mast\" order by row1 asc")
List<Integer> getViewLocRowTotal();
// 搴撲綅Map
- @Select("select distinct bay1 from asr_loc_mast where row1=#{row1} order by bay1")
+ @Select("select distinct bay1 from \"SOURCE\".\"asr_loc_mast\" where row1=#{row1} order by bay1")
public List<String> getViewLocBayCount(@Param("row1") int row1);
- @Select("select distinct lev1 from asr_loc_mast where row1=#{row1} order by lev1 desc")
+ @Select("select distinct lev1 from \"SOURCE\".\"asr_loc_mast\" where row1=#{row1} order by lev1 desc")
public List<String> getViewLocLevCount(@Param("row1") int row1);
- @Select("select loc_no as locNo, bay1,loc_sts as locSts from asr_loc_mast where row1=#{row1} and lev1=#{lev1} order by bay1")
+ @Select("select loc_no as locNo, bay1,loc_sts as locSts from \"SOURCE\".\"asr_loc_mast\" where row1=#{row1} and lev1=#{lev1} order by bay1")
public List<ViewLocMapDto> getViewLocBays(@Param("row1") int row1, @Param("lev1") int lev1);
//鍒嗛〉鏌ヨ绔欑偣鍏ュ嚭搴撴鏁扮粺璁�
@@ -78,7 +78,7 @@
@Select("select \n" +
"Min(wm.io_time) as node,\n" +
"isnull(count(1), 0) as val\n" +
- "from asr_wrk_mast_log wm\n" +
+ "from \"SOURCE\".\"asr_wrk_mast_log\" wm\n" +
"where wm.wrk_sts = 5 \n" +
"and (wm.io_type = 1 OR wm.io_type = 54)\n" +
"and datediff(d, wm.io_time, getdate())<=7 \n" +
@@ -89,7 +89,7 @@
@Select("select\n" +
"Min(wm.io_time) as node,\n" +
"isnull(count(1), 0) as val\n" +
- "from asr_wrk_mast_log wm\n" +
+ "from \"SOURCE\".\"asr_wrk_mast_log\" wm\n" +
"where 1=1\n" +
"and ((wm.wrk_sts = 15 AND wm.io_type = 101) OR (wm.wrk_sts = 14 AND wm.io_type = 103))\n" +
"and datediff(d, wm.io_time, getdate())<=7\n" +
@@ -98,17 +98,17 @@
List<Map<String, Object>> queryPakOutRep();
//鏇茬嚎鍥�
- @Select("select ymd,SUM(sto_qty) inqty,SUM(ret_qty) outqty from asr_sta_inout_view "
+ @Select("select ymd,SUM(sto_qty) inqty,SUM(ret_qty) outqty from \"SOURCE\".\"asr_sta_inout_view\" "
+ "where ymd>CONVERT(char(10), DATEADD(DAY,-12,GETDATE()), 120) group by ymd order by ymd")
public List<WorkChartAxis> getChartAxis();
- @Select("select * from asr_loc_use_view")
+ @Select("select * from \"SOURCE\".\"asr_loc_use_view\" ")
LocChartPie getLocUseRate();
- @Select("select count(1) as totalWrk from asr_wrk_mast_log where crn_no = #{crnNo}")
+ @Select("select count(1) as totalWrk from \"SOURCE\".\"asr_wrk_mast_log\" where crn_no = #{crnNo}")
Integer getTotalWrkByCrnId(Integer crnNo);
- @Select("select count(1) as totalLoc from asr_loc_mast")
+ @Select("select count(1) as totalLoc from \"SOURCE\".\"asr_loc_mast\"")
Integer getTotalLocByCrnId();
}
diff --git a/src/main/java/com/zy/system/entity/Api.java b/src/main/java/com/zy/system/entity/Api.java
index 9342543..c5d9c19 100644
--- a/src/main/java/com/zy/system/entity/Api.java
+++ b/src/main/java/com/zy/system/entity/Api.java
@@ -10,7 +10,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
-@TableName("sys_api")
+@TableName("\"SOURCE\".\"sys_api\"")
public class Api implements Serializable {
private static final long serialVersionUID = 1L;
@@ -18,44 +18,49 @@
/**
* 缂栧彿
*/
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(value = "ID", type = IdType.AUTO)
private Long id;
/**
* 鍛藉悕绌洪棿
*/
+ @TableField("NAMESPACE")
private String namespace;
/**
* 鎺堟潈 0: 鏃犻渶鎺堟潈 1: 闇�瑕佹巿鏉�
*/
+ @TableField("OAUTH")
private Short oauth;
/**
* 璇锋眰缁撴瀯
*/
+ @TableField("REQUEST")
private String request;
/**
* 鍝嶅簲缁撴瀯
*/
+ @TableField("RESPONSE")
private String response;
/**
* 娣诲姞鏃堕棿
*/
- @TableField("create_time")
+ @TableField("CREATE_TIME")
private Date createTime;
/**
* 淇敼鏃堕棿
*/
- @TableField("update_time")
+ @TableField("UPDATE_TIME")
private Date updateTime;
/**
* 鐘舵�� 1: 鏈夋晥 0: 绂佺敤
*/
+ @TableField("STATUS")
private Short status;
public Api() {}
diff --git a/src/main/java/com/zy/system/entity/Config.java b/src/main/java/com/zy/system/entity/Config.java
index 9b6a39a..4dfc203 100644
--- a/src/main/java/com/zy/system/entity/Config.java
+++ b/src/main/java/com/zy/system/entity/Config.java
@@ -1,12 +1,13 @@
package com.zy.system.entity;
+import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import java.io.Serializable;
-@TableName("sys_config")
+@TableName("\"SOURCE\".\"sys_config\"")
public class Config implements Serializable {
private static final long serialVersionUID = 1L;
@@ -14,32 +15,37 @@
/**
* 缂栧彿
*/
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(value = "ID", type = IdType.AUTO)
private Long id;
/**
* 鍚嶇О
*/
+ @TableField("NAME")
private String name;
/**
* 缂栫爜
*/
+ @TableField("CODE")
private String code;
/**
* 瀵瑰簲鍊�
*/
+ @TableField("VALUE")
private String value;
/**
* 绫诲瀷 1: String 2: JSON
*/
+ @TableField("TYPE")
private Short type;
/**
* 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
+ @TableField("STATUS")
private Short status;
public Config() {}
diff --git a/src/main/java/com/zy/system/entity/Host.java b/src/main/java/com/zy/system/entity/Host.java
index 28b85ab..39f7092 100644
--- a/src/main/java/com/zy/system/entity/Host.java
+++ b/src/main/java/com/zy/system/entity/Host.java
@@ -10,7 +10,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
-@TableName("sys_host")
+@TableName("\"SOURCE\".\"sys_host\"")
public class Host implements Serializable {
private static final long serialVersionUID = 1L;
@@ -18,34 +18,37 @@
/**
* 缂栧彿
*/
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(value = "ID", type = IdType.AUTO)
private Long id;
/**
* 鍟嗘埛鍚嶇О
*/
+ @TableField("NAME")
private String name;
/**
* 鏍囪瘑
*/
+ @TableField("FLAG")
private String flag;
/**
* 娣诲姞鏃堕棿
*/
- @TableField("create_time")
+ @TableField("CREATE_TIME")
private Date createTime;
/**
* 淇敼鏃堕棿
*/
- @TableField("update_time")
+ @TableField("UPDATE_TIME")
private Date updateTime;
/**
* 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
+ @TableField("STATUS")
private Integer status;
public Host() {}
diff --git a/src/main/java/com/zy/system/entity/OperateLog.java b/src/main/java/com/zy/system/entity/OperateLog.java
index eb93fad..a35a918 100644
--- a/src/main/java/com/zy/system/entity/OperateLog.java
+++ b/src/main/java/com/zy/system/entity/OperateLog.java
@@ -12,7 +12,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
-@TableName("sys_operate_log")
+@TableName("\"SOURCE\".\"sys_operate_log\"")
public class OperateLog implements Serializable {
private static final long serialVersionUID = 1L;
@@ -20,39 +20,43 @@
/**
* 缂栧彿
*/
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(value = "ID", type = IdType.AUTO)
private Long id;
/**
* 璁块棶鍦板潃
*/
+ @TableField("ACTION")
private String action;
/**
* 鐢ㄦ埛
*/
- @TableField("user_id")
+ @TableField("USER_ID")
private Long userId;
/**
* 瀹㈡埛绔疘P
*/
+ @TableField("IP")
private String ip;
/**
* 璇锋眰鏁版嵁
*/
+ @TableField("REQUEST")
private String request;
/**
* 鍝嶅簲鏁版嵁
*/
+ @TableField("RESPONSE")
private String response;
/**
* 娣诲姞鏃堕棿
*/
- @TableField("create_time")
+ @TableField("CREATE_TIME")
private Date createTime;
public Long getId() {
diff --git a/src/main/java/com/zy/system/entity/Permission.java b/src/main/java/com/zy/system/entity/Permission.java
index 8373e0f..8e7a1c3 100644
--- a/src/main/java/com/zy/system/entity/Permission.java
+++ b/src/main/java/com/zy/system/entity/Permission.java
@@ -10,7 +10,7 @@
import java.io.Serializable;
-@TableName("sys_permission")
+@TableName("\"SOURCE\".\"sys_permission\"")
public class Permission implements Serializable {
private static final long serialVersionUID = 1L;
@@ -18,28 +18,31 @@
/**
* 缂栧彿
*/
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(value = "ID", type = IdType.AUTO)
private Long id;
/**
* 鏉冮檺鍚嶇О
*/
+ @TableField("NAME")
private String name;
/**
* 鎺ュ彛鍦板潃
*/
+ @TableField("ACTION")
private String action;
/**
* 鎵�灞炶彍鍗�
*/
- @TableField("resource_id")
+ @TableField("RESOURCE_ID")
private Long resourceId;
/**
* 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
+ @TableField("LOC_DESC")
private Short status;
public Permission() {}
diff --git a/src/main/java/com/zy/system/entity/Resource.java b/src/main/java/com/zy/system/entity/Resource.java
index 01b81f9..2807413 100644
--- a/src/main/java/com/zy/system/entity/Resource.java
+++ b/src/main/java/com/zy/system/entity/Resource.java
@@ -10,7 +10,7 @@
import java.io.Serializable;
-@TableName("sys_resource")
+@TableName("\"SOURCE\".\"sys_resource\"")
public class Resource implements Serializable {
private static final long serialVersionUID = 1L;
@@ -18,38 +18,43 @@
/**
* 缂栧彿
*/
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(value = "ID", type = IdType.AUTO)
private Long id;
/**
* 鑿滃崟缂栫爜
*/
+ @TableField("CODE")
private String code;
/**
* 鑿滃崟鍚嶇О
*/
+ @TableField("NAME")
private String name;
/**
* 鐖剁骇鑿滃崟
*/
- @TableField("resource_id")
+ @TableField("RESOURCE_ID")
private Long resourceId;
/**
* 鑿滃崟绛夌骇 1: 涓�绾ц彍鍗� 2: 浜岀骇鑿滃崟
*/
+ @TableField("LEVEL")
private Short level;
/**
* 鎺掑簭
*/
+ @TableField("SORT")
private Integer sort;
/**
* 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
+ @TableField("STATUS")
private Short status;
public Resource() {}
diff --git a/src/main/java/com/zy/system/entity/Role.java b/src/main/java/com/zy/system/entity/Role.java
index 9f6a998..48f1d45 100644
--- a/src/main/java/com/zy/system/entity/Role.java
+++ b/src/main/java/com/zy/system/entity/Role.java
@@ -1,5 +1,6 @@
package com.zy.system.entity;
+import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
@@ -10,7 +11,7 @@
import java.io.Serializable;
-@TableName("sys_role")
+@TableName("\"SOURCE\".\"sys_role\"")
public class Role implements Serializable {
private static final long serialVersionUID = 1L;
@@ -19,31 +20,35 @@
* 缂栧彿
*/
@ApiModelProperty(value= "缂栧彿")
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(value = "ID", type = IdType.AUTO)
private Long id;
/**
* 缂栫爜
*/
@ApiModelProperty(value= "缂栫爜")
+ @TableField("CODE")
private String code;
/**
* 鍚嶇О
*/
@ApiModelProperty(value= "鍚嶇О")
+ @TableField("NAME")
private String name;
/**
* 涓婄骇
*/
@ApiModelProperty(value= "涓婄骇")
+ @TableField("LEADER")
private Long leader;
/**
* 瑙掕壊绛夌骇 1: 涓�绾� 2: 浜岀骇 3: 涓夌骇 4: 鍥涚骇 5: 浜旂骇
*/
@ApiModelProperty(value= "瑙掕壊绛夌骇 1: 涓�绾� 2: 浜岀骇 3: 涓夌骇 4: 鍥涚骇 5: 浜旂骇 ")
+ @TableField("LEVEL")
private Short level;
public Role() {}
diff --git a/src/main/java/com/zy/system/entity/RolePermission.java b/src/main/java/com/zy/system/entity/RolePermission.java
index d846f50..e1cbead 100644
--- a/src/main/java/com/zy/system/entity/RolePermission.java
+++ b/src/main/java/com/zy/system/entity/RolePermission.java
@@ -13,7 +13,7 @@
//import com.zy.system.service.RoleService;
-@TableName("sys_role_permission")
+@TableName("\"SOURCE\".\"sys_role_permission\"")
public class RolePermission implements Serializable {
private static final long serialVersionUID = 1L;
@@ -21,19 +21,19 @@
/**
* 缂栧彿
*/
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(value = "ID", type = IdType.AUTO)
private Long id;
/**
* 瑙掕壊
*/
- @TableField("role_id")
+ @TableField("ROLE_ID")
private Long roleId;
/**
* 鏉冮檺
*/
- @TableField("permission_id")
+ @TableField("PERMISSION_ID")
private Long permissionId;
public RolePermission() {}
diff --git a/src/main/java/com/zy/system/entity/RoleResource.java b/src/main/java/com/zy/system/entity/RoleResource.java
index 48d4091..ce8e909 100644
--- a/src/main/java/com/zy/system/entity/RoleResource.java
+++ b/src/main/java/com/zy/system/entity/RoleResource.java
@@ -7,7 +7,7 @@
import java.io.Serializable;
-@TableName("sys_role_resource")
+@TableName("\"SOURCE\".\"sys_role_resource\"")
public class RoleResource implements Serializable {
private static final long serialVersionUID = 1L;
@@ -15,19 +15,19 @@
/**
* 缂栧彿
*/
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(value = "ID", type = IdType.AUTO)
private Long id;
/**
* 瑙掕壊
*/
- @TableField("role_id")
+ @TableField("ROLE_ID")
private Long roleId;
/**
* 璧勬簮
*/
- @TableField("resource_id")
+ @TableField("RESOURCE_ID")
private Long resourceId;
public Long getId() {
diff --git a/src/main/java/com/zy/system/entity/User.java b/src/main/java/com/zy/system/entity/User.java
index c5086aa..f40e865 100644
--- a/src/main/java/com/zy/system/entity/User.java
+++ b/src/main/java/com/zy/system/entity/User.java
@@ -15,7 +15,7 @@
//import com.zy.system.service.RoleService;
-@TableName("sys_user")
+@TableName("\"SOURCE\".\"sys_user\"")
public class User implements Serializable {
private static final long serialVersionUID = 1L;
@@ -23,45 +23,49 @@
/**
* 缂栧彿
*/
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(value = "ID", type = IdType.AUTO)
private Long id;
/**
* 鎺堟潈鍟嗘埛
*/
- @TableField("host_id")
+ @TableField("HOST_ID")
private Long hostId;
/**
* 璐﹀彿
*/
+ @TableField("USERNAME")
private String username;
/**
* 鎵嬫満鍙�
*/
+ @TableField("MOBILE")
private String mobile;
/**
* 瀵嗙爜
*/
+ @TableField("PASSWORD")
private String password;
/**
* 瑙掕壊
*/
- @TableField("role_id")
+ @TableField("ROLE_ID")
private Long roleId;
/**
* 娉ㄥ唽鏃堕棿
*/
- @TableField("create_time")
+ @TableField("CREATE_TIME")
private Date createTime;
/**
* 鐘舵�� 1: 鍚敤 2: 鍐荤粨 3: 鍒犻櫎
*/
+ @TableField("STATUS")
private Integer status;
public Long getId() {
diff --git a/src/main/java/com/zy/system/entity/UserLogin.java b/src/main/java/com/zy/system/entity/UserLogin.java
index a5660aa..aaa7987 100644
--- a/src/main/java/com/zy/system/entity/UserLogin.java
+++ b/src/main/java/com/zy/system/entity/UserLogin.java
@@ -12,7 +12,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
-@TableName("sys_user_login")
+@TableName("\"SOURCE\".\"sys_user_login\"")
public class UserLogin implements Serializable {
private static final long serialVersionUID = 1L;
@@ -20,24 +20,25 @@
/**
* 缂栧彿
*/
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(value = "ID", type = IdType.AUTO)
private Long id;
/**
* 鍛樺伐
*/
- @TableField("user_id")
+ @TableField("USER_ID")
private Long userId;
/**
* 鍑瘉鍊�
*/
+ @TableField("TOKEN")
private String token;
/**
* 娣诲姞鏃堕棿
*/
- @TableField("create_time")
+ @TableField("CREATE_TIME")
private Date createTime;
public Long getId() {
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index ba37ec1..126999f 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -30,6 +30,7 @@
ip: 192.168.4.250
slot: 0
port: 102
+ rack: 102
id: 1
# RGV绌挎杞�1
rgv[0]:
--
Gitblit v1.9.1