From 224591306e6bdcc0051787e759ef0c082757a30a Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 24 十一月 2022 11:32:39 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/data/DomainController.java | 12 +++---
src/main/java/com/lf/server/controller/data/MetaController.java | 5 ++
src/main/java/com/lf/server/mapper/data/DomainMapper.java | 7 +++
src/main/resources/mapper/data/DomainMapper.xml | 14 ++++---
src/main/java/com/lf/server/controller/show/ExportController.java | 2
data/日报.txt | 33 +++++++++++++++-
src/main/java/com/lf/server/service/data/DomainService.java | 6 +++
7 files changed, 63 insertions(+), 16 deletions(-)
diff --git "a/data/\346\227\245\346\212\245.txt" "b/data/\346\227\245\346\212\245.txt"
index e2b8244..6a1e6d5 100644
--- "a/data/\346\227\245\346\212\245.txt"
+++ "b/data/\346\227\245\346\212\245.txt"
@@ -105,7 +105,7 @@
涓嬪懆锛�
1锛塛eb寮�鍙戯細寮�鍙戞煡璇㈠姛鑳斤紙鐐规煡璇€�佺嚎鏌ヨ銆佺煩褰㈡煡璇€�佸渾鏌ヨ锛夈��
2锛夋湇鍔″紑鍙戯細寮�鍙戣祫婧愭棩蹇椼�佷护鐗岀鐞嗐�佺郴缁熼厤缃帴鍙ｃ��
-=========================================2022-11-10
+=========================================2022-11-17
鏈懆锛�
1 Web寮�鍙戯細
1锛夌患鍚堝睍绀猴細
@@ -125,5 +125,34 @@
涓嬪懆锛�
1锛塛eb寮�鍙戯細寮�鍙戞煡璇㈠姛鑳斤紙鐭╁舰鏌ヨ銆佸渾鏌ヨ锛夈�佸湪绾垮埗鍥惧姛鑳姐��
2锛夋湇鍔″紑鍙戯細寮�鍙戞暟鎹笂浼犮�佹爣缁樸�佸湪绾垮埗鍥炬帴鍙ｃ��
-=========================================
+=========================================2022-11-24
+鏈懆锛�
+1 Web寮�鍙戯細
+1锛夌患鍚堝睍绀猴細
+寮�鍙戝湪绾垮埗鍥惧姛鑳斤紙杩涜涓級
+2锛夋暟鎹鐞�
+淇敼瀛楀吀绠＄悊鍔熻兘锛�
+寮�鍙戞暟鎹笂浼狅紙鏁版嵁涓婁紶銆佸叆搴撴暟鎹級椤甸潰锛�
+寮�鍙戞暟鎹叆搴擄紙鏁版嵁鍏ュ簱銆佸叆搴撴暟鎹級椤甸潰锛�
+寮�鍙戞暟鎹绱㈠姛鑳斤紙杩涜涓級銆�
+
+2 鏈嶅姟寮�鍙戯細
+1锛夋惌寤哄湪绾垮埗鍥惧悗鍙版湇鍔★紱
+2锛夌紪杈戝嚭鍥炬ā鏉匡紝寮�鍙戝嚭鍥捐剼鏈紙杩涜涓級锛�
+3锛夊紑鍙戞暟鎹绱㈡帴鍙ｏ紙鏌ヨ璁板綍鏁般�佸垎椤垫煡璇€�佹煡璇㈣褰曠殑WKT锛夛紱
+4锛夊紑鍙戞暟鎹笂浼犵殑鍚庡彴鎺ュ彛锛�
+5锛夊紑鍙戞暟鎹叆搴撶殑鍚庡彴鎺ュ彛銆�
+
+涓嬪懆锛�
+1 Web寮�鍙戯細
+1锛夊紑鍙戞煡璇㈠姛鑳斤紙鐭╁舰鏌ヨ銆佸渾鏌ヨ锛夛紱
+2锛夊湪绾垮埗鍥惧姛鑳斤紙缁х画锛夛紱
+3锛夊畬鍠勬暟鎹笂浼犮�佹暟鎹叆搴撻〉闈€��
+
+2 鏈嶅姟寮�鍙戯細
+1锛夊畬鍠勫湪绾垮埗鍥炬湇鍔★紱
+2锛変慨鏀笹DAL璇诲彇shp銆乬db鎺ュ彛锛�
+3锛夊紑鍙戞绱㈡暟鎹殑妯＄硦鎼滅储銆佹煡璇㈢敤鎴枫�佹煡璇㈠崟浣嶆帴鍙ｏ紱
+4锛変慨鏀规暟鎹笂浼犵殑鍒嗛〉鏌ヨ璁板綍鏁般�佹煡璇㈡枃浠躲�佹煡璇㈡槧灏勬帴鍙ｃ��
+=========================================
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 ca12ef2..96a8929 100644
--- a/src/main/java/com/lf/server/controller/data/DomainController.java
+++ b/src/main/java/com/lf/server/controller/data/DomainController.java
@@ -82,8 +82,8 @@
@ApiOperation(value = "鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
@ApiImplicitParams({
@ApiImplicitParam(name = "ns", value = "鍚嶇О绌洪棿", dataType = "String", paramType = "query", example = "bd"),
- @ApiImplicitParam(name = "tab", value = "琛ㄥ悕", dataType = "String", paramType = "query", example = "dlg_25w_aanp"),
- @ApiImplicitParam(name = "code", value = "缂栫爜", dataType = "String", paramType = "query", example = "210"),
+ @ApiImplicitParam(name = "tab", value = "琛ㄥ悕", dataType = "String", paramType = "query", example = "b_hy20w_s23"),
+ @ApiImplicitParam(name = "code", value = "缂栫爜", dataType = "String", paramType = "query", example = "1"),
@ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
@ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
})
@@ -121,11 +121,11 @@
}
@SysLog()
- @ApiOperation(value = "鏌ヨ鎵�鏈夎〃")
- @GetMapping(value = "/selectTabs")
- public ResponseMsg<List<TabEntity>> selectTabs() {
+ @ApiOperation(value = "鏌ヨ鍊煎煙琛ㄩ泦鍚�")
+ @GetMapping(value = "/selectDomainTabs")
+ public ResponseMsg<List<TabEntity>> selectDomainTabs() {
try {
- List<TabEntity> list = baseQueryService.selectTabs();
+ List<TabEntity> list = domainService.selectDomainTabs();
return success(list);
} catch (Exception ex) {
diff --git a/src/main/java/com/lf/server/controller/data/MetaController.java b/src/main/java/com/lf/server/controller/data/MetaController.java
index 2aee7da..a693ada 100644
--- a/src/main/java/com/lf/server/controller/data/MetaController.java
+++ b/src/main/java/com/lf/server/controller/data/MetaController.java
@@ -291,8 +291,11 @@
@RequestMapping(value = "/downloadFile", method = RequestMethod.GET)
public void downloadFile(@RequestBody DownloadReqEntity reqEntity, HttpServletRequest req, HttpServletResponse res) {
try {
+ if (null == reqEntity || StringHelper.isEmpty(reqEntity.getPwd())) {
+ WebHelper.writeInfo(HttpStatus.BAD_REQUEST, "瀵嗙爜涓嶈兘涓虹┖", res);
+ }
if (StringHelper.isEmpty(reqEntity.getGuid())) {
- WebHelper.writeInfo(HttpStatus.UNAUTHORIZED, "鎵句笉鍒版枃浠禝D", res);
+ WebHelper.writeInfo(HttpStatus.BAD_REQUEST, "鎵句笉鍒版枃浠禝D", res);
return;
}
diff --git a/src/main/java/com/lf/server/controller/show/ExportController.java b/src/main/java/com/lf/server/controller/show/ExportController.java
index 67fc1e8..2dea184 100644
--- a/src/main/java/com/lf/server/controller/show/ExportController.java
+++ b/src/main/java/com/lf/server/controller/show/ExportController.java
@@ -113,7 +113,7 @@
public void downloadFile(String guid, HttpServletRequest req, HttpServletResponse res) {
try {
if (StringHelper.isEmpty(guid)) {
- WebHelper.writeInfo(HttpStatus.UNAUTHORIZED, "鎵句笉鍒版枃浠禝D", res);
+ WebHelper.writeInfo(HttpStatus.BAD_REQUEST, "鎵句笉鍒版枃浠禝D", res);
return;
}
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 ba3c00e..3cd65bd 100644
--- a/src/main/java/com/lf/server/mapper/data/DomainMapper.java
+++ b/src/main/java/com/lf/server/mapper/data/DomainMapper.java
@@ -1,5 +1,6 @@
package com.lf.server.mapper.data;
+import com.lf.server.entity.ctrl.TabEntity;
import com.lf.server.entity.data.DomainEntity;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
@@ -51,6 +52,12 @@
public DomainEntity selectById(int id);
/**
+ * 鏌ヨ鍊煎煙琛ㄩ泦鍚�
+ * @return
+ */
+ public List<TabEntity> selectDomainTabs();
+
+ /**
* 鎻掑叆涓�鏉�
*
* @param entity
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 02a5452..28ca3eb 100644
--- a/src/main/java/com/lf/server/service/data/DomainService.java
+++ b/src/main/java/com/lf/server/service/data/DomainService.java
@@ -1,5 +1,6 @@
package com.lf.server.service.data;
+import com.lf.server.entity.ctrl.TabEntity;
import com.lf.server.entity.data.DomainEntity;
import com.lf.server.helper.StringHelper;
import com.lf.server.mapper.data.DomainMapper;
@@ -42,6 +43,11 @@
}
@Override
+ public List<TabEntity> selectDomainTabs() {
+ return domainMapper.selectDomainTabs();
+ }
+
+ @Override
public Integer insert(DomainEntity entity) {
return domainMapper.insert(entity);
}
diff --git a/src/main/resources/mapper/data/DomainMapper.xml b/src/main/resources/mapper/data/DomainMapper.xml
index dabd06a..ec20698 100644
--- a/src/main/resources/mapper/data/DomainMapper.xml
+++ b/src/main/resources/mapper/data/DomainMapper.xml
@@ -2,24 +2,22 @@
<!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">
- select count(a.*) from lf.sys_domain a
- where exists (select * from lf.sys_dict b where b.ns = #{ns}
+ select count(a.*) from lf.sys_domain a inner join lf.sys_dict b on a.dom_name = b.domain_na
+ where b.ns = #{ns}
<if test="tab != null">
and b.tab = #{tab}
</if>
- )
<if test="code != null">
and a.dom_code like #{code}
</if>
</select>
<select id="selectByPage" resultType="com.lf.server.entity.data.DomainEntity">
- select a.* from lf.sys_domain a
- where exists (select * from lf.sys_dict b where b.ns = #{ns}
+ select a.* from lf.sys_domain a inner join lf.sys_dict b on a.dom_name = b.domain_na
+ where b.ns = #{ns}
<if test="tab != null">
and b.tab = #{tab}
</if>
- )
<if test="code != null">
and a.dom_code like #{code}
</if>
@@ -35,6 +33,10 @@
select * from lf.sys_domain where id = #{id}
</select>
+ <select id="selectDomainTabs" resultType="com.lf.server.entity.ctrl.TabEntity">
+ select distinct ns,tab,tab_desc,tableType from lf.sys_dict where domain_na is not null order by ns,tab
+ </select>
+
<insert id="insert" parameterType="com.lf.server.entity.data.DomainEntity">
insert into lf.sys_domain
(dom_desc,dom_name,dom_code,code_desc,level,orderid,bsm,create_user,create_time,bak)
--
Gitblit v1.9.3