From 73e8f38ca1c41290d129dddbce3cb7136c7b4c89 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 19 十月 2022 17:24:19 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/config/InitConfig.java | 13 ++++
/dev/null | 9 ---
src/main/java/com/lf/server/controller/show/ComprehensiveController.java | 68 ++++++++++++++++++++++
src/main/java/com/lf/server/entity/all/ResponseMsg.java | 12 ++--
说明.txt | 9 ++
src/main/java/com/lf/server/entity/bd/DlgAgnp.java | 11 ---
src/main/java/com/lf/server/controller/all/BaseController.java | 4
src/main/java/com/lf/server/service/show/ComprehensiveService.java | 37 ++++++++++++
src/main/resources/application.yml | 2
src/main/java/com/lf/server/mapper/bd/DlgAgnpMapper.java | 14 +++-
10 files changed, 145 insertions(+), 34 deletions(-)
diff --git a/src/main/java/com/lf/server/config/InitConfig.java b/src/main/java/com/lf/server/config/InitConfig.java
index 3c93526..2f2a82b 100644
--- a/src/main/java/com/lf/server/config/InitConfig.java
+++ b/src/main/java/com/lf/server/config/InitConfig.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.lf.server.entity.bd.DlgAgnp;
import com.lf.server.helper.PathHelper;
@@ -59,8 +60,12 @@
}
}
+ /**
+ * 娴嬭瘯 Mybatis-Plus
+ */
private void testMybatisPlus() {
DlgAgnp dlg = dlgAgnpMapper.selectById(1);
+ dlg = dlgAgnpMapper.selectOne(2);
Map<String, Object> map = new HashMap<String, Object>(3);
map.put("gid", 2);
@@ -88,10 +93,16 @@
// 椤垫暟 / 姣忛〉璁板綍鏁�
Page<DlgAgnp> page = new Page<>(1, 10);
- // 鍒嗛〉 / 鍙傛暟浜岋細wrapper鏌ヨ鏉′欢
+ // 鍗囧簭鎺掑簭
+ page.addOrder(OrderItem.asc("gid"));
+ // 鍒嗛〉锛歐rapper鏌ヨ鏉′欢
Page<DlgAgnp> userPage = dlgAgnpMapper.selectPage(page, null);
// 鎬婚〉鏁� / 鎬昏褰曟暟锛�325 / 3247
String str = userPage.getPages() + " / " + userPage.getTotal();
List<DlgAgnp> list4 = userPage.getRecords();
+
+ QueryWrapper<DlgAgnp> w3 = new QueryWrapper<>();
+ w3.like("name", "澶�").ge("gid", 100);
+ List<DlgAgnp> list5 = dlgAgnpMapper.selectList(w3);
}
}
diff --git a/src/main/java/com/lf/server/controller/all/BaseController.java b/src/main/java/com/lf/server/controller/all/BaseController.java
index bbbbe1a..f581ce0 100644
--- a/src/main/java/com/lf/server/controller/all/BaseController.java
+++ b/src/main/java/com/lf/server/controller/all/BaseController.java
@@ -20,11 +20,11 @@
return new ResponseMsg<T>(HttpStatus.OK, msg, result);
}
- public <T> ResponseMsg<T> success(int count, T result) {
+ public <T> ResponseMsg<T> success(long count, T result) {
return new ResponseMsg<T>(HttpStatus.OK, count, result);
}
- public <T> ResponseMsg<T> success(String msg, int count, T result) {
+ public <T> ResponseMsg<T> success(String msg, long count, T result) {
return new ResponseMsg<T>(HttpStatus.OK, msg, count, result);
}
diff --git a/src/main/java/com/lf/server/controller/show/ComprehensiveController.java b/src/main/java/com/lf/server/controller/show/ComprehensiveController.java
new file mode 100644
index 0000000..0554c7d
--- /dev/null
+++ b/src/main/java/com/lf/server/controller/show/ComprehensiveController.java
@@ -0,0 +1,68 @@
+package com.lf.server.controller.show;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.lf.server.aspect.SysLog;
+import com.lf.server.controller.all.BaseController;
+import com.lf.server.entity.all.ResponseMsg;
+import com.lf.server.entity.bd.DlgAgnp;
+import com.lf.server.service.show.ComprehensiveService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 缁煎悎灞曠ず
+ * @author WWW
+ */
+@Api(tags = "缁煎悎灞曠ず\\缁煎悎灞曠ず")
+@RestController
+@RequestMapping("/comprehensive")
+public class ComprehensiveController extends BaseController {
+ @Autowired
+ ComprehensiveService comprehensiveService;
+
+ @SysLog()
+ @ApiOperation(value = "鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟-鍦板悕鍦板潃")
+ @ApiImplicitParams({
+ @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 = "/selectAddrByPage")
+ public ResponseMsg<List<DlgAgnp>> selectAddrByPage(String name, Integer pageSize, Integer pageIndex) {
+ try {
+ if (pageSize < 1 || pageIndex < 1) {
+ return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
+ }
+
+ Page<DlgAgnp> paged = comprehensiveService.selectAddrByPage(name, pageSize, pageIndex);
+
+ return success(paged.getTotal(), paged.getRecords());
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏍规嵁ID鏌ヨ-鍦板悕鍦板潃")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "ID", dataType = "Integer", paramType = "query", example = "1")
+ })
+ @GetMapping(value = "/selectAddrById")
+ public ResponseMsg<DlgAgnp> selectAddrById(Integer id) {
+ try {
+ DlgAgnp entity = comprehensiveService.selectAddrById(id);
+
+ return success(entity);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+}
diff --git a/src/main/java/com/lf/server/controller/show/PipelineController.java b/src/main/java/com/lf/server/controller/show/PipelineController.java
deleted file mode 100644
index b4c3ffe..0000000
--- a/src/main/java/com/lf/server/controller/show/PipelineController.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.lf.server.controller.show;
-
-/**
- * 绠￠亾璧勬枡
- * @author sws
- * @date 2022-09-22
- */
-public class PipelineController {
-}
diff --git a/src/main/java/com/lf/server/entity/all/ResponseMsg.java b/src/main/java/com/lf/server/entity/all/ResponseMsg.java
index 7b2e488..3ebb385 100644
--- a/src/main/java/com/lf/server/entity/all/ResponseMsg.java
+++ b/src/main/java/com/lf/server/entity/all/ResponseMsg.java
@@ -31,7 +31,7 @@
this.time = time;
}
- public ResponseMsg(HttpStatus code, int count, T result) {
+ public ResponseMsg(HttpStatus code, long count, T result) {
this.code = code.getValue();
this.msg = this.code == 200 ? "鎴愬姛" : "澶辫触";
this.count = count;
@@ -39,7 +39,7 @@
this.time = System.currentTimeMillis();
}
- public ResponseMsg(HttpStatus code, String msg, int count, T result) {
+ public ResponseMsg(HttpStatus code, String msg, long count, T result) {
this.code = code.getValue();
this.msg = msg;
this.count = count;
@@ -47,7 +47,7 @@
this.time = System.currentTimeMillis();
}
- public ResponseMsg(int code, String msg, int count, T result, long time) {
+ public ResponseMsg(int code, String msg, long count, T result, long time) {
this.code = code;
this.msg = msg;
this.count = count;
@@ -59,7 +59,7 @@
private String msg;
- private int count;
+ private long count;
private T result;
@@ -81,11 +81,11 @@
this.msg = msg;
}
- public int getCount() {
+ public long getCount() {
return count;
}
- public void setCount(int count) {
+ public void setCount(long count) {
this.count = count;
}
diff --git a/src/main/java/com/lf/server/entity/bd/DlgAgnp.java b/src/main/java/com/lf/server/entity/bd/DlgAgnp.java
index ab9a8e2..02fd03c 100644
--- a/src/main/java/com/lf/server/entity/bd/DlgAgnp.java
+++ b/src/main/java/com/lf/server/entity/bd/DlgAgnp.java
@@ -29,9 +29,6 @@
@TableField(select = false)
private String geom;
- @TableField(select = false)
- private String eventId;
-
public int getGid() {
return gid;
}
@@ -62,13 +59,5 @@
public void setGeom(String geom) {
this.geom = geom;
- }
-
- public String getEventId() {
- return eventId;
- }
-
- public void setEventId(String eventId) {
- this.eventId = eventId;
}
}
diff --git a/src/main/java/com/lf/server/mapper/bd/DlgAgnpMapper.java b/src/main/java/com/lf/server/mapper/bd/DlgAgnpMapper.java
index 5ccecc5..51249ff 100644
--- a/src/main/java/com/lf/server/mapper/bd/DlgAgnpMapper.java
+++ b/src/main/java/com/lf/server/mapper/bd/DlgAgnpMapper.java
@@ -2,14 +2,22 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.lf.server.entity.bd.DlgAgnp;
-import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Repository;
/**
* 鍦板悕鍦板潃
- * @author
+ * @author WWW
*/
@Repository
public interface DlgAgnpMapper extends BaseMapper<DlgAgnp> {
- // 鎵�鏈夌殑crud閮界紪鍐欏畬鎴愪簡
+ /**
+ * 鏌ヨ涓�鏉�
+ *
+ * @param gid
+ * @return
+ */
+ @Select("select gid,gb,name,st_astext(geom) geom from bd.dlg_agnp where gid = #{gid}")
+ DlgAgnp selectOne(@Param("gid") Integer gid);
}
diff --git a/src/main/java/com/lf/server/service/show/ComprehensiveService.java b/src/main/java/com/lf/server/service/show/ComprehensiveService.java
new file mode 100644
index 0000000..8aa17e5
--- /dev/null
+++ b/src/main/java/com/lf/server/service/show/ComprehensiveService.java
@@ -0,0 +1,37 @@
+package com.lf.server.service.show;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.lf.server.entity.bd.DlgAgnp;
+import com.lf.server.helper.StringHelper;
+import com.lf.server.mapper.bd.DlgAgnpMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 缁煎悎灞曠ず
+ * @author WWW
+ */
+@Service
+public class ComprehensiveService {
+ @Autowired
+ DlgAgnpMapper dlgAgnpMapper;
+
+ public Page<DlgAgnp> selectAddrByPage(String name, Integer pageSize, Integer pageIndex) {
+ Page<DlgAgnp> paging = new Page<>(pageIndex, pageSize);
+ paging.addOrder(OrderItem.asc("gid"));
+
+ QueryWrapper<DlgAgnp> wrapper = null;
+ if (!StringHelper.isEmpty(name)) {
+ wrapper = new QueryWrapper<>();
+ wrapper.like("name", name.trim());
+ }
+
+ return dlgAgnpMapper.selectPage(paging, wrapper);
+ }
+
+ public DlgAgnp selectAddrById(Integer id) {
+ return dlgAgnpMapper.selectOne(id);
+ }
+}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 135fc59..906290e 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -38,7 +38,7 @@
# datasource
datasource:
name: prod
- # JDBC 鍩烘湰閰嶇疆
+ # JDBC 鍩烘湰閰嶇疆 ¤tSchema=public
url: jdbc:postgresql://192.168.20.39:5433/langfang?useAffectedRows=true
username : postgres
password: postgres
diff --git "a/\350\257\264\346\230\216.txt" "b/\350\257\264\346\230\216.txt"
index 07039d2..c05e803 100644
--- "a/\350\257\264\346\230\216.txt"
+++ "b/\350\257\264\346\230\216.txt"
@@ -8,6 +8,9 @@
7.瑙ｅ喅Swagger-UI鏃犳硶浼犻�扖ookie淇℃伅
8.楠岃瘉瀵嗙爜澶嶆潅搴�(8-20浣嶅寘鍚瓧姣嶃�佹暟瀛楀拰鐗规畩瀛楃)
9.浣跨敤GDAL璇诲彇tif銆乻hp銆乬db鏂囦欢
+a.娣诲姞Mybatis Plus缁勪欢
+b.瑙ｅ喅琛ㄦ槧灏勫嚭閿欍�佹牴鎹甀D鏌ヨ澶辫触銆佸垎椤垫棤鏁堢瓑闂
+
-----------------------------------------------
.鍚庡彴鏈嶅姟璁块棶娣诲姞鐧诲綍楠岃瘉鎷︽埅鍣�
.寮�鍙戝垏闈㈡棩蹇楀姛鑳�
@@ -17,6 +20,8 @@
.Redis鏈嶅姟閰嶇疆寮哄瘑鐮�
.娣诲姞鎵归噺淇敼鐢ㄦ埛瀵嗙爜鎺ュ彛
.淇敼鎵�鏈夌殑鎵归噺鏂板銆佸垹闄ゃ�佷慨鏀规帴鍙�
+.寮�鍙戝ぇ鏂囦欢涓婁紶鎺ュ彛
+.瑙ｅ喅涓婁紶鏂囦欢鏃跺疄浣撶被鏄犲皠寮傚父
-----------------------------------------------
1.涓婁紶鏂囦欢锛坈ommons-fileupload锛� *
@@ -49,7 +54,9 @@
java鍜宩s瀹炵幇aes鍔犲瘑瑙ｅ瘑锛�
https://blog.csdn.net/weixin_30663839/article/details/114049667
-
+http://192.168.20.39:12306/
+http://192.168.20.39:12315/
+http://192.168.20.39:12316/
----------------------------------------------------------------------------------------------------
String path = System.getProperty("user.dir");
--
Gitblit v1.9.3