From 9971fb096b13c0e219ac1ef7f5b7cce1e814df00 Mon Sep 17 00:00:00 2001 From: guo Date: Tue, 19 Sep 2023 18:45:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=B1=E5=9F=BA=E5=9D=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DeepExcavationCurrentDataController.java | 12 -- .../DeepExcavationEngineeringController.java | 39 ------ .../DeepExcavationMeasurePointController.java | 41 ------ ...vationMeasurePointThresholdController.java | 122 ------------------ .../DeepExcavationPlaneFigureController.java | 41 ------ ...vationPlaneFigureCoordinateController.java | 70 ---------- .../DeepExcavationSensorTypeController.java | 70 ---------- 7 files changed, 395 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/city/deepexcavation/controller/DeepExcavationCurrentDataController.java b/src/main/java/com/zhgd/xmgl/modules/city/deepexcavation/controller/DeepExcavationCurrentDataController.java index 18c04a9..79ac033 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/deepexcavation/controller/DeepExcavationCurrentDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/deepexcavation/controller/DeepExcavationCurrentDataController.java @@ -73,17 +73,5 @@ public class DeepExcavationCurrentDataController { return Result.success(deepExcavationCurrentDataService.selectDeepExcavationCurrentDataPage(map)); } - /** - * 添加 - * - * @param deepExcavationCurrentData - * @return - */ - @ApiOperation(value = "添加深基坑-监测实时数据信息", notes = "添加深基坑-监测实时数据信息", httpMethod = "POST") - @PostMapping(value = "/add") - public Result add(@RequestBody DeepExcavationCurrentData deepExcavationCurrentData) { - deepExcavationCurrentDataService.saveDeepExcavationCurrentData(deepExcavationCurrentData); - return Result.success(deepExcavationCurrentData); - } } diff --git a/src/main/java/com/zhgd/xmgl/modules/city/deepexcavation/controller/DeepExcavationEngineeringController.java b/src/main/java/com/zhgd/xmgl/modules/city/deepexcavation/controller/DeepExcavationEngineeringController.java index 6e8b26a..3d42e37 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/deepexcavation/controller/DeepExcavationEngineeringController.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/deepexcavation/controller/DeepExcavationEngineeringController.java @@ -67,45 +67,6 @@ public class DeepExcavationEngineeringController { return Result.success(deepExcavationEngineeringService.selectDeepExcavationList(map)); } - /** - * 添加 - * - * @param deepExcavationEngineering - * @return - */ - @ApiOperation(value = "添加深基坑-工程信息", notes = "添加深基坑-工程信息", httpMethod = "POST") - @PostMapping(value = "/add") - public Result add(@RequestBody DeepExcavationEngineering deepExcavationEngineering) { - deepExcavationEngineeringService.saveDeepExcavationEngineering(deepExcavationEngineering); - return Result.ok(); - } - - /** - * 编辑 - * - * @param deepExcavationEngineering - * @return - */ - @ApiOperation(value = "编辑深基坑-工程信息", notes = "编辑深基坑-工程信息", httpMethod = "POST") - @PostMapping(value = "/edit") - public Result edit(@RequestBody DeepExcavationEngineering deepExcavationEngineering) { - return Result.success(deepExcavationEngineeringService.edit(deepExcavationEngineering)); - } - - /** - * 通过id删除 - * - * @param - * @return - */ - @ApiOperation(value = "删除深基坑-工程信息", notes = "删除深基坑-工程信息", httpMethod = "POST") - @ApiImplicitParam(name = "id", value = "深基坑-工程ID", paramType = "query", required = true, dataType = "Integer") - @PostMapping(value = "/delete") - public Result delete(@RequestBody Map map) { - deepExcavationEngineeringService.deleteDeepExcavationEngineering(MapUtils.getLong(map, "id")); - return Result.ok(); - } - /** * 通过id查询 diff --git a/src/main/java/com/zhgd/xmgl/modules/city/deepexcavation/controller/DeepExcavationMeasurePointController.java b/src/main/java/com/zhgd/xmgl/modules/city/deepexcavation/controller/DeepExcavationMeasurePointController.java index 1097d1a..b29b4a9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/deepexcavation/controller/DeepExcavationMeasurePointController.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/deepexcavation/controller/DeepExcavationMeasurePointController.java @@ -74,47 +74,6 @@ public class DeepExcavationMeasurePointController { return Result.success(deepExcavationMeasurePointService.selectDeepExcavationAllMeasurePointList(map)); } - /** - * 添加 - * - * @param deepExcavationMeasurePoint - * @return - */ - @ApiOperation(value = "添加深基坑-测点信息", notes = "添加深基坑-测点信息", httpMethod = "POST") - @PostMapping(value = "/add") - public Result add(@RequestBody DeepExcavationMeasurePoint deepExcavationMeasurePoint) { - deepExcavationMeasurePointService.saveMeasurePoint(deepExcavationMeasurePoint); - return Result.ok(); - } - - /** - * 编辑 - * - * @param deepExcavationMeasurePoint - * @return - */ - @ApiOperation(value = "编辑测点", notes = "编辑测点", httpMethod = "POST") - @PostMapping(value = "/edit") - public Result edit(@RequestBody DeepExcavationMeasurePoint deepExcavationMeasurePoint) { - deepExcavationMeasurePointService.editMeasurePoint(deepExcavationMeasurePoint); - return Result.ok(); - } - - /** - * 通过id删除 - * - * @param - * @return - */ - @ApiOperation(value = "删除深基坑-测点信息", notes = "删除深基坑-测点信息") - @ApiImplicitParam(name = "measurePointNumber", value = "深基坑-测点编号", paramType = "query", required = true, dataType = "Integer") - @PostMapping(value = "/delete") - public Result delete(@RequestBody Map map) { - deepExcavationMeasurePointService.deleteByMeasurePointNumber(MapUtils.getString(map, "measurePointNumber")); - return Result.ok(); - } - - /** * 通过id查询 * diff --git a/src/main/java/com/zhgd/xmgl/modules/city/deepexcavation/controller/DeepExcavationMeasurePointThresholdController.java b/src/main/java/com/zhgd/xmgl/modules/city/deepexcavation/controller/DeepExcavationMeasurePointThresholdController.java index e248487..094ad3f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/deepexcavation/controller/DeepExcavationMeasurePointThresholdController.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/deepexcavation/controller/DeepExcavationMeasurePointThresholdController.java @@ -18,128 +18,6 @@ import org.springframework.web.bind.annotation.RestController; @Slf4j @Api("DeepExcavationMeasurePointThresholdController相关Api") public class DeepExcavationMeasurePointThresholdController { -// -// -// /** -// * 分页列表查询 -// * -// * @param deepExcavationMeasurePointThreshold -// * @param pageNo -// * @param pageSize -// * @param req -// * @return -// */ -// @ApiOperation(value = "分页列表查询深基坑-测点警情设置信息", notes = "分页列表查询深基坑-测点警情设置信息", httpMethod = "GET") -// @GetMapping(value = "/list") -// -// public Result> queryPageList(DeepExcavationMeasurePointThreshold deepExcavationMeasurePointThreshold, -// @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, -// @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, -// HttpServletRequest req) { -// // TODO 问题 -// Result> result = new Result>(); -// QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(deepExcavationMeasurePointThreshold, req.getParameterMap()); -// Page page = new Page(pageNo, pageSize); -// IPage pageList = deepExcavationMeasurePointThresholdService.page(page, queryWrapper); -// result.setSuccess(true); -// result.setResult(pageList); -// return null; -// } -// -// /** -// * 添加 -// * -// * @param deepExcavationMeasurePointThreshold -// * @return -// */ -// @ApiOperation(value = "添加深基坑-测点警情设置信息", notes = "添加深基坑-测点警情设置信息", httpMethod = "POST") -// @PostMapping(value = "/add") -// public Result add(@RequestBody DeepExcavationMeasurePointThreshold deepExcavationMeasurePointThreshold) { -// Result result = new Result(); -// try { -// // TODO 问题 -//// deepExcavationMeasurePointThresholdService.save(deepExcavationMeasurePointThreshold); -// result.success("添加成功！"); -// } catch (Exception e) { -// e.printStackTrace(); -// log.info(e.getMessage()); -// result.error500("操作失败"); -// } -// return result; -// } -// -// /** -// * 编辑 -// * -// * @param deepExcavationMeasurePointThreshold -// * @return -// */ -// @ApiOperation(value = "编辑深基坑-测点警情设置信息", notes = "编辑深基坑-测点警情设置信息", httpMethod = "PUT") -// @PutMapping(value = "/edit") -// public Result edit(@RequestBody DeepExcavationMeasurePointThreshold deepExcavationMeasurePointThreshold) { -//// Result result = new Result(); -//// DeepExcavationMeasurePointThreshold deepExcavationMeasurePointThresholdEntity = deepExcavationMeasurePointThresholdService.getById(deepExcavationMeasurePointThreshold.getId()); -//// if (deepExcavationMeasurePointThresholdEntity == null) { -//// result.error500("未找到对应实体"); -//// } else { -//// boolean ok = deepExcavationMeasurePointThresholdService.updateById(deepExcavationMeasurePointThreshold); -//// //TODO 返回false说明什么？ -//// if (ok) { -//// result.success("修改成功!"); -//// } -//// } -//// -//// return result; -// return null; -// } -// -// /** -// * 通过id删除 -// * -// * @param id -// * @return -// */ -// @ApiOperation(value = "删除深基坑-测点警情设置信息", notes = "删除深基坑-测点警情设置信息", httpMethod = "DELETE") -// @ApiImplicitParam(name = "id", value = "深基坑-测点警情设置ID", paramType = "query", required = true, dataType = "Integer") -// @DeleteMapping(value = "/delete") -// public Result delete(@RequestParam(name = "id", required = true) String id) { -//// Result result = new Result(); -//// DeepExcavationMeasurePointThreshold deepExcavationMeasurePointThreshold = deepExcavationMeasurePointThresholdService.getById(id); -//// if (deepExcavationMeasurePointThreshold == null) { -//// result.error500("未找到对应实体"); -//// } else { -//// boolean ok = deepExcavationMeasurePointThresholdService.removeById(id); -//// if (ok) { -//// result.success("删除成功!"); -//// } -//// } -//// -//// return result; -// return null; -// } -// -// -// /** -// * 通过id查询 -// * -// * @param id -// * @return -// */ -// @ApiOperation(value = "通过id查询深基坑-测点警情设置信息", notes = "通过id查询深基坑-测点警情设置信息", httpMethod = "GET") -// @ApiImplicitParam(name = "id", value = "深基坑-测点警情设置ID", paramType = "query", required = true, dataType = "Integer") -// @GetMapping(value = "/queryById") -// public Result queryById(@RequestParam(name = "id", required = true) String id) { -//// Result result = new Result(); -//// DeepExcavationMeasurePointThreshold deepExcavationMeasurePointThreshold = deepExcavationMeasurePointThresholdService.getById(id); -//// if (deepExcavationMeasurePointThreshold == null) { -//// result.error500("未找到对应实体"); -//// } else { -//// result.setResult(deepExcavationMeasurePointThreshold); -//// result.setSuccess(true); -//// } -//// return result; -// return null; -// } } diff --git a/src/main/java/com/zhgd/xmgl/modules/city/deepexcavation/controller/DeepExcavationPlaneFigureController.java b/src/main/java/com/zhgd/xmgl/modules/city/deepexcavation/controller/DeepExcavationPlaneFigureController.java index 8306887..7ad4471 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/deepexcavation/controller/DeepExcavationPlaneFigureController.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/deepexcavation/controller/DeepExcavationPlaneFigureController.java @@ -69,47 +69,6 @@ public class DeepExcavationPlaneFigureController { return Result.success(list); } - /** - * 添加 - * - * @param deepExcavationPlaneFigure - * @return - */ - @ApiOperation(value = "添加深基坑-平面图配置信息", notes = "添加深基坑-平面图配置信息", httpMethod = "POST") - @PostMapping(value = "/add") - public Result add(@RequestBody DeepExcavationPlaneFigure deepExcavationPlaneFigure) { - deepExcavationPlaneFigureService.savedeepExcavationPlaneFigure(deepExcavationPlaneFigure); - return Result.ok(); - } - - /** - * 编辑 - * - * @param deepExcavationPlaneFigure - * @return - */ - @ApiOperation(value = "编辑深基坑-平面图配置信息", notes = "编辑深基坑-平面图配置信息", httpMethod = "POST") - @PostMapping(value = "/edit") - public Result edit(@RequestBody DeepExcavationPlaneFigure deepExcavationPlaneFigure) { - deepExcavationPlaneFigureService.editdeepExcavationPlaneFigure(deepExcavationPlaneFigure); - return Result.success(deepExcavationPlaneFigure); - } - - /** - * 通过id删除 - * - * @param - * @return - */ - @ApiOperation(value = "删除深基坑-平面图配置信息", notes = "删除深基坑-平面图配置信息", httpMethod = "POST") - @ApiImplicitParam(name = "id", value = "深基坑-平面图配置ID", paramType = "query", required = true, dataType = "Integer") - @PostMapping(value = "/delete") - public Result delete(@RequestBody Map map) { - deepExcavationPlaneFigureService.deleteDeepExcavationPlaneFigure(MapUtils.getString(map, "id")); - return Result.ok(); - } - - /** * 通过id查询 * diff --git a/src/main/java/com/zhgd/xmgl/modules/city/deepexcavation/controller/DeepExcavationPlaneFigureCoordinateController.java b/src/main/java/com/zhgd/xmgl/modules/city/deepexcavation/controller/DeepExcavationPlaneFigureCoordinateController.java index 97c4e01..9f54d84 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/deepexcavation/controller/DeepExcavationPlaneFigureCoordinateController.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/deepexcavation/controller/DeepExcavationPlaneFigureCoordinateController.java @@ -52,74 +52,4 @@ public class DeepExcavationPlaneFigureCoordinateController { return Result.success(deepExcavationPlaneFigureCoordinateService.selectPlaneFigureCoordinateList(map)); } - - /** - * 编辑 - * - * @param - * @return - */ - @ApiOperation(value = "编辑深基坑-平面图设备坐标信息", notes = "编辑深基坑-平面图设备坐标信息", httpMethod = "POST") - @PostMapping(value = "/edit") - public Result edit(@RequestBody DeepExcavationPlaneFigureCoordinate deepExcavationPlaneFigureCoordinate) { - deepExcavationPlaneFigureCoordinateService.editPlaneFigureCoordinate(deepExcavationPlaneFigureCoordinate); - return Result.ok(); - } - - @ApiOperation(value = "编辑深基坑-平面图设备坐标信息", notes = "编辑深基坑-平面图设备坐标信息", httpMethod = "POST") - @PostMapping(value = "/updateFigureCoordinate") - public Result updateFigureCoordinate(@RequestBody List list) { - deepExcavationPlaneFigureCoordinateService.updateFigureCoordinate(list); - return Result.ok(); - } - - @ApiOperation(value = "删除-通过设备和平面图ID删除深基坑-平面图设备坐标信息", notes = "删除-通过设备和平面图ID删除深基坑-平面图设备坐标信息", httpMethod = "POST") - @ApiImplicitParams({ - @ApiImplicitParam(name = "planeFigureId", value = "平面图ID", paramType = "query", required = true, dataType = "String"), - @ApiImplicitParam(name = "pointId", value = "地图点位对应的设备表ID", paramType = "query", required = true, dataType = "String"), - }) - @PostMapping(value = "/deletePlaneFigureCoordinate") - public Result deleteDeepExcavationPlaneFigureCoordinate(@RequestBody Map map) { - deepExcavationPlaneFigureCoordinateService.deleteDeepExcavationPlaneFigureCoordinate(map); - return Result.ok(); - } - - /** - * 通过id删除 - * - * @param - * @return - */ - @ApiOperation(value = "删除深基坑-平面图设备坐标信息", notes = "删除深基坑-平面图设备坐标信息", httpMethod = "POST") - @ApiImplicitParam(name = "id", value = "深基坑-平面图设备坐标ID", paramType = "query", required = true, dataType = "Integer") - @PostMapping(value = "/delete") - public Result delete(@RequestBody Map map) { - Result result = new Result(); - DeepExcavationPlaneFigureCoordinate deepExcavationPlaneFigureCoordinate = deepExcavationPlaneFigureCoordinateService.getById(MapUtils.getString(map, "id")); - if (deepExcavationPlaneFigureCoordinate == null) { - result.error500(MessageUtil.get("notFindErr")); - } else { - boolean ok = deepExcavationPlaneFigureCoordinateService.removeById(MapUtils.getString(map, "id")); - if (ok) { - result.successMsg(MessageUtil.get("deleteSucess")); - } - } - - return result; - } - - @ApiOperation(value = "添加深基坑-平面图设备坐标信息", notes = "添加深基坑-平面图设备坐标信息", httpMethod = "POST") - @PostMapping(value = "/adds") - public Result adds(@RequestBody DeepExcavationPlaneFigureCoordinate deepExcavationPlaneFigureCoordinate) { - Result result = new Result(); - try { - deepExcavationPlaneFigureCoordinateService.save(deepExcavationPlaneFigureCoordinate); - result.successMsg("添加成功"); - } catch (Exception e) { - e.printStackTrace(); - log.info(e.getMessage()); - result.error500("添加失败"); - } - return result; - } } diff --git a/src/main/java/com/zhgd/xmgl/modules/city/deepexcavation/controller/DeepExcavationSensorTypeController.java b/src/main/java/com/zhgd/xmgl/modules/city/deepexcavation/controller/DeepExcavationSensorTypeController.java index 89a6272..b27d1f2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/deepexcavation/controller/DeepExcavationSensorTypeController.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/deepexcavation/controller/DeepExcavationSensorTypeController.java @@ -44,76 +44,6 @@ public class DeepExcavationSensorTypeController { return Result.success(list); } - /** - * 添加 - * - * @param deepExcavationSensorType - * @return - */ - @ApiOperation(value = "添加深基坑-传感器类型信息", notes = "添加深基坑-传感器类型信息", httpMethod = "POST") - @PostMapping(value = "/add") - public Result add(@RequestBody DeepExcavationSensorType deepExcavationSensorType) { - Result result = new Result(); - try { - deepExcavationSensorTypeService.save(deepExcavationSensorType); - result.successMsg(MessageUtil.get("addSucess")); - } catch (Exception e) { - e.printStackTrace(); - log.info(e.getMessage()); - result.error500(MessageUtil.get("failErr")); - } - return result; - } - - /** - * 编辑 - * - * @param deepExcavationSensorType - * @return - */ - @ApiOperation(value = "编辑深基坑-传感器类型信息", notes = "编辑深基坑-传感器类型信息", httpMethod = "POST") - @PostMapping(value = "/edit") - public Result edit(@RequestBody DeepExcavationSensorType deepExcavationSensorType) { - Result result = new Result(); - DeepExcavationSensorType deepExcavationSensorTypeEntity = deepExcavationSensorTypeService.getById(deepExcavationSensorType.getId()); - if (deepExcavationSensorTypeEntity == null) { - result.error500(MessageUtil.get("notFindErr")); - } else { - boolean ok = deepExcavationSensorTypeService.updateById(deepExcavationSensorType); - //TODO 返回false说明什么？ - if (ok) { - result.successMsg(MessageUtil.get("editSucess")); - } - } - - return result; - } - - /** - * 通过id删除 - * - * @param - * @return - */ - @ApiOperation(value = "删除深基坑-传感器类型信息", notes = "删除深基坑-传感器类型信息", httpMethod = "POST") - @ApiImplicitParam(name = "id", value = "深基坑-传感器类型ID", paramType = "query", required = true, dataType = "Integer") - @PostMapping(value = "/delete") - public Result delete(@RequestBody Map map) { - Result result = new Result(); - DeepExcavationSensorType deepExcavationSensorType = deepExcavationSensorTypeService.getById(MapUtils.getString(map, "id")); - if (deepExcavationSensorType == null) { - result.error500(MessageUtil.get("notFindErr")); - } else { - boolean ok = deepExcavationSensorTypeService.removeById(MapUtils.getString(map, "id")); - if (ok) { - result.successMsg(MessageUtil.get("deleteSucess")); - } - } - - return result; - } - - /** * 通过id查询 *