feat:燃气管网-基础数据管理

pipe-network-service/zksy-admin/src/main/java/com/zksy/web/controller/basic/EquipmentController.java → pipe-network-service/zksy-admin/src/main/java/com/zksy/web/controller/gasbasic/GasEquipmentController.java

@@ -1,10 +1,8 @@
-package com.zksy.web.controller.basic;
+package com.zksy.web.controller.gasbasic;
 
-import com.zksy.base.domain.EquipmentBase;
 import com.zksy.base.domain.EquipmentPointRel;
 import com.zksy.base.domain.EquipmentStatus;
 import com.zksy.base.service.EquipmentBaseService;
-import com.zksy.base.service.EquipmentStatusService;
 import com.zksy.base.mapper.EquipmentPointRelMapper;
 import com.zksy.base.mapper.EquipmentStatusMapper;
 import com.zksy.common.annotation.Anonymous;
@@ -22,7 +20,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/api/equipment")
 @Api(tags = "监测设备管理")
-public class EquipmentController {
+public class GasEquipmentController {
 
     @Autowired
     private EquipmentBaseService equipmentBaseService;

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

@@ -1,4 +1,4 @@
-package com.zksy.web.controller.basic;
+package com.zksy.web.controller.gasbasic;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zksy.base.domain.ManholeBase;
@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @RequestMapping("/api/manhole")
 @Api(tags = "窨井管理")
-public class ManholeController {
+public class GasManholeController {
 
     @Autowired
     private ManholeBaseService service;

pipe-network-service/zksy-admin/src/main/java/com/zksy/web/controller/basic/MonitorPointController.java → pipe-network-service/zksy-admin/src/main/java/com/zksy/web/controller/gasbasic/GasMonitorPointController.java

@@ -1,4 +1,4 @@
-package com.zksy.web.controller.basic;
+package com.zksy.web.controller.gasbasic;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zksy.base.domain.MonitorPoint;
@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @RequestMapping("/api/monitor-point")
 @Api(tags = "监测点管理")
-public class MonitorPointController {
+public class GasMonitorPointController {
 
     @Autowired
     private MonitorPointService service;
@@ -27,7 +27,7 @@ public class MonitorPointController {
     @ApiOperation("监测点分页查询")
     @Anonymous
     public AjaxResult findByPage(MonitorPointPageInDTO dto) {
-        Page<MonitorPoint> page = service.findByPage(dto);
+        Page<MonitorPoint> page = service.queryByPage(dto);
         return AjaxResult.success(page);
     }
 

pipe-network-service/zksy-admin/src/main/java/com/zksy/web/controller/basic/PipeNetworkController.java → pipe-network-service/zksy-admin/src/main/java/com/zksy/web/controller/gasbasic/GasPipeNetworkController.java

@@ -1,4 +1,4 @@
-package com.zksy.web.controller.basic;
+package com.zksy.web.controller.gasbasic;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zksy.base.domain.PipeNetworkBase;
@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @RequestMapping("/api/pipe-network")
 @Api(tags = "燃气管网基础数据")
-public class PipeNetworkController {
+public class GasPipeNetworkController {
 
     @Autowired
     private PipeNetworkBaseService service;
@@ -27,7 +27,7 @@ public class PipeNetworkController {
     @ApiOperation("管网分页查询")
     @Anonymous
     public AjaxResult findByPage(PipeNetworkPageInDTO dto) {
-        Page<PipeNetworkBase> page = service.findByPage(dto);
+        Page<PipeNetworkBase> page = service.queryByPage(dto);
         return AjaxResult.success(page);
     }
 

pipe-network-service/zksy-admin/src/main/java/com/zksy/web/controller/basic/RepairRecordController.java → pipe-network-service/zksy-admin/src/main/java/com/zksy/web/controller/gasbasic/GasRepairRecordController.java

@@ -1,4 +1,4 @@
-package com.zksy.web.controller.basic;
+package com.zksy.web.controller.gasbasic;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zksy.base.domain.PipeRepairRecord;
@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @RequestMapping("/api/repair-record")
 @Api(tags = "燃气管网维修记录")
-public class RepairRecordController {
+public class GasRepairRecordController {
 
     @Autowired
     private PipeRepairRecordService service;

pipe-network-service/zksy-admin/src/main/java/com/zksy/web/controller/basic/GisController.java → pipe-network-service/zksy-admin/src/main/java/com/zksy/web/controller/gasbasic/GisController.java

@@ -1,4 +1,4 @@
-package com.zksy.web.controller.basic;
+package com.zksy.web.controller.gasbasic;
 
 import com.zksy.base.domain.EquipmentBase;
 import com.zksy.base.domain.ManholeBase;
@@ -15,7 +15,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 @Slf4j
 @RestController

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

@@ -10,7 +10,7 @@ import java.util.Map;
 
 public interface MonitorPointService extends IService<MonitorPoint> {
 
-    Page<MonitorPoint> findByPage(MonitorPointPageInDTO dto);
+    Page<MonitorPoint> queryByPage(MonitorPointPageInDTO dto);
     Page<MonitorPoint> findByPage(long pageNum, long pageSize,
                                     String pointCode, String pointName,
                                     String pointType, String status);

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

@@ -9,7 +9,7 @@ import java.util.List;
 
 public interface PipeNetworkBaseService extends IService<PipeNetworkBase> {
 
-    Page<PipeNetworkBase> findByPage(PipeNetworkPageInDTO dto);
+    Page<PipeNetworkBase> queryByPage(PipeNetworkPageInDTO dto);
     Page<PipeNetworkBase> findByPage(long pageNum, long pageSize,
                                       String networkCode, String networkName,
                                       String networkType, String status);

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

@@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zksy.base.domain.EquipmentBase;
 import com.zksy.base.domain.EquipmentPointRel;
 import com.zksy.base.domain.MonitorPoint;
-import com.zksy.base.dto.MonitorPointPageInDTO;
 import com.zksy.base.domain.PipeNetworkBase;
+import com.zksy.base.dto.MonitorPointPageInDTO;
 import com.zksy.base.mapper.EquipmentBaseMapper;
 import com.zksy.base.mapper.EquipmentPointRelMapper;
 import com.zksy.base.mapper.MonitorPointMapper;
@@ -37,6 +37,16 @@ public class MonitorPointServiceImpl extends ServiceImpl<MonitorPointMapper, Mon
     @Autowired
     private PipeNetworkBaseMapper pipeNetworkBaseMapper;
 
+    @Override
+    public Page<MonitorPoint> queryByPage(MonitorPointPageInDTO dto) {
+        Page<MonitorPoint> page = new Page<>(dto.getPageNum(), dto.getPageSize());
+        LambdaQueryWrapper<MonitorPoint> wrapper = new LambdaQueryWrapper<>();
+        wrapper.like(dto.getPointName() != null && !dto.getPointName().isEmpty(), MonitorPoint::getPointName, dto.getPointName());
+        wrapper.eq(dto.getPointType() != null && !dto.getPointType().isEmpty(), MonitorPoint::getPointType, dto.getPointType());
+        wrapper.orderByDesc(MonitorPoint::getCreateTime);
+        return this.page(page, wrapper);
+    }
+
     @Override
     public Page<MonitorPoint> findByPage(long pageNum, long pageSize,
                                           String pointCode, String pointName,
@@ -103,8 +113,6 @@ public class MonitorPointServiceImpl extends ServiceImpl<MonitorPointMapper, Mon
     }
 
     @Override
-    public Page<MonitorPoint> findByPage(MonitorPointPageInDTO dto) {
-        Page<MonitorPoint> page = new Page<>(dto.getPageNum(), dto.getPageSize());
     @Transactional
     public boolean updateWithCheck(MonitorPoint entity) {
         String pointId = entity.getPointId();
@@ -255,11 +263,8 @@ public class MonitorPointServiceImpl extends ServiceImpl<MonitorPointMapper, Mon
     @Override
     public List<MonitorPoint> getPointsByNetwork(String networkId) {
         LambdaQueryWrapper<MonitorPoint> wrapper = new LambdaQueryWrapper<>();
-        wrapper.like(dto.getPointName() != null && !dto.getPointName().isEmpty(), MonitorPoint::getPointName, dto.getPointName());
-        wrapper.eq(dto.getPointType() != null && !dto.getPointType().isEmpty(), MonitorPoint::getPointType, dto.getPointType());
         wrapper.eq(MonitorPoint::getNetworkId, networkId);
         wrapper.orderByDesc(MonitorPoint::getCreateTime);
-        return this.page(page, wrapper);
         return this.list(wrapper);
     }
 }

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

@@ -23,6 +23,19 @@ import java.util.stream.Collectors;
 public class PipeNetworkBaseServiceImpl extends ServiceImpl<PipeNetworkBaseMapper, PipeNetworkBase>
         implements PipeNetworkBaseService {
 
+    @Override
+    public Page<PipeNetworkBase> queryByPage(PipeNetworkPageInDTO dto) {
+        Page<PipeNetworkBase> page = new Page<>(dto.getPageNum(), dto.getPageSize());
+        LambdaQueryWrapper<PipeNetworkBase> wrapper = new LambdaQueryWrapper<>();
+        wrapper.like(dto.getNetworkName() != null && !dto.getNetworkName().isEmpty(), PipeNetworkBase::getNetworkName, dto.getNetworkName());
+        wrapper.like(dto.getManagementUnit() != null && !dto.getManagementUnit().isEmpty(), PipeNetworkBase::getManagementUnit, dto.getManagementUnit());
+        wrapper.eq(dto.getNetworkLevel() != null && !dto.getNetworkLevel().isEmpty(), PipeNetworkBase::getNetworkLevel, dto.getNetworkLevel());
+        wrapper.like(dto.getMaterial() != null && !dto.getMaterial().isEmpty(), PipeNetworkBase::getMaterial, dto.getMaterial());
+        wrapper.eq(dto.getStatus() != null && !dto.getStatus().isEmpty(), PipeNetworkBase::getStatus, dto.getStatus());
+        wrapper.orderByDesc(PipeNetworkBase::getCreateTime);
+        return this.page(page, wrapper);
+    }
+
     @Override
     public Page<PipeNetworkBase> findByPage(long pageNum, long pageSize,
                                              String networkCode, String networkName,
@@ -97,6 +110,14 @@ public class PipeNetworkBaseServiceImpl extends ServiceImpl<PipeNetworkBaseMappe
         return this.updateById(entity);
     }
 
+    @Override
+    public List<PipeNetworkBase> getOptions() {
+        LambdaQueryWrapper<PipeNetworkBase> wrapper = new LambdaQueryWrapper<>();
+        wrapper.select(PipeNetworkBase::getNetworkId, PipeNetworkBase::getNetworkName, PipeNetworkBase::getNetworkCode);
+        wrapper.orderByAsc(PipeNetworkBase::getNetworkName);
+        return this.list(wrapper);
+    }
+
     @Override
     @Transactional
     public boolean removeWithCheck(String networkId) {