From db78fd0347326b3b06c4b6a7353757c4f4a8d4ae Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 03 十一月 2022 16:07:04 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/data/DomainController.java | 23 ++++++-----
data/db_fn.sql | 8 +--
src/main/java/com/lf/server/mapper/data/DomainMapper.java | 10 +++--
src/main/resources/mapper/data/DomainMapper.xml | 20 +++-------
src/main/java/com/lf/server/service/data/DomainService.java | 12 ++----
5 files changed, 32 insertions(+), 41 deletions(-)
diff --git a/data/db_fn.sql b/data/db_fn.sql
index 42ad05a..39d027a 100644
--- a/data/db_fn.sql
+++ b/data/db_fn.sql
@@ -270,13 +270,11 @@
ST_PolygonFromText('POLYGON ((115.94927385452 32.3754479115071 0,121.989371092554 32.2766788010181 0,121.850621222894 29.6874200067864 0,115.9727267226 29.7835368627922 0,115.94927385452 32.3754479115071 0))', 4326))
select a.* from lf.sys_domain a inner join lf.sys_dict b on a.dom_name = b.domain_na
-where b.ns = 'bd' and b.tab = 'dlg_25w_hyda' and b.domain_na is not null;
+where b.ns = 'bd' and b.tab = 'dlg_25w_aanp' and b.domain_na is not null;
-select * from lf.sys_dict where ns = 'bd' and tab = 'dlg_25w_hyda' and domain_na is not null;
+select * from lf.sys_dict where ns = 'bd' and tab = 'dlg_25w_aanp' and domain_na is not null;
select * from lf.sys_domain where dom_name='dlg25gbcode';
-select * from bd.dlg_25w_aanp;
-
-
+select * from bd.dlg_25w_aanp limit 10;
diff --git a/src/main/java/com/lf/server/controller/data/DomainController.java b/src/main/java/com/lf/server/controller/data/DomainController.java
index f116a58..766f459 100644
--- a/src/main/java/com/lf/server/controller/data/DomainController.java
+++ b/src/main/java/com/lf/server/controller/data/DomainController.java
@@ -39,12 +39,13 @@
@SysLog()
@ApiOperation(value = "鏌ヨ璁板綍鏁�")
@ApiImplicitParams({
- @ApiImplicitParam(name = "domName", value = "鍊煎煙琛ㄥ悕", dataType = "String", paramType = "query", required = false, example = "")
+ @ApiImplicitParam(name = "ns", value = "鍚嶇О绌洪棿", dataType = "String", paramType = "query", example = "bd"),
+ @ApiImplicitParam(name = "tab", value = "琛ㄥ悕", dataType = "String", paramType = "query", example = "dlg_25w_aanp")
})
@GetMapping({"/selectCount"})
- public ResponseMsg<Integer> selectCount(String domName) {
+ public ResponseMsg<Integer> selectCount(String ns, String tab) {
try {
- int count = domainService.selectCount(domName);
+ int count = domainService.selectCount(ns, tab);
return success(count);
} catch (Exception ex) {
@@ -55,18 +56,19 @@
@SysLog()
@ApiOperation(value = "鍒嗛〉鏌ヨ")
@ApiImplicitParams({
- @ApiImplicitParam(name = "domName", value = "鍊煎煙琛ㄥ悕", dataType = "String", paramType = "query", example = ""),
+ @ApiImplicitParam(name = "ns", value = "鍚嶇О绌洪棿", dataType = "String", paramType = "query", example = "bd"),
+ @ApiImplicitParam(name = "tab", value = "琛ㄥ悕", dataType = "String", paramType = "query", example = "dlg_25w_aanp"),
@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<DomainEntity>> selectByPage(String domName, Integer pageSize, Integer pageIndex) {
+ public ResponseMsg<List<DomainEntity>> selectByPage(String ns, String tab, Integer pageSize, Integer pageIndex) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
}
- List<DomainEntity> rs = domainService.selectByPage(domName, pageSize, pageSize * (pageIndex - 1));
+ List<DomainEntity> rs = domainService.selectByPage(ns, tab, pageSize, pageSize * (pageIndex - 1));
return success(rs);
} catch (Exception ex) {
@@ -77,23 +79,24 @@
@SysLog()
@ApiOperation(value = "鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
@ApiImplicitParams({
- @ApiImplicitParam(name = "domName", value = "鍊煎煙琛ㄥ悕", dataType = "String", paramType = "query", example = ""),
+ @ApiImplicitParam(name = "ns", value = "鍚嶇О绌洪棿", dataType = "String", paramType = "query", example = "bd"),
+ @ApiImplicitParam(name = "tab", value = "琛ㄥ悕", dataType = "String", paramType = "query", example = "dlg_25w_aanp"),
@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<DomainEntity>> selectByPageAndCount(String domName, Integer pageSize, Integer pageIndex) {
+ public ResponseMsg<List<DomainEntity>> selectByPageAndCount(String ns, String tab, Integer pageSize, Integer pageIndex) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
}
- int count = domainService.selectCount(domName);
+ int count = domainService.selectCount(ns, tab);
if (count == 0) {
return success(0, null);
}
- List<DomainEntity> rs = domainService.selectByPage(domName, pageSize, pageSize * (pageIndex - 1));
+ List<DomainEntity> rs = domainService.selectByPage(ns, tab, pageSize, pageSize * (pageIndex - 1));
return success(count, rs);
} catch (Exception ex) {
diff --git a/src/main/java/com/lf/server/mapper/data/DomainMapper.java b/src/main/java/com/lf/server/mapper/data/DomainMapper.java
index 5998db7..560ae3c 100644
--- a/src/main/java/com/lf/server/mapper/data/DomainMapper.java
+++ b/src/main/java/com/lf/server/mapper/data/DomainMapper.java
@@ -16,20 +16,22 @@
/**
* 鏌ヨ璁板綍鏁�
*
- * @param domName 鍊煎煙琛ㄥ悕
+ * @param ns 鍚嶇О绌洪棿
+ * @param tab 琛ㄥ悕
* @return 璁板綍鏁�
*/
- public Integer selectCount(String domName);
+ public Integer selectCount(String ns, String tab);
/**
* 鍒嗛〉鏌ヨ
*
- * @param domName 鍊煎煙琛ㄥ悕
+ * @param ns 鍚嶇О绌洪棿
+ * @param tab 琛ㄥ悕
* @param limit 璁板綍琛�
* @param offset 鍋忕Щ閲�
* @return 鍒楄〃
*/
- public List<DomainEntity> selectByPage(String domName, Integer limit, Integer offset);
+ public List<DomainEntity> selectByPage(String ns, String tab, Integer limit, Integer offset);
/**
* 鏌ヨ鎵�鏈�
diff --git a/src/main/java/com/lf/server/service/data/DomainService.java b/src/main/java/com/lf/server/service/data/DomainService.java
index b0e05f3..874b622 100644
--- a/src/main/java/com/lf/server/service/data/DomainService.java
+++ b/src/main/java/com/lf/server/service/data/DomainService.java
@@ -18,17 +18,13 @@
DomainMapper domainMapper;
@Override
- public Integer selectCount(String domName) {
- domName = StringHelper.getLikeStr(domName);
-
- return domainMapper.selectCount(domName);
+ public Integer selectCount(String ns, String tab) {
+ return domainMapper.selectCount(ns, tab);
}
@Override
- public List<DomainEntity> selectByPage(String domName, Integer limit, Integer offset) {
- domName = StringHelper.getLikeStr(domName);
-
- return domainMapper.selectByPage(domName, limit, offset);
+ public List<DomainEntity> selectByPage(String ns, String tab, Integer limit, Integer offset) {
+ return domainMapper.selectByPage(ns, tab, limit, offset);
}
@Override
diff --git a/src/main/resources/mapper/data/DomainMapper.xml b/src/main/resources/mapper/data/DomainMapper.xml
index c981494..0934068 100644
--- a/src/main/resources/mapper/data/DomainMapper.xml
+++ b/src/main/resources/mapper/data/DomainMapper.xml
@@ -1,23 +1,15 @@
<?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.lf.server.mapper.data.DomainMapper">
- <select id="selectCount" resultType="java.lang.Integer" parameterType="java.lang.String">
- select count(*) from lf.sys_domain
- <where>
- <if test="domName != null">
- dom_name like #{domName}
- </if>
- </where>
+ <select id="selectCount" resultType="java.lang.Integer">
+ select count(*) from lf.sys_domain a inner join lf.sys_dict b on a.dom_name = b.domain_na
+ where b.ns = #{ns} and b.tab = #{tab} and b.domain_na is not null
</select>
<select id="selectByPage" resultType="com.lf.server.entity.data.DomainEntity">
- select * from lf.sys_domain
- <where>
- <if test="domName != null">
- dom_name like #{domName}
- </if>
- </where>
- order by id
+ select a.* from lf.sys_domain a inner join lf.sys_dict b on a.dom_name = b.domain_na
+ where b.ns = #{ns} and b.tab = #{tab} and b.domain_na is not null
+ order by a.id
limit #{limit} offset #{offset}
</select>
--
Gitblit v1.9.3