From 320d6edb14c475850ab6e2343bc51fa0a41a8f3c Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 20 三月 2023 10:40:05 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/entity/sys/AuthEntity.java | 20 ++++++++++
src/main/resources/mapper/data/StyleMapper.xml | 9 +++-
src/main/java/com/lf/server/service/all/BaseQueryService.java | 6 +++
src/main/resources/mapper/all/BaseQueryMapper.xml | 11 +++++
data/db_cx.sql | 5 ++
src/main/java/com/lf/server/mapper/all/BaseQueryMapper.java | 10 +++++
src/main/resources/mapper/sys/AuthMapper.xml | 13 ++++--
src/main/java/com/lf/server/entity/data/StyleEntity.java | 20 ++++++++++
src/main/resources/application.yml | 8 ++--
9 files changed, 91 insertions(+), 11 deletions(-)
diff --git a/data/db_cx.sql b/data/db_cx.sql
index 5055bc1..7d2febd 100644
--- a/data/db_cx.sql
+++ b/data/db_cx.sql
@@ -43,6 +43,11 @@
(select coalesce(level, 0) + 1 from lf.sys_layer where cn_name = '鑷姩鍙戝竷妯″瀷' limit 1),
(select coalesce(max(order_num), 0) from lf.sys_layer where pid = (select id from lf.sys_layer where cn_name = '鑷姩鍙戝竷妯″瀷' limit 1)), 0, 1, '鑷姩鍙戝竷妯″瀷');
+select * from bs.s_explorationpoint
+select * from lf.sys_attach where tab = 'bs.s_explorationpoint' and tab_guid in (select eventid from bs.s_explorationpoint where exppointid = '001')
+
+
+
diff --git a/src/main/java/com/lf/server/entity/data/StyleEntity.java b/src/main/java/com/lf/server/entity/data/StyleEntity.java
index 04fa8bd..6508c60 100644
--- a/src/main/java/com/lf/server/entity/data/StyleEntity.java
+++ b/src/main/java/com/lf/server/entity/data/StyleEntity.java
@@ -52,6 +52,10 @@
private String bak;
+ private String createName;
+
+ private String updateName;
+
public int getId() {
return id;
}
@@ -211,4 +215,20 @@
public void setVname(String vname) {
this.vname = vname;
}
+
+ public String getCreateName() {
+ return createName;
+ }
+
+ public void setCreateName(String createName) {
+ this.createName = createName;
+ }
+
+ public String getUpdateName() {
+ return updateName;
+ }
+
+ public void setUpdateName(String updateName) {
+ this.updateName = updateName;
+ }
}
diff --git a/src/main/java/com/lf/server/entity/sys/AuthEntity.java b/src/main/java/com/lf/server/entity/sys/AuthEntity.java
index 87442f7..6e77013 100644
--- a/src/main/java/com/lf/server/entity/sys/AuthEntity.java
+++ b/src/main/java/com/lf/server/entity/sys/AuthEntity.java
@@ -27,6 +27,10 @@
private String bak;
+ private String createName;
+
+ private String updateName;
+
public int getId() {
return id;
}
@@ -90,4 +94,20 @@
public void setBak(String bak) {
this.bak = bak;
}
+
+ public String getCreateName() {
+ return createName;
+ }
+
+ public void setCreateName(String createName) {
+ this.createName = createName;
+ }
+
+ public String getUpdateName() {
+ return updateName;
+ }
+
+ public void setUpdateName(String updateName) {
+ this.updateName = updateName;
+ }
}
diff --git a/src/main/java/com/lf/server/mapper/all/BaseQueryMapper.java b/src/main/java/com/lf/server/mapper/all/BaseQueryMapper.java
index 4ee4cbe..4b5f780 100644
--- a/src/main/java/com/lf/server/mapper/all/BaseQueryMapper.java
+++ b/src/main/java/com/lf/server/mapper/all/BaseQueryMapper.java
@@ -5,6 +5,7 @@
import com.lf.server.entity.ctrl.TabEntity;
import com.lf.server.entity.data.DictEntity;
import com.lf.server.entity.data.DomainEntity;
+import com.lf.server.entity.sys.AttachEntity;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
@@ -98,4 +99,13 @@
* @return
*/
public List<KeyValueEntity> selectDirTypes(String name);
+
+ /**
+ * 鏍规嵁琛ㄥ悕鏌ヨ闄勪欢
+ *
+ * @param tab 琛ㄥ悕
+ * @param gids Gid瀛楃涓�
+ * @return 闄勪欢
+ */
+ public List<AttachEntity> selectAnnexByTab(String tab, String gids);
}
diff --git a/src/main/java/com/lf/server/service/all/BaseQueryService.java b/src/main/java/com/lf/server/service/all/BaseQueryService.java
index 06de9db..89a4217 100644
--- a/src/main/java/com/lf/server/service/all/BaseQueryService.java
+++ b/src/main/java/com/lf/server/service/all/BaseQueryService.java
@@ -8,6 +8,7 @@
import com.lf.server.entity.ctrl.TabEntity;
import com.lf.server.entity.data.DictEntity;
import com.lf.server.entity.data.DomainEntity;
+import com.lf.server.entity.sys.AttachEntity;
import com.lf.server.helper.AesHelper;
import com.lf.server.helper.ClassHelper;
import com.lf.server.helper.StringHelper;
@@ -280,4 +281,9 @@
return baseQueryMapper.selectDirTypes(name);
}
+
+ @Override
+ public List<AttachEntity> selectAnnexByTab(String tab, String gids) {
+ return baseQueryMapper.selectAnnexByTab(tab, gids);
+ }
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index da0adfb..2e59a86 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -42,11 +42,11 @@
name: prod
# JDBC 鍩烘湰閰嶇疆 ¤tSchema=public
#url: jdbc:postgresql://103.85.165.99:5433/langfang?useAffectedRows=true
- #url: jdbc:postgresql://192.168.20.205:5433/langfang?useAffectedRows=true
- url: jdbc:postgresql://127.0.0.1:5433/langfang?useAffectedRows=true
+ url: jdbc:postgresql://192.168.20.205:5433/langfang?useAffectedRows=true
+ #url: jdbc:postgresql://127.0.0.1:5433/langfang?useAffectedRows=true
username : postgres
- #password: Postgres!_14_Lf
- password: postgres
+ password: Postgres!_14_Lf
+ #password: postgres
driver-class-name: org.postgresql.Driver
paltform: POSTGRESQL
type: com.alibaba.druid.pool.DruidDataSource
diff --git a/src/main/resources/mapper/all/BaseQueryMapper.xml b/src/main/resources/mapper/all/BaseQueryMapper.xml
index 734bec9..3ab7312 100644
--- a/src/main/resources/mapper/all/BaseQueryMapper.xml
+++ b/src/main/resources/mapper/all/BaseQueryMapper.xml
@@ -79,4 +79,15 @@
group by name
order by key
</select>
+
+ <select id="selectAnnexByTab" resultType="com.lf.server.entity.sys.AttachEntity">
+ select a.* from lf.sys_attach a
+ <where>
+ tab = #{tab}
+ <if test="gids != null">
+ and tab_guid in (select eventid from ${tab} where gid in (${gids}))
+ </if>
+ </where>
+ order by a.id
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/data/StyleMapper.xml b/src/main/resources/mapper/data/StyleMapper.xml
index c3072de06..207531e 100644
--- a/src/main/resources/mapper/data/StyleMapper.xml
+++ b/src/main/resources/mapper/data/StyleMapper.xml
@@ -11,7 +11,8 @@
</select>
<select id="selectByPage" resultType="com.lf.server.entity.data.StyleEntity">
- select a.*,fn_rec_query(a.depid,'dep') depName,fn_rec_query(a.dirid,'dir') dirName from lf.sys_style a
+ select a.*, fn_uname(create_user) createName, fn_uname(update_user) updateName, fn_rec_query(a.depid,'dep') depName, fn_rec_query(a.dirid,'dir') dirName
+ from lf.sys_style a
<where>
<if test="name != null">
a.name like #{name}
@@ -22,11 +23,13 @@
</select>
<select id="selectStyleAll" resultType="com.lf.server.entity.data.StyleEntity">
- select a.*,fn_rec_query(a.depid,'dep') depName,fn_rec_query(a.dirid,'dir') dirName from lf.sys_style a order by a.id desc
+ select a.*, fn_uname(create_user) createName, fn_uname(update_user) updateName, fn_rec_query(a.depid,'dep') depName, fn_rec_query(a.dirid,'dir') dirName
+ from lf.sys_style a order by a.id desc
</select>
<select id="selectStyle" resultType="com.lf.server.entity.data.StyleEntity">
- select a.*,fn_rec_query(a.depid,'dep') depName,fn_rec_query(a.dirid,'dir') dirName from lf.sys_style a where a.id = #{id}
+ select a.*, fn_uname(create_user) createName, fn_uname(update_user) updateName, fn_rec_query(a.depid,'dep') depName, fn_rec_query(a.dirid,'dir') dirName
+ from lf.sys_style a where a.id = #{id}
</select>
<insert id="insertStyle" parameterType="com.lf.server.entity.data.StyleEntity">
diff --git a/src/main/resources/mapper/sys/AuthMapper.xml b/src/main/resources/mapper/sys/AuthMapper.xml
index e84cc20..a323b94 100644
--- a/src/main/resources/mapper/sys/AuthMapper.xml
+++ b/src/main/resources/mapper/sys/AuthMapper.xml
@@ -11,7 +11,7 @@
</select>
<select id="selectByPage" resultType="com.lf.server.entity.sys.AuthEntity">
- select * from lf.sys_auth
+ select a.*, fn_uname(create_user) createName, fn_uname(update_user) updateName from lf.sys_auth a
<where>
<if test="name != null">
name = #{name}
@@ -33,7 +33,8 @@
</select>
<select id="selectByPageForMenu" resultType="com.lf.server.entity.sys.AuthEntity">
- select a.* from lf.sys_auth a where not exists (select b.id from lf.sys_menu_auth b
+ select a.*, fn_uname(create_user) createName, fn_uname(update_user) updateName
+ from lf.sys_auth a where not exists (select b.id from lf.sys_menu_auth b
<where>
b.authid = a.id
<if test="menuid != null">
@@ -46,11 +47,15 @@
</select>
<select id="selectAuthAll" resultType="com.lf.server.entity.sys.AuthEntity">
- select * from lf.sys_auth order by id
+ select a.*, fn_uname(create_user) createName, fn_uname(update_user) updateName
+ from lf.sys_auth a
+ order by id
</select>
<select id="selectAuth" resultType="com.lf.server.entity.sys.AuthEntity">
- select * from lf.sys_auth where id = #{id}
+ select a.*, fn_uname(create_user) createName, fn_uname(update_user) updateName
+ from lf.sys_auth a
+ where id = #{id}
</select>
<insert id="insertAuth" parameterType="com.lf.server.entity.sys.AuthEntity">
--
Gitblit v1.9.3