|
|
@@ -2,6 +2,8 @@ package com.zksy.web.controller.WaterSupply.WaterPumpStation;
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
+import com.zksy.WaterSupply.WaterPumpStation.domain.PumpStationType;
|
|
|
import com.zksy.WaterSupply.WaterPumpStation.domain.WaterPumpStation;
|
|
|
import com.zksy.WaterSupply.WaterPumpStation.service.IWaterPumpStationService;
|
|
|
import com.zksy.common.core.domain.AjaxResult;
|
|
|
@@ -69,7 +71,9 @@ public class WaterPumpStationController {
|
|
|
public AjaxResult getById(
|
|
|
@ApiParam(value = "泵站ID", required = true, example = "1") @PathVariable Long id) {
|
|
|
try {
|
|
|
- WaterPumpStation data = pumpStationService.getById(id);
|
|
|
+ WaterPumpStation data = pumpStationService.getOne(new LambdaQueryWrapper<WaterPumpStation>()
|
|
|
+ .eq(WaterPumpStation::getId, id)
|
|
|
+ .eq(WaterPumpStation::getStationType, PumpStationType.WATER_SUPPLY));
|
|
|
return data == null ? AjaxResult.warn("未找到该泵站信息") : AjaxResult.success("查询成功", data);
|
|
|
} catch (Exception e) {
|
|
|
log.error("查询泵站详情异常", e);
|
|
|
@@ -87,6 +91,8 @@ public class WaterPumpStationController {
|
|
|
public AjaxResult add(@RequestBody WaterPumpStation pumpStation) {
|
|
|
try {
|
|
|
pumpStation.setDelFlag("0");
|
|
|
+ // 供水入口强制归属为供水泵站,忽略前端传入的类型
|
|
|
+ pumpStation.setStationType(PumpStationType.WATER_SUPPLY);
|
|
|
try {
|
|
|
pumpStation.setCreateBy(SecurityUtils.getUsername());
|
|
|
} catch (Exception e) {
|
|
|
@@ -110,8 +116,22 @@ public class WaterPumpStationController {
|
|
|
})
|
|
|
public AjaxResult update(@RequestBody WaterPumpStation pumpStation) {
|
|
|
try {
|
|
|
+ // —— C:归属门禁,供水入口只能改 water_supply 记录 ——
|
|
|
+ Long id = pumpStation.getId();
|
|
|
+ if (id == null) {
|
|
|
+ return AjaxResult.error("缺少泵站ID,无法修改");
|
|
|
+ }
|
|
|
+ WaterPumpStation owned = pumpStationService.getOne(new LambdaQueryWrapper<WaterPumpStation>()
|
|
|
+ .eq(WaterPumpStation::getId, id)
|
|
|
+ .eq(WaterPumpStation::getStationType, PumpStationType.WATER_SUPPLY));
|
|
|
+ if (owned == null) {
|
|
|
+ log.warn("供水入口拒绝修改非供水泵站,id={}", id);
|
|
|
+ return AjaxResult.error("未找到供水泵站,禁止修改");
|
|
|
+ }
|
|
|
+
|
|
|
// 禁止修改关键字段
|
|
|
pumpStation.setDelFlag(null);
|
|
|
+ pumpStation.setStationType(null);
|
|
|
pumpStation.setCreateBy(null);
|
|
|
pumpStation.setCreateTime(null);
|
|
|
|
|
|
@@ -141,7 +161,9 @@ public class WaterPumpStationController {
|
|
|
@ApiParam(value = "泵站ID数组,多个用逗号分隔", required = true, example = "1,2,3") @PathVariable Long[] ids) {
|
|
|
try {
|
|
|
log.info("开始删除泵站数据,ids: {}", (Object) ids);
|
|
|
- boolean result = pumpStationService.removeByIds(List.of(ids));
|
|
|
+ boolean result = pumpStationService.remove(new LambdaQueryWrapper<WaterPumpStation>()
|
|
|
+ .in(WaterPumpStation::getId, List.of(ids))
|
|
|
+ .eq(WaterPumpStation::getStationType, PumpStationType.WATER_SUPPLY));
|
|
|
return result
|
|
|
? AjaxResult.success("删除成功,已移入回收站,共删除 " + ids.length + " 条数据")
|
|
|
: AjaxResult.error("删除失败");
|