From a093b470d5f9ce57c05ad610312d4af69688a18b Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 07 十月 2023 15:01:32 +0800
Subject: [PATCH] 添加地块实体类、Mapper映射类
---
src/main/java/com/smartearth/poiexcel/controller/EntController.java | 62 ++++++++++++++++++++++++-------
1 files changed, 48 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/smartearth/poiexcel/controller/EntController.java b/src/main/java/com/smartearth/poiexcel/controller/EntController.java
index 025ac18..3d71423 100644
--- a/src/main/java/com/smartearth/poiexcel/controller/EntController.java
+++ b/src/main/java/com/smartearth/poiexcel/controller/EntController.java
@@ -6,7 +6,6 @@
import com.smartearth.poiexcel.entity.ResponseMsg;
import com.smartearth.poiexcel.entity.StaticData;
import com.smartearth.poiexcel.mapper.EntMapper;
-import com.smartearth.poiexcel.mapper.QiYeMapper;
import com.smartearth.poiexcel.service.EntService;
import com.smartearth.poiexcel.utils.HttpUtils;
import com.smartearth.poiexcel.utils.StringHelper;
@@ -15,7 +14,6 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -34,6 +32,7 @@
@Api(tags = "浼佷笟鎺у埗鍣�")
@RestController
@RequestMapping("/ent")
+@SuppressWarnings("ALL")
public class EntController extends BaseController {
@Resource
EntService entService;
@@ -41,11 +40,23 @@
@Resource
EntMapper entMapper;
- @Resource
- QiYeMapper qiYeMapper;
-
@Value("${address.code.url}")
private String addressCodeUrl;
+
+ @ApiOperation(value = "鏍规嵁鍚嶇О妯＄硦鏌ヨ浼佷笟")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "name", value = "浼佷笟鍚嶇О鎴栧湴鍧�", dataType = "String", paramType = "query", example = "")
+ })
+ @GetMapping({"/selectByName"})
+ public ResponseMsg<Object> selectByName(String name) {
+ try {
+ List<EntEntity> list = entMapper.selectByName(StringHelper.getLikeStr(name));
+
+ return success(null == list ? 0 : list.size(), list);
+ } catch (Exception ex) {
+ return fail(ex, -1);
+ }
+ }
@ApiOperation(value = "鏌ヨ浠ょ墝")
@GetMapping({"/selectToken"})
@@ -59,7 +70,7 @@
}
}
- @ApiOperation(value = "鏌ヨ浼佷笟")
+ @ApiOperation(value = "鏌ヨ浼佷笟淇℃伅")
@ApiImplicitParams({
@ApiImplicitParam(name = "token", value = "浠ょ墝", dataType = "String", paramType = "query", example = ""),
@ApiImplicitParam(name = "startDate", value = "寮�濮嬫棩鏈�", dataType = "String", paramType = "query", example = "2023-06-29"),
@@ -130,19 +141,42 @@
}
}
+ @ApiOperation(value = "鍒嗛〉鏌ヨ浼佷笟")
+ @ApiImplicitParams({
+ @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<Object> selectByPage(Integer pageSize, Integer pageIndex) {
+ try {
+ if (null == pageSize || pageSize < 1) {
+ pageSize = 10;
+ }
+ if (null == pageIndex || pageIndex < 1) {
+ pageIndex = 1;
+ }
+ int count = entMapper.selectCount();
+ List<EntEntity> list = entMapper.selectByPage(pageSize, StaticData.I100 * (pageIndex - 1));
+
+ return success(count, list);
+ } catch (Exception ex) {
+ return fail(ex, -1);
+ }
+ }
+
@ApiOperation(value = "鎵归噺鏇存柊浼佷笟鍧愭爣")
@GetMapping({"/updateCoords"})
public ResponseMsg<Object> updateCoords() {
try {
int rows = 0;
- int count = qiYeMapper.selectCount();
+ int count = entMapper.selectCount();
if (0 == count) {
return success("娌℃湁鏁版嵁闇�瑕佹洿鏂�", count);
}
int pages = (count - 1) / StaticData.I100 + 1;
- for (int i = 0; i < pages; i++) {
- List<EntEntity> list = qiYeMapper.selectByPage(StaticData.I100, StaticData.I100 * (i - 1));
+ for (int i = 1; i <= pages; i++) {
+ List<EntEntity> list = entMapper.selectByPage(StaticData.I100, StaticData.I100 * (i - 1));
if (null == list || list.isEmpty()) {
continue;
}
@@ -153,7 +187,7 @@
}
}
- rows += qiYeMapper.updates(list);
+ rows += entMapper.updates(list);
}
return success(rows);
@@ -183,7 +217,7 @@
}
JSONObject object = jsonArray.getJSONObject(0);
- String addr = object.getString("formatted_address");
+ /*String addr = object.getString("formatted_address");
if (StringHelper.isEmpty(addr)) {
return;
}
@@ -192,12 +226,12 @@
if (encoding != null) {
addr = new String(addr.getBytes(encoding));
}
- // ent.setAddress(addr)
+ ent.setAddress(addr);*/
String location = object.getString("location");
String[] split = location.split(",");
- ent.setX(Double.parseDouble(split[1]));
- ent.setY(Double.parseDouble(split[0]));
+ ent.setX(Double.parseDouble(split[0]));
+ ent.setY(Double.parseDouble(split[1]));
} catch (Exception ex) {
log.error(ex.getMessage(), ex);
}
--
Gitblit v1.9.3