From b7c453de49343990a97fd033b39116bddfec816a Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 14 Jul 2021 20:47:53 +0800
Subject: [PATCH] 问题修复
---
src/main/java/org/springblade/modules/routeIn/controller/RouteinController.java | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/springblade/modules/routeIn/controller/RouteinController.java b/src/main/java/org/springblade/modules/routeIn/controller/RouteinController.java
index 056d12b..48ae46d 100644
--- a/src/main/java/org/springblade/modules/routeIn/controller/RouteinController.java
+++ b/src/main/java/org/springblade/modules/routeIn/controller/RouteinController.java
@@ -37,9 +37,10 @@
import javax.validation.Valid;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.List;
/**
- * 控制器
+ * 控制器
*
* @author BladeX
* @since 2020-07-15
@@ -72,6 +73,17 @@
public R<IPage<RouteinVO>> list(Routein routein, Query query) {
IPage<Routein> pages = routeinService.page(Condition.getPage(query), Condition.getQueryWrapper(routein));
return R.data(RouteinWrapper.build().pageVO(pages));
+ }
+
+ /**
+ * 分页
+ */
+ @GetMapping("/tree")
+ @ApiOperationSupport(order = 2)
+ @ApiOperation(value = "分页", notes = "传入routein")
+ public R<List<RouteinVO>> tree(Routein routein, Query query) {
+ List<RouteinVO> tree = routeinService.tree();
+ return R.data(tree);
}
@@ -129,6 +141,7 @@
/**
* 巡逻路线新增
+ *
* @param routeName
* @param regionId
* @param routeInfo
@@ -141,9 +154,9 @@
public R insertlx(String routeName, String regionId, String routeInfo, String creatName, String remarks, HttpServletResponse response) {
response.setHeader("Access-Control-Allow-Origin", "*");
response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
- response.setHeader("Access-Control-Allow-Credentials","true");
+ response.setHeader("Access-Control-Allow-Credentials", "true");
Routein routein = new Routein();
- String a="'LINESTRING("+routeInfo+")'";
+ String a = "'LINESTRING(" + routeInfo + ")'";
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String time = df.format(new Date());
routein.setRouteName(routeName);
@@ -160,6 +173,7 @@
/**
* 修改巡逻路线
+ *
* @param id
* @param routeName
* @param regionId
@@ -173,18 +187,19 @@
public R updatelx(Integer id, String routeName, String regionId, String routeInfo, String creatName, String remarks, HttpServletResponse response) {
response.setHeader("Access-Control-Allow-Origin", "*");
response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
- response.setHeader("Access-Control-Allow-Credentials","true");
- String a="'LINESTRING("+routeInfo+")'";
+ response.setHeader("Access-Control-Allow-Credentials", "true");
+ String a = "'LINESTRING(" + routeInfo + ")'";
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String time = df.format(new Date());
- routeinService.updatelx(id,routeName,regionId,a,time,creatName,remarks);
+ routeinService.updatelx(id, routeName, regionId, a, time, creatName, remarks);
return R.success("修改成功");
}
/**
* 巡逻路线查询
- * @param routeName 路线名称
+ *
+ * @param routeName 路线名称
* @param response
* @return
*/
@@ -192,7 +207,7 @@
public R selectList(String routeName, HttpServletResponse response) {
response.setHeader("Access-Control-Allow-Origin", "*");
response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
- response.setHeader("Access-Control-Allow-Credentials","true");
+ response.setHeader("Access-Control-Allow-Credentials", "true");
return R.data(routeinService.selectList(routeName));
}
}
--
Gitblit v1.9.3