From 7485979d8da73d03fe7291cef91f09c6a02e7dd6 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 31 七月 2023 17:41:31 +0800
Subject: [PATCH] 修改资源表的操作接口
---
src/main/resources/mapper/sys/ResMapper.xml | 12 +++---
src/main/java/com/moon/server/entity/sys/ResEntity.java | 100 +++++++++++++++-----------------------------------
src/main/java/com/moon/server/helper/HttpHelper.java | 2
3 files changed, 37 insertions(+), 77 deletions(-)
diff --git a/src/main/java/com/moon/server/entity/sys/ResEntity.java b/src/main/java/com/moon/server/entity/sys/ResEntity.java
index 2c4407a..7cf7edd 100644
--- a/src/main/java/com/moon/server/entity/sys/ResEntity.java
+++ b/src/main/java/com/moon/server/entity/sys/ResEntity.java
@@ -12,25 +12,17 @@
private int id;
- private int pid;
-
private String cnName;
private String enName;
- private int type;
-
private int status;
+
+ private int type;
private int category;
- private String tab;
-
- private int firm;
-
private String url;
-
- private String args;
private String test;
@@ -44,10 +36,6 @@
private String img;
- private int level;
-
- private int sort;
-
private int createUser;
private Timestamp createTime;
@@ -57,6 +45,10 @@
private Timestamp updateTime;
private String bak;
+
+ private String tab;
+
+ private String args;
private String createName;
@@ -71,14 +63,6 @@
public void setId(int id) {
this.id = id;
- }
-
- public int getPid() {
- return pid;
- }
-
- public void setPid(int pid) {
- this.pid = pid;
}
public String getCnName() {
@@ -97,20 +81,20 @@
this.enName = enName;
}
- public int getType() {
- return type;
- }
-
- public void setType(int type) {
- this.type = type;
- }
-
public int getStatus() {
return status;
}
public void setStatus(int status) {
this.status = status;
+ }
+
+ public int getType() {
+ return type;
+ }
+
+ public void setType(int type) {
+ this.type = type;
}
public int getCategory() {
@@ -121,36 +105,12 @@
this.category = category;
}
- public String getTab() {
- return tab;
- }
-
- public void setTab(String tab) {
- this.tab = tab;
- }
-
- public int getFirm() {
- return firm;
- }
-
- public void setFirm(int firm) {
- this.firm = firm;
- }
-
public String getUrl() {
return url;
}
public void setUrl(String url) {
this.url = url;
- }
-
- public String getArgs() {
- return args;
- }
-
- public void setArgs(String args) {
- this.args = args;
}
public String getTest() {
@@ -201,22 +161,6 @@
this.img = img;
}
- public int getLevel() {
- return level;
- }
-
- public void setLevel(int level) {
- this.level = level;
- }
-
- public int getSort() {
- return sort;
- }
-
- public void setSort(int sort) {
- this.sort = sort;
- }
-
public int getCreateUser() {
return createUser;
}
@@ -257,6 +201,22 @@
this.bak = bak;
}
+ public String getTab() {
+ return tab;
+ }
+
+ public void setTab(String tab) {
+ this.tab = tab;
+ }
+
+ public String getArgs() {
+ return args;
+ }
+
+ public void setArgs(String args) {
+ this.args = args;
+ }
+
public String getCreateName() {
return createName;
}
diff --git a/src/main/java/com/moon/server/helper/HttpHelper.java b/src/main/java/com/moon/server/helper/HttpHelper.java
index 77379ad..68f9d87 100644
--- a/src/main/java/com/moon/server/helper/HttpHelper.java
+++ b/src/main/java/com/moon/server/helper/HttpHelper.java
@@ -304,7 +304,7 @@
.replace("?" + res.getArgs() + "&", "?").replace("&" + res.getArgs() + "&", "&");
}
- if (StaticData.THREE == res.getFirm() && str.contains(StaticData.REST_LAYER)) {
+ if (StaticData.THREE == res.getCategory() && str.contains(StaticData.REST_LAYER)) {
str = str.replace(res.getUrl().replace("/v6/wmts/", StaticData.REST_LAYER), proxyUrl.replace("/proxy/", "/proxy/rest/"));
}
}
diff --git a/src/main/resources/mapper/sys/ResMapper.xml b/src/main/resources/mapper/sys/ResMapper.xml
index 23689b9..4ce5fc9 100644
--- a/src/main/resources/mapper/sys/ResMapper.xml
+++ b/src/main/resources/mapper/sys/ResMapper.xml
@@ -59,17 +59,17 @@
<insert id="insert" parameterType="com.moon.server.entity.sys.ResEntity">
insert into lf.sys_res
- (pid,cn_name,en_name,type,status,category,firm,url,test,descr,depid,dirid,img,level,sort,create_user,create_time,bak,tab,args)
+ (cn_name,en_name,status,type,category,url,test,descr,depid,dirid,img,create_user,create_time,bak,tab,args)
values
- (#{pid},#{cnName},#{enName},#{type},#{status},#{category},#{firm},#{url},#{test},#{descr},#{depid},#{dirid},#{img},#{level},#{sort},#{createUser},now(),#{bak},#{tab},#{args})
+ (#{cnName},#{enName},#{status},#{type},#{category},#{url},#{test},#{descr},#{depid},#{dirid},#{img},#{createUser},now(),#{bak},#{tab},#{args})
</insert>
<insert id="inserts">
insert into lf.sys_res
- (pid,cn_name,en_name,type,status,category,firm,url,test,descr,depid,dirid,img,level,sort,create_user,create_time,bak,tab,args)
+ (cn_name,en_name,status,type,category,url,test,descr,depid,dirid,img,create_user,create_time,bak,tab,args)
values
<foreach collection="list" item="item" index="index" separator=",">
- (#{item.pid},#{item.cnName},#{item.enName},#{item.type},#{item.status},#{item.category},#{item.firm},#{item.url},#{item.test},#{item.descr},#{item.depid},#{item.dirid},#{item.img},#{item.level},#{item.sort},#{item.createUser},now(),#{item.bak},#{item.tab},#{item.args})
+ (#{item.cnName},#{item.enName},#{item.status},#{item.type},#{item.category},#{item.url},#{item.test},#{item.descr},#{item.depid},#{item.dirid},#{item.img},#{item.createUser},now(),#{item.bak},#{item.tab},#{item.args})
</foreach>
</insert>
@@ -86,14 +86,14 @@
<update id="update">
update lf.sys_res
- set pid=#{pid},cn_name=#{cnName},en_name=#{enName},type=#{type},status=#{status},category=#{category},firm=#{firm},url=#{url},test=#{test},proxy=#{proxy},descr=#{descr},depid=#{depid},dirid=#{dirid},img=#{img},level=#{level},sort=#{sort},update_user=#{updateUser},update_time=now(),bak=#{bak},tab=#{tab},args=#{args}
+ set cn_name=#{cnName},en_name=#{enName},status=#{status},type=#{type},category=#{category},url=#{url},test=#{test},descr=#{descr},depid=#{depid},dirid=#{dirid},img=#{img},update_user=#{updateUser},update_time=now(),bak=#{bak},tab=#{tab},args=#{args}
where id=#{id}
</update>
<update id="updates">
<foreach collection="list" item="item" index="index" separator=";">
update lf.sys_res
- set pid=#{item.pid},cn_name=#{item.cnName},en_name=#{item.enName},type=#{item.type},status=#{item.status},category=#{item.category},firm=#{item.firm},url=#{item.url},test=#{item.test},proxy=#{item.proxy},descr=#{item.descr},depid=#{item.depid},dirid=#{item.dirid},img=#{item.img},level=#{item.level},sort=#{item.sort},update_user=#{item.updateUser},update_time=now(),bak=#{item.bak},tab=#{item.tab},args=#{item.args}
+ set cn_name=#{item.cnName},en_name=#{item.enName},status=#{item.status},type=#{item.type},category=#{item.category},url=#{item.url},test=#{item.test},descr=#{item.descr},depid=#{item.depid},dirid=#{item.dirid},img=#{item.img},update_user=#{item.updateUser},update_time=now(),bak=#{item.bak},tab=#{item.tab},args=#{item.args}
where id = #{item.id}
</foreach>
</update>
--
Gitblit v1.9.3