From cd141865ed4082bb3218e3d197cacc5c412027cd Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 31 七月 2023 18:01:57 +0800
Subject: [PATCH] 修改图层管理的接口
---
/dev/null | 76 ------------
src/main/java/com/moon/server/controller/all/PermsController.java | 2
src/main/java/com/moon/server/mapper/sys/LayerMapper.java | 12 +-
src/main/java/com/moon/server/entity/sys/LayerEntity.java | 84 +++----------
src/main/java/com/moon/server/service/sys/LayerService.java | 18 +-
src/main/java/com/moon/server/controller/sys/LayerController.java | 56 +-------
src/main/resources/mapper/sys/LayerMapper.xml | 72 ++++++++++++
src/main/resources/application.yml | 12 +-
8 files changed, 125 insertions(+), 207 deletions(-)
diff --git a/src/main/java/com/moon/server/controller/all/PermsController.java b/src/main/java/com/moon/server/controller/all/PermsController.java
index 9394500..16db99a 100644
--- a/src/main/java/com/moon/server/controller/all/PermsController.java
+++ b/src/main/java/com/moon/server/controller/all/PermsController.java
@@ -5,7 +5,7 @@
import com.moon.server.entity.sys.ResEntity;
import com.moon.server.entity.sys.UserEntity;
import com.moon.server.service.all.PermsService;
-import com.moon.server.service.data.LayerService;
+import com.moon.server.service.sys.LayerService;
import com.moon.server.service.sys.MenuService;
import com.moon.server.service.sys.TokenService;
import com.moon.server.entity.all.*;
diff --git a/src/main/java/com/moon/server/controller/data/LayerController.java b/src/main/java/com/moon/server/controller/sys/LayerController.java
similarity index 76%
rename from src/main/java/com/moon/server/controller/data/LayerController.java
rename to src/main/java/com/moon/server/controller/sys/LayerController.java
index a1869d2..6462914 100644
--- a/src/main/java/com/moon/server/controller/data/LayerController.java
+++ b/src/main/java/com/moon/server/controller/sys/LayerController.java
@@ -1,11 +1,11 @@
-package com.moon.server.controller.data;
+package com.moon.server.controller.sys;
import com.moon.server.annotation.SysLog;
import com.moon.server.controller.all.BaseController;
import com.moon.server.entity.all.ResponseMsg;
-import com.moon.server.entity.data.LayerEntity;
+import com.moon.server.entity.sys.LayerEntity;
import com.moon.server.entity.sys.UserEntity;
-import com.moon.server.service.data.LayerService;
+import com.moon.server.service.sys.LayerService;
import com.moon.server.service.sys.TokenService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -18,10 +18,10 @@
import java.util.List;
/**
- * 鍥惧眰绠＄悊
+ * 鍥惧眰
* @author WWW
*/
-@Api(tags = "鏁版嵁绠＄悊\\鍥惧眰绠＄悊")
+@Api(tags = "杩愮淮绠＄悊\\鍥惧眰绠＄悊")
@RestController
@RequestMapping("/layer")
public class LayerController extends BaseController {
@@ -32,63 +32,25 @@
TokenService tokenService;
@SysLog()
- @ApiOperation(value = "鏌ヨ璁板綍鏁�")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "cnName", value = "涓枃鍚嶇О", dataType = "String", paramType = "query", required = false, example = "")
- })
- @GetMapping({"/selectCount"})
- public ResponseMsg<Integer> selectCount(String cnName) {
- try {
- int count = layerService.selectCount(cnName);
-
- return success(count);
- } catch (Exception ex) {
- return fail(ex, -1);
- }
- }
-
- @SysLog()
- @ApiOperation(value = "鍒嗛〉鏌ヨ")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "cnName", value = "涓枃鍚嶇О", dataType = "String", paramType = "query", example = ""),
- @ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
- @ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
- })
- @GetMapping(value = "/selectByPage")
- public ResponseMsg<List<LayerEntity>> selectByPage(String cnName, Integer pageSize, Integer pageIndex) {
- try {
- if (pageSize < 1 || pageIndex < 1) {
- return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
- }
-
- List<LayerEntity> rs = layerService.selectByPage(cnName, pageSize, pageSize * (pageIndex - 1));
-
- return success(rs);
- } catch (Exception ex) {
- return fail(ex, null);
- }
- }
-
- @SysLog()
@ApiOperation(value = "鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
@ApiImplicitParams({
- @ApiImplicitParam(name = "cnName", value = "涓枃鍚嶇О", dataType = "String", paramType = "query", example = ""),
+ @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = ""),
@ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
@ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/selectByPageAndCount")
- public ResponseMsg<List<LayerEntity>> selectByPageAndCount(String cnName, Integer pageSize, Integer pageIndex) {
+ public ResponseMsg<List<LayerEntity>> selectByPageAndCount(String name, Integer pageSize, Integer pageIndex) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
}
- int count = layerService.selectCount(cnName);
+ int count = layerService.selectCount(name);
if (count == 0) {
return success(0, null);
}
- List<LayerEntity> rs = layerService.selectByPage(cnName, pageSize, pageSize * (pageIndex - 1));
+ List<LayerEntity> rs = layerService.selectByPage(name, pageSize, pageSize * (pageIndex - 1));
return success(count, rs);
} catch (Exception ex) {
diff --git a/src/main/java/com/moon/server/entity/data/LayerEntity.java b/src/main/java/com/moon/server/entity/sys/LayerEntity.java
similarity index 68%
rename from src/main/java/com/moon/server/entity/data/LayerEntity.java
rename to src/main/java/com/moon/server/entity/sys/LayerEntity.java
index 915175b..c02bbc7 100644
--- a/src/main/java/com/moon/server/entity/data/LayerEntity.java
+++ b/src/main/java/com/moon/server/entity/sys/LayerEntity.java
@@ -1,4 +1,4 @@
-package com.moon.server.entity.data;
+package com.moon.server.entity.sys;
import java.io.Serializable;
import java.sql.Timestamp;
@@ -8,7 +8,7 @@
* @author WWW
*/
public class LayerEntity implements Serializable {
- private static final long serialVersionUID = -159911666139919168L;
+ private static final long serialVersionUID = -371902381708800000L;
private int id;
@@ -20,9 +20,7 @@
private String url;
- private String testUrl;
-
- private int type;
+ private int isLayer;
private String icon;
@@ -30,7 +28,7 @@
private int orderNum;
- private int isShow;
+ private int status;
private int createUser;
@@ -42,17 +40,11 @@
private String bak;
- private String serveType;
-
- private String dataType;
-
private double elev;
- private String ns;
+ private int resid;
- private Integer pubid;
-
- private Integer isProject;
+ private int type;
public LayerEntity() {
}
@@ -97,20 +89,12 @@
this.url = url;
}
- public String getTestUrl() {
- return testUrl;
+ public int getIsLayer() {
+ return isLayer;
}
- public void setTestUrl(String testUrl) {
- this.testUrl = testUrl;
- }
-
- public int getType() {
- return type;
- }
-
- public void setType(int type) {
- this.type = type;
+ public void setIsLayer(int isLayer) {
+ this.isLayer = isLayer;
}
public String getIcon() {
@@ -137,12 +121,12 @@
this.orderNum = orderNum;
}
- public int getIsShow() {
- return isShow;
+ public int getStatus() {
+ return status;
}
- public void setIsShow(int isShow) {
- this.isShow = isShow;
+ public void setStatus(int status) {
+ this.status = status;
}
public int getCreateUser() {
@@ -185,22 +169,6 @@
this.bak = bak;
}
- public String getServeType() {
- return serveType;
- }
-
- public void setServeType(String serveType) {
- this.serveType = serveType;
- }
-
- public String getDataType() {
- return dataType;
- }
-
- public void setDataType(String dataType) {
- this.dataType = dataType;
- }
-
public double getElev() {
return elev;
}
@@ -209,27 +177,19 @@
this.elev = elev;
}
- public String getNs() {
- return ns;
+ public int getResid() {
+ return resid;
}
- public void setNs(String ns) {
- this.ns = ns;
+ public void setResid(int resid) {
+ this.resid = resid;
}
- public Integer getPubid() {
- return pubid;
+ public int getType() {
+ return type;
}
- public void setPubid(Integer pubid) {
- this.pubid = pubid;
- }
-
- public Integer getIsProject() {
- return isProject;
- }
-
- public void setIsProject(Integer isProject) {
- this.isProject = isProject;
+ public void setType(int type) {
+ this.type = type;
}
}
diff --git a/src/main/java/com/moon/server/mapper/data/LayerMapper.java b/src/main/java/com/moon/server/mapper/sys/LayerMapper.java
similarity index 82%
rename from src/main/java/com/moon/server/mapper/data/LayerMapper.java
rename to src/main/java/com/moon/server/mapper/sys/LayerMapper.java
index 35aac9d..1aa15b6 100644
--- a/src/main/java/com/moon/server/mapper/data/LayerMapper.java
+++ b/src/main/java/com/moon/server/mapper/sys/LayerMapper.java
@@ -1,6 +1,6 @@
-package com.moon.server.mapper.data;
+package com.moon.server.mapper.sys;
-import com.moon.server.entity.data.LayerEntity;
+import com.moon.server.entity.sys.LayerEntity;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
@@ -16,20 +16,20 @@
/**
* 鏌ヨ璁板綍鏁�
*
- * @param cnName 涓枃鍚嶇О
+ * @param name 鍚嶇О
* @return 璁板綍鏁�
*/
- public Integer selectCount(String cnName);
+ public Integer selectCount(String name);
/**
* 鍒嗛〉鏌ヨ
*
- * @param cnName 涓枃鍚嶇О
+ * @param name 鍚嶇О
* @param limit 璁板綍鏁�
* @param offset 鍋忕Щ閲�
* @return 鍒楄〃
*/
- public List<LayerEntity> selectByPage(String cnName, Integer limit, Integer offset);
+ public List<LayerEntity> selectByPage(String name, Integer limit, Integer offset);
/**
* 鏌ヨ鎵�鏈�
diff --git a/src/main/java/com/moon/server/service/data/LayerService.java b/src/main/java/com/moon/server/service/sys/LayerService.java
similarity index 71%
rename from src/main/java/com/moon/server/service/data/LayerService.java
rename to src/main/java/com/moon/server/service/sys/LayerService.java
index 38c2c12..cd502b7 100644
--- a/src/main/java/com/moon/server/service/data/LayerService.java
+++ b/src/main/java/com/moon/server/service/sys/LayerService.java
@@ -1,8 +1,8 @@
-package com.moon.server.service.data;
+package com.moon.server.service.sys;
-import com.moon.server.entity.data.LayerEntity;
+import com.moon.server.entity.sys.LayerEntity;
import com.moon.server.helper.StringHelper;
-import com.moon.server.mapper.data.LayerMapper;
+import com.moon.server.mapper.sys.LayerMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -18,17 +18,17 @@
LayerMapper layerMapper;
@Override
- public Integer selectCount(String cnName) {
- cnName = StringHelper.getLikeUpperStr(cnName);
+ public Integer selectCount(String name) {
+ name = StringHelper.getLikeUpperStr(name);
- return layerMapper.selectCount(cnName);
+ return layerMapper.selectCount(name);
}
@Override
- public List<LayerEntity> selectByPage(String cnName, Integer limit, Integer offset) {
- cnName = StringHelper.getLikeUpperStr(cnName);
+ public List<LayerEntity> selectByPage(String name, Integer limit, Integer offset) {
+ name = StringHelper.getLikeUpperStr(name);
- return layerMapper.selectByPage(cnName, limit, offset);
+ return layerMapper.selectByPage(name, limit, offset);
}
@Override
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index c121a8b..7b24574 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -12,10 +12,10 @@
# redis
redis:
database: 0
- host: 127.0.0.1
+ host: 192.168.20.83
port: 6369
password: rediS_5L#F4_Server
- timeout: 10000 # 杩炴帴瓒呮椂鏃堕暱锛堟绉掞級
+ timeout: 90000 # 杩炴帴瓒呮椂鏃堕暱锛堟绉掞級
lettuce:
pool:
max-active: 1000 # 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堜娇鐢ㄨ礋鍊艰〃绀烘病鏈夐檺鍒讹級
@@ -42,11 +42,11 @@
datasource:
name: prod
# JDBC 鍩烘湰閰嶇疆 ¤tSchema=public
- #url: jdbc:postgresql://192.168.20.83:5433/moon?useAffectedRows=true
- url: jdbc:postgresql://127.0.0.1:5433/moon?useAffectedRows=true
+ url: jdbc:postgresql://192.168.20.83:5433/moon?useAffectedRows=true
+ #url: jdbc:postgresql://127.0.0.1:5433/moon?useAffectedRows=true
username : postgres
- #password: Postgres!_14_moon
- password: postgres
+ password: Postgres!_14_moon
+ #password: postgres
driver-class-name: org.postgresql.Driver
platform: POSTGRESQL
type: com.alibaba.druid.pool.DruidDataSource
diff --git a/src/main/resources/mapper/data/LayerMapper.xml b/src/main/resources/mapper/data/LayerMapper.xml
deleted file mode 100644
index 31d7d43..0000000
--- a/src/main/resources/mapper/data/LayerMapper.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.moon.server.mapper.data.LayerMapper">
- <select id="selectCount" resultType="java.lang.Integer">
- select count(*) from lf.sys_layer
- <where>
- <if test="cnName != null">
- upper(cn_name) like #{cnName}
- </if>
- </where>
- </select>
-
- <select id="selectByPage" resultType="com.moon.server.entity.data.LayerEntity">
- select * from lf.sys_layer
- <where>
- <if test="cnName != null">
- upper(cn_name) like #{cnName}
- </if>
- </where>
- order by id
- limit #{limit} offset #{offset}
- </select>
-
- <select id="selectAll" resultType="com.moon.server.entity.data.LayerEntity">
- select (select ns from lf.sys_dict b where b.field = 'gid' and b.tab = a.en_name) "ns", a.*
- from lf.sys_layer a
- order by id;
- </select>
-
- <select id="selectById" resultType="com.moon.server.entity.data.LayerEntity">
- select * from lf.sys_layer where id = #{id}
- </select>
-
- <insert id="insert" parameterType="com.moon.server.entity.data.LayerEntity">
- insert into lf.sys_layer
- (pid,cn_name,en_name,url,test_url,type,icon,level,order_num,is_show,create_user,create_time,bak,serve_type,data_type,elev,is_project)
- values
- (#{pid},#{cnName},#{enName},#{url},#{testUrl},#{type},#{icon},#{level},#{orderNum},#{isShow},#{createUser},now(),#{bak},#{serveType},#{dataType},#{elev},#{isProject})
- </insert>
-
- <insert id="inserts">
- insert into lf.sys_layer
- (pid,cn_name,en_name,url,test_url,type,icon,level,order_num,is_show,create_user,create_time,bak,serve_type,data_type,elev,is_project)
- values
- <foreach collection="list" item="item" index="index" separator=",">
- (#{item.pid},#{item.cnName},#{item.enName},#{item.url},#{item.testUrl},#{item.type},#{item.icon},#{item.level},#{item.orderNum},#{item.isShow},#{item.createUser},now(),#{item.bak},#{item.serveType},#{item.dataType},#{item.elev},#{item.isProject})
- </foreach>
- </insert>
-
- <delete id="delete">
- delete from lf.sys_layer where id = #{id}
- </delete>
-
- <delete id="deletes">
- delete from lf.sys_layer where id in
- <foreach item="id" collection="ids" index="index" open="(" separator="," close=")">
- #{id}
- </foreach>
- </delete>
-
- <update id="update">
- update lf.sys_layer
- set pid=#{pid},cn_name=#{cnName},en_name=#{enName},url=#{url},test_url=#{testUrl},type=#{type},icon=#{icon},level=#{level},order_num=#{orderNum},is_show=#{isShow},update_user=#{updateUser},update_time=now(),bak=#{bak},serve_type=#{serveType},data_type=#{dataType},elev=#{elev},is_project=#{isProject}
- where id=#{id}
- </update>
-
- <update id="updates">
- <foreach collection="list" item="item" index="index" separator=";">
- update lf.sys_layer
- <set>
- pid=#{item.pid},cn_name=#{item.cnName},en_name=#{item.enName},url=#{item.url},test_url=#{item.testUrl},type=#{item.type},icon=#{item.icon},level=#{item.level},order_num=#{item.orderNum},is_show=#{item.isShow},update_user=#{item.updateUser},update_time=now(),bak=#{item.bak},serve_type=#{item.serveType},data_type=#{item.dataType},elev=#{item.elev},is_project=#{item.isProject}
- </set>
- where id = #{item.id}
- </foreach>
- </update>
-</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/sys/LayerMapper.xml b/src/main/resources/mapper/sys/LayerMapper.xml
new file mode 100644
index 0000000..24aff44
--- /dev/null
+++ b/src/main/resources/mapper/sys/LayerMapper.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.moon.server.mapper.sys.LayerMapper">
+ <select id="selectCount" resultType="java.lang.Integer">
+ select count(*) from lf.sys_layer
+ <where>
+ <if test="name != null">
+ upper(cn_name) like #{name} or upper(en_name) like #{name}
+ </if>
+ </where>
+ </select>
+
+ <select id="selectByPage" resultType="com.moon.server.entity.sys.LayerEntity">
+ select * from lf.sys_layer
+ <where>
+ <if test="name != null">
+ upper(cn_name) like #{name} or upper(en_name) like #{name}
+ </if>
+ </where>
+ order by id desc
+ limit #{limit} offset #{offset}
+ </select>
+
+ <select id="selectAll" resultType="com.moon.server.entity.sys.LayerEntity">
+ select * from lf.sys_layer order by id desc;
+ </select>
+
+ <select id="selectById" resultType="com.moon.server.entity.sys.LayerEntity">
+ select * from lf.sys_layer where id = #{id}
+ </select>
+
+ <insert id="insert" parameterType="com.moon.server.entity.sys.LayerEntity">
+ insert into lf.sys_layer
+ (pid,cn_name,en_name,url,is_layer,icon,level,order_num,status,create_user,create_time,bak,elev,resid,type)
+ values
+ (#{pid},#{cnName},#{enName},#{url},#{isLayer},#{icon},#{level},#{orderNum},#{status},#{createUser},now(),#{bak},#{elev},#{resid},#{type})
+ </insert>
+
+ <insert id="inserts">
+ insert into lf.sys_layer
+ (pid,cn_name,en_name,url,is_layer,icon,level,order_num,status,create_user,create_time,bak,elev,resid,type)
+ values
+ <foreach collection="list" item="item" index="index" separator=",">
+ (#{item.pid},#{item.cnName},#{item.enName},#{item.url},#{item.isLayer},#{item.icon},#{item.level},#{item.orderNum},#{item.status},#{item.createUser},now(),#{item.bak},#{item.elev},#{item.resid},#{item.type})
+ </foreach>
+ </insert>
+
+ <delete id="delete">
+ delete from lf.sys_layer where id = #{id}
+ </delete>
+
+ <delete id="deletes">
+ delete from lf.sys_layer where id in
+ <foreach item="id" collection="ids" index="index" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </delete>
+
+ <update id="update">
+ update lf.sys_layer
+ set pid=#{pid},cn_name=#{cnName},en_name=#{enName},url=#{url},is_layer=#{isLayer},icon=#{icon},level=#{level},order_num=#{orderNum},status=#{status},update_user=#{updateUser},update_time=now(),bak=#{bak},elev=#{elev},resid=#{resid},type=#{type}
+ where id=#{id}
+ </update>
+
+ <update id="updates">
+ <foreach collection="list" item="item" index="index" separator=";">
+ update lf.sys_layer
+ set pid=#{item.pid},cn_name=#{item.cnName},en_name=#{item.enName},url=#{item.url},is_layer=#{item.isLayer},icon=#{item.icon},level=#{item.level},order_num=#{item.orderNum},status=#{item.status},update_user=#{item.updateUser},update_time=now(),bak=#{item.bak},elev=#{item.elev},resid=#{item.resid},type=#{item.type}
+ where id = #{item.id}
+ </foreach>
+ </update>
+</mapper>
\ No newline at end of file
--
Gitblit v1.9.3