From 8b7258c9427882bb1798f1502eaa35184c6e374e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:29:18 +0800
Subject: [PATCH] 短信指定楼栋发送
---
src/main/java/org/springblade/modules/place/controller/PlaceController.java | 84 +++++++++++++++++++++++++++++++++++++----
1 files changed, 75 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/controller/PlaceController.java b/src/main/java/org/springblade/modules/place/controller/PlaceController.java
index e2ffbf0..c7ed438 100644
--- a/src/main/java/org/springblade/modules/place/controller/PlaceController.java
+++ b/src/main/java/org/springblade/modules/place/controller/PlaceController.java
@@ -44,6 +44,7 @@
import org.springblade.core.boot.ctrl.BladeController;
import org.springframework.web.multipart.MultipartFile;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -90,7 +91,7 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页page", notes = "传入place")
public R<IPage<PlaceVO>> page(PlaceVO place, Query query) {
- bladeLogger.info("blade-place_page", JsonUtil.toJson(place));
+ bladeLogger.info("场所列表查询", JsonUtil.toJson(place));
IPage<PlaceVO> pages = placeService.selectPlacePage(Condition.getPage(query), place);
return R.data(pages);
}
@@ -103,7 +104,7 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "九小场所档案", notes = "传入place")
public R<IPage<PlaceVO>> ninePage(PlaceVO place, Query query) {
- bladeLogger.info("blade-place_ninePage", JsonUtil.toJson(place));
+ bladeLogger.info("九小场所档案列表查询", JsonUtil.toJson(place));
IPage<PlaceVO> pages = placeService.selectNinePlacePage(Condition.getPage(query), place);
return R.data(pages);
}
@@ -116,7 +117,7 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "企业商超列表查询", notes = "传入place")
public R<IPage<PlaceVO>> mallPage(PlaceVO place, Query query) {
- bladeLogger.info("blade-place_mallPage", JsonUtil.toJson(place));
+ bladeLogger.info("企业商超列表查询", JsonUtil.toJson(place));
IPage<PlaceVO> pages = placeService.selectMallPage(Condition.getPage(query), place);
return R.data(pages);
}
@@ -140,7 +141,7 @@
@ApiLog("场所自定义新增")
@ApiOperation(value = "自定义新增", notes = "传入place")
public R add(@RequestBody PlaceVO placeVO){
- bladeLogger.info("场所自定义新增", JsonUtil.toJson(placeVO));
+ bladeLogger.info("场所信息采集/修改", JsonUtil.toJson(placeVO));
return R.status(placeService.addOrUpdate(placeVO));
}
@@ -154,7 +155,7 @@
@ApiLog("场所自定义新增/修改")
@ApiOperation(value = "自定义新增/修改", notes = "传入place")
public R addOrUpdate(@RequestBody PlaceVO placeVO){
- bladeLogger.info("场所自定义新增/修改", JsonUtil.toJson(placeVO));
+ bladeLogger.info("场所信息采集/修改", JsonUtil.toJson(placeVO));
return R.status(placeService.addOrUpdate(placeVO));
}
@@ -244,7 +245,7 @@
@ApiLog("场所表 自定义详情查询")
@ApiOperation(value = "场所表 自定义详情查询", notes = "传入ids")
public R<PlaceVO> getDetail(PlaceVO place) {
- bladeLogger.info("场所表 自定义详情查询", JsonUtil.toJson(place));
+ bladeLogger.info("场所表详情查询", JsonUtil.toJson(place));
return R.data(placeService.getDetail(place));
}
@@ -254,9 +255,56 @@
*/
@PostMapping("/import-place")
public R importPlace(MultipartFile file, Integer isCovered) {
- PlaceImporter placeImporter = new PlaceImporter(placeService, isCovered == 1);
- ExcelUtil.save(file, placeImporter, PlaceExcel.class);
- return R.success("操作成功");
+ bladeLogger.info("场所信息批量导入", JsonUtil.toJson(isCovered));
+ String data = placeService.importPlace(ExcelUtil.read(file, ImportPlaceExcel.class),isCovered==1);
+ return R.data(200,data,"");
+ }
+
+ /**
+ * 导出场所信息
+ */
+ @GetMapping("export-place")
+ @ApiOperationSupport(order = 13)
+ @ApiLog("导出场所信息")
+ @ApiOperation(value = "导出场所信息", notes = "传入place")
+ public void exportPlace(PlaceVO place, HttpServletResponse response) {
+ List<ExportPlaceExcel> list = placeService.exportPlaceList(place);
+ ExcelUtil.export(response, "场所数据管理" + DateUtil.time(), "场所数据表", list, ExportPlaceExcel.class);
+ }
+
+ /**
+ * 导出模板
+ */
+ @GetMapping("export-template")
+ @ApiOperationSupport(order = 13)
+ @ApiLog("导出九小统计")
+ @ApiOperation(value = "导出九小统计", notes = "传入place")
+ public void exportTemplate(HttpServletResponse response) {
+ List<ImportPlaceExcel> list = new ArrayList<>();
+ ImportPlaceExcel importPlaceExcel = new ImportPlaceExcel();
+ importPlaceExcel.setHouseCode("AdiEQ41254122****SXFDK44");
+ importPlaceExcel.setLocation("江西上饶**********");
+ importPlaceExcel.setLng("128.754451241");
+ importPlaceExcel.setLat("28.4521122441");
+ importPlaceExcel.setStreetName("西市街道");
+ importPlaceExcel.setCommunityName("万达社区");
+ importPlaceExcel.setGridName("第一网格");
+ importPlaceExcel.setPlaceName("***场所");
+ importPlaceExcel.setPrincipal("张三");
+ importPlaceExcel.setPrincipalPhone("13112341234");
+ importPlaceExcel.setPrincipalIdCard("360***********0001");
+ importPlaceExcel.setLegalPerson("张三");
+ importPlaceExcel.setLegalTel("13112341234");
+ importPlaceExcel.setLegalIdCard("360***********0001");
+ importPlaceExcel.setNineType("1");
+ importPlaceExcel.setFrontType("1");
+ importPlaceExcel.setThreeFireProtection("是");
+ importPlaceExcel.setNoExplosionCategory("2");
+ importPlaceExcel.setLabelCode("131120");
+ importPlaceExcel.setRemark("测试****");
+
+ list.add(importPlaceExcel);
+ ExcelUtil.export(response, "场所数据" + DateUtil.time(), "场所数据表", list, ImportPlaceExcel.class);
}
/**
@@ -330,4 +378,22 @@
public R placeDoorBindHandle() {
return R.data(placeService.placeDoorBindHandle());
}
+
+
+ // 查询附近1公里的场所列表
+ @GetMapping("/getNearbyPlaceList")
+ public R getNearbyPlaceList(@RequestParam("lat") String lat, @RequestParam("lng") String lng) {
+ return R.data(placeService.getNearbyPlaceList(lat, lng));
+ }
+
+ /**
+ * 更新场所的POI标签颜色
+ * @param placeId
+ * @param color
+ * @return
+ */
+ @GetMapping("/updatePoiLabelColor")
+ public R updatePoiLabelColor(@RequestParam("placeId") Long placeId, @RequestParam("color") String color) {
+ return R.data(placeService.updatePoiLabelColor(placeId, color));
+ }
}
--
Gitblit v1.9.3