Merge remote-tracking branch 'origin/master'

pipe-network-service/zksy-admin/src/main/java/com/zksy/web/controller/gasbasic/GasManholeController.java

@@ -1,8 +1,11 @@
 package com.zksy.web.controller.gasbasic;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zksy.base.domain.ManholeBase;
+import com.zksy.base.domain.ManholeDeviceRel;
 import com.zksy.base.dto.ManholePageInDTO;
+import com.zksy.base.mapper.ManholeDeviceRelMapper;
 import com.zksy.base.service.ManholeBaseService;
 import com.zksy.common.annotation.Anonymous;
 import com.zksy.common.annotation.Log;
@@ -14,6 +17,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @Slf4j
 @RestController
 @RequestMapping("/api/manhole")
@@ -23,6 +28,9 @@ public class GasManholeController {
     @Autowired
     private ManholeBaseService service;
 
+    @Autowired
+    private ManholeDeviceRelMapper deviceRelMapper;
+
     @GetMapping("/findByPage")
     @ApiOperation("窨井分页查询")
     @Anonymous
@@ -76,4 +84,46 @@ public class GasManholeController {
         boolean deleted = service.removeById(id);
         return deleted ? AjaxResult.success("删除成功") : AjaxResult.error("删除失败");
     }
+
+    // ============ 窨井-设备关联 ============
+
+    @GetMapping("/device/list/{manholeId}")
+    @ApiOperation("获取窨井关联的设备列表")
+    @Anonymous
+    public AjaxResult listDevices(@PathVariable String manholeId) {
+        LambdaQueryWrapper<ManholeDeviceRel> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(ManholeDeviceRel::getManholeId, manholeId);
+        wrapper.orderByDesc(ManholeDeviceRel::getCreateTime);
+        List<ManholeDeviceRel> list = deviceRelMapper.selectList(wrapper);
+        return AjaxResult.success(list);
+    }
+
+    @PostMapping("/device/save")
+    @ApiOperation("关联设备到窨井")
+    @Anonymous
+    public AjaxResult saveDeviceRel(@RequestBody ManholeDeviceRel rel) {
+        boolean saved = deviceRelMapper.insert(rel) > 0;
+        return saved ? AjaxResult.success("关联成功") : AjaxResult.error("关联失败");
+    }
+
+    @PostMapping("/device/save-batch")
+    @ApiOperation("批量关联设备到窨井")
+    @Anonymous
+    public AjaxResult saveDeviceRelBatch(@RequestBody List<ManholeDeviceRel> relList) {
+        if (relList == null || relList.isEmpty()) {
+            return AjaxResult.error("关联列表不能为空");
+        }
+        for (ManholeDeviceRel rel : relList) {
+            deviceRelMapper.insert(rel);
+        }
+        return AjaxResult.success("批量关联成功");
+    }
+
+    @DeleteMapping("/device/delete")
+    @ApiOperation("删除窨井设备关联")
+    @Anonymous
+    public AjaxResult deleteDeviceRel(@RequestParam Long relId) {
+        boolean deleted = deviceRelMapper.deleteById(relId) > 0;
+        return deleted ? AjaxResult.success("删除成功") : AjaxResult.error("删除失败");
+    }
 }

pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/EquipmentBase.java

@@ -2,6 +2,7 @@ package com.zksy.base.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
@@ -83,4 +84,8 @@ public class EquipmentBase {
     @ApiModelProperty("更新时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime updateTime;
+
+    @TableLogic(value = "0", delval = "2")
+    @ApiModelProperty("删除标志（0=正常 2=删除）")
+    private String delFlag;
 }

pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/EquipmentPointRel.java

@@ -2,6 +2,7 @@ package com.zksy.base.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
@@ -33,4 +34,8 @@ public class EquipmentPointRel {
     @ApiModelProperty("创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime createTime;
+
+    @TableLogic(value = "0", delval = "2")
+    @ApiModelProperty("删除标志（0=正常 2=删除）")
+    private String delFlag;
 }

pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/EquipmentStatus.java

@@ -2,6 +2,7 @@ package com.zksy.base.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
@@ -73,4 +74,7 @@ public class EquipmentStatus {
      */
     @JsonFormat(locale = "zh",pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private LocalDateTime statusUpdateTime;
+
+    @TableLogic(value = "0", delval = "2")
+    private String delFlag;
 }

pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/GasPipePoint.java

@@ -2,6 +2,7 @@ package com.zksy.base.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
@@ -81,4 +82,8 @@ public class GasPipePoint {
     @ApiModelProperty("更新时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime updateTime;
+
+    @TableLogic(value = "0", delval = "2")
+    @ApiModelProperty("删除标志（0=正常 2=删除）")
+    private String delFlag;
 }

pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/GasPipePointDeviceRel.java

@@ -2,6 +2,7 @@ package com.zksy.base.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
@@ -39,4 +40,8 @@ public class GasPipePointDeviceRel {
     @ApiModelProperty("创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime createTime;
+
+    @TableLogic(value = "0", delval = "2")
+    @ApiModelProperty("删除标志（0=正常 2=删除）")
+    private String delFlag;
 }

pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/HazardHiddenAccount.java

@@ -2,6 +2,7 @@ package com.zksy.base.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
@@ -100,4 +101,8 @@ public class HazardHiddenAccount {
     @ApiModelProperty("更新时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime updateTime;
+
+    @TableLogic(value = "0", delval = "2")
+    @ApiModelProperty("删除标志（0=正常 2=删除）")
+    private String delFlag;
 }

pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/ManholeBase.java

@@ -2,6 +2,7 @@ package com.zksy.base.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
@@ -68,4 +69,8 @@ public class ManholeBase {
     @ApiModelProperty("更新时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime updateTime;
+
+    @TableLogic(value = "0", delval = "2")
+    @ApiModelProperty("删除标志（0=正常 2=删除）")
+    private String delFlag;
 }

pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/MonitorPoint.java

@@ -2,6 +2,7 @@ package com.zksy.base.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
@@ -70,4 +71,8 @@ public class MonitorPoint {
     @ApiModelProperty("更新时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime updateTime;
+
+    @TableLogic(value = "0", delval = "2")
+    @ApiModelProperty("删除标志（0=正常 2=删除）")
+    private String delFlag;
 }

pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/PipeNetworkBase.java

@@ -2,6 +2,7 @@ package com.zksy.base.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
@@ -82,4 +83,8 @@ public class PipeNetworkBase {
     @ApiModelProperty("更新时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime updateTime;
+
+    @TableLogic(value = "0", delval = "2")
+    @ApiModelProperty("删除标志（0=正常 2=删除）")
+    private String delFlag;
 }

pipe-network-service/zksy-system/src/main/java/com/zksy/base/domain/PipeRepairRecord.java

@@ -2,6 +2,7 @@ package com.zksy.base.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
@@ -54,4 +55,8 @@ public class PipeRepairRecord {
     @ApiModelProperty("创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime createTime;
+
+    @TableLogic(value = "0", delval = "2")
+    @ApiModelProperty("删除标志（0=正常 2=删除）")
+    private String delFlag;
 }

pipe-network-service/zksy-system/src/main/java/com/zksy/base/service/impl/EquipmentBaseServiceImpl.java

@@ -191,7 +191,7 @@ public class EquipmentBaseServiceImpl extends ServiceImpl<EquipmentBaseMapper, E
         equipmentTestMapper.delete(testWrapper);
         log.info("已删除设备[{}]的测试记录", equipmentId);
 
-        return this.baseMapper.deleteById(equipmentId) > 0;
+        return this.removeById(equipmentId);
     }
 
     @Override

pipe-network-service/zksy-system/src/main/java/com/zksy/base/service/impl/GasPipePointServiceImpl.java

@@ -84,6 +84,6 @@ public class GasPipePointServiceImpl extends ServiceImpl<GasPipePointMapper, Gas
         if (point == null) {
             throw new ServiceException("管点不存在：" + pointId);
         }
-        return this.baseMapper.deleteById(pointId) > 0;
+        return this.removeById(pointId);
     }
 }

pipe-network-service/zksy-system/src/main/java/com/zksy/base/service/impl/MonitorPointServiceImpl.java

@@ -151,7 +151,7 @@ public class MonitorPointServiceImpl extends ServiceImpl<MonitorPointMapper, Mon
         equipmentPointRelMapper.delete(relWrapper);
         log.info("已删除监测点[{}]的设备关联关系", pointId);
 
-        return this.baseMapper.deleteById(pointId) > 0;
+        return this.removeById(pointId);
     }
 
     @Override

pipe-network-service/zksy-system/src/main/java/com/zksy/base/service/impl/PipeNetworkBaseServiceImpl.java

@@ -125,7 +125,7 @@ public class PipeNetworkBaseServiceImpl extends ServiceImpl<PipeNetworkBaseMappe
         if (network == null) {
             throw new ServiceException("设施不存在：" + networkId);
         }
-        return this.baseMapper.deleteById(networkId) > 0;
+        return this.removeById(networkId);
     }
 
     @Override