兴安盟水资源运维系统-用水户、测站、点位删除和增加BUG修正，实时监测数据BUG修改

src/main/java/org/springblade/config/MultipartConfig.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/10/8
  */
 package org.springblade.config;

src/main/java/org/springblade/enums/SzyFlowRateMetadataEnum.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/10/31
  */
 package org.springblade.enums;

src/main/java/org/springblade/enums/SzyWaterLevelMetadataEnum.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/10/31
  */
 package org.springblade.enums;

src/main/java/org/springblade/jobtask/DataShareProcessor.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/11/16
  */
 package org.springblade.jobtask;
@@ -88,9 +88,9 @@ public class DataShareProcessor {
     private int nTimeOut = 20 * 1000;
 
     /**
-     * 计量设施数据同步
+     * 计量设施数据同步,每天执行一次
      */
-    @Scheduled(cron = "10 0 0/1 * * * ")
+    @Scheduled(cron = "10 0 0 * * ?")
     public void siteShareDataTaskScheduled() {
         try {
             Date dt = new Date();
@@ -104,9 +104,9 @@ public class DataShareProcessor {
     }
 
     /**
-     * 实时流量数据同步
+     * 实时流量数据同步，每小时执行一次
      */
-    @Scheduled(cron = "30 0/20 * * * * ")
+    @Scheduled(cron = "30 0 0/1 * * ?")
     public void waterFlowRateShareDataTaskScheduled() {
         try {
             Date dt = new Date();

src/main/java/org/springblade/modules/baseinfo/dict/controller/BaseInfoDictController.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.baseinfo.dict.controller;

src/main/java/org/springblade/modules/baseinfo/dict/mapper/DictInfoMapper.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.baseinfo.dict.mapper;

src/main/java/org/springblade/modules/baseinfo/dict/service/IBaseInfoDictService.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.baseinfo.dict.service;

src/main/java/org/springblade/modules/baseinfo/dict/service/impl/BaseInfoDictServiceImpl.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.baseinfo.dict.service.impl;

src/main/java/org/springblade/modules/baseinfo/monitorpoint/controller/MonitorPointController.java

@@ -1,12 +1,14 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/10/19
  */
 package org.springblade.modules.baseinfo.monitorpoint.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.*;
 import lombok.AllArgsConstructor;
@@ -17,14 +19,10 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.modules.baseinfo.monitorpoint.dto.MonitorPointInfoDTO;
 import org.springblade.modules.baseinfo.monitorpoint.entity.MonitorPointInfoEntity;
-import org.springblade.modules.baseinfo.monitorpoint.entity.MonitorPointRelEntity;
 import org.springblade.modules.baseinfo.monitorpoint.service.IMonitorPointRelService;
 import org.springblade.modules.baseinfo.monitorpoint.service.IMonitorPointService;
 import org.springblade.modules.baseinfo.monitorpoint.vo.MonitorPointInfoVO;
 import org.springblade.modules.baseinfo.monitorpoint.wrapper.MonitorPointWrapper;
-import org.springblade.modules.baseinfo.monitorsite.entity.MonitorSiteRelEntity;
-import org.springblade.modules.baseinfo.monitorsite.vo.MonitorSiteInfoVO;
-import org.springblade.modules.baseinfo.monitorsite.wrapper.MonitorSiteWrapper;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
@@ -80,7 +78,6 @@ public class MonitorPointController extends BladeController {
         return R.data(MonitorPointWrapper.build().entityVO(detail));
     }
 
-
     /**
      * 新增
      */
@@ -88,13 +85,18 @@ public class MonitorPointController extends BladeController {
     @ApiOperationSupport(order = 4)
     @ApiOperation(value = "新增", notes = "")
     public R save(@RequestBody MonitorPointInfoDTO dto) {
-        if (monitorPointService.save(dto)) {
-            MonitorPointRelEntity relEntity = new MonitorPointRelEntity();
-            relEntity.setWiustCd(dto.getWiustCd());
-            relEntity.setMpCd(dto.getMpCd());
-            return R.status(monitorPointRelService.save(relEntity));
+        if (Func.isNull(dto.getWiustCd()) || Func.isNull(dto.getMpCd())) {
+            return R.fail("参数错误");
+        }
+        LambdaQueryWrapper<MonitorPointInfoEntity> wrapper = Wrappers.<MonitorPointInfoEntity>query().lambda();
+        wrapper.eq(MonitorPointInfoEntity::getIsDeleted, 0);
+        wrapper.eq(MonitorPointInfoEntity::getMpCd, dto.getMpCd());
+        long count = monitorPointService.count(wrapper);
+        if (count > 0) {
+            return R.fail("测点已经存在");
         }
-        return R.status(false);
+        monitorPointRelService.addRel(dto.getWiustCd(), dto.getMpCd());
+        return R.status(monitorPointService.save(dto));
     }
 
     /**
@@ -107,26 +109,6 @@ public class MonitorPointController extends BladeController {
         return R.status(monitorPointService.updateById(dto));
     }
 
-    /**
-     * 新增或修改
-     */
-    @PostMapping("/submit")
-    @ApiOperationSupport(order = 6)
-    @ApiOperation(value = "新增或修改", notes = "")
-    public R submit(@RequestBody MonitorPointInfoDTO dto) {
-        if (dto.getId() != null) {
-            return R.status(monitorPointService.updateById(dto));
-        } else {
-            if (monitorPointService.save(dto)) {
-                MonitorPointRelEntity relEntity = new MonitorPointRelEntity();
-                relEntity.setWiustCd(dto.getWiustCd());
-                relEntity.setMpCd(dto.getMpCd());
-                return R.status(monitorPointRelService.save(relEntity));
-            }
-        }
-        return R.status(false);
-    }
-
     /**
      * 删除
      */
@@ -134,6 +116,11 @@ public class MonitorPointController extends BladeController {
     @ApiOperationSupport(order = 7)
     @ApiOperation(value = "逻辑删除", notes = "")
     public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) {
+        List<Long> idArr = Func.toLongList(ids);
+        for (Long id : idArr) {
+            MonitorPointInfoEntity entity = monitorPointService.getById(id);
+            monitorPointRelService.removeRel(entity.getMpCd());
+        }
         boolean temp = monitorPointService.deleteLogic(Func.toLongList(ids));
         return R.status(temp);
     }

src/main/java/org/springblade/modules/baseinfo/monitorpoint/dto/MonitorPointInfoDTO.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/10/19
  */
 package org.springblade.modules.baseinfo.monitorpoint.dto;

src/main/java/org/springblade/modules/baseinfo/monitorpoint/entity/MonitorPointInfoEntity.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/10/19
  */
 package org.springblade.modules.baseinfo.monitorpoint.entity;

src/main/java/org/springblade/modules/baseinfo/monitorpoint/entity/MonitorPointRelEntity.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/10/19
  */
 package org.springblade.modules.baseinfo.monitorpoint.entity;

src/main/java/org/springblade/modules/baseinfo/monitorpoint/mapper/MonitorPointMapper.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/10/19
  */
 package org.springblade.modules.baseinfo.monitorpoint.mapper;

src/main/java/org/springblade/modules/baseinfo/monitorpoint/mapper/MonitorPointRelMapper.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/10/19
  */
 package org.springblade.modules.baseinfo.monitorpoint.mapper;

src/main/java/org/springblade/modules/baseinfo/monitorpoint/service/IMonitorPointRelService.java

@@ -1,16 +1,13 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/10/19
  */
 package org.springblade.modules.baseinfo.monitorpoint.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
-import org.springblade.modules.baseinfo.monitorpoint.entity.MonitorPointInfoEntity;
 import org.springblade.modules.baseinfo.monitorpoint.entity.MonitorPointRelEntity;
-import org.springblade.modules.baseinfo.monitorpoint.vo.MonitorPointInfoVO;
 
 
 /***
@@ -22,6 +19,18 @@ import org.springblade.modules.baseinfo.monitorpoint.vo.MonitorPointInfoVO;
  * Remark：认为有必要的其他信息
  */
 public interface IMonitorPointRelService extends BaseService<MonitorPointRelEntity> {
+     /**
+      * 添加点位关联
+      * @param siteCode
+      * @param mpCd
+      * @return
+      */
+     boolean addRel(String siteCode,String mpCd);
 
-
+     /**
+      * 删除点位关联
+      * @param mpCd
+      * @return
+      */
+     boolean removeRel(String mpCd);
 }

src/main/java/org/springblade/modules/baseinfo/monitorpoint/service/IMonitorPointService.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/10/19
  */
 package org.springblade.modules.baseinfo.monitorpoint.service;
@@ -12,7 +12,6 @@ import org.springblade.modules.baseinfo.monitorpoint.dto.MonitorPointInfoDTO;
 import org.springblade.modules.baseinfo.monitorpoint.entity.MonitorPointInfoEntity;
 import org.springblade.modules.baseinfo.monitorpoint.vo.MonitorPointInfoVO;
 
-import java.util.List;
 
 
 /***
@@ -24,8 +23,25 @@ import java.util.List;
  * Remark：认为有必要的其他信息
  */
 public interface IMonitorPointService extends BaseService<MonitorPointInfoEntity> {
+    /**
+     * 分页查询
+     * @param page
+     * @param dto
+     * @return
+     */
     IPage<MonitorPointInfoVO> selectPage(IPage<MonitorPointInfoVO> page, MonitorPointInfoEntity dto);
 
-    long gtMonitorPointCount(MonitorPointInfoDTO dto);
+    /**
+     * 查询点位数量
+     * @param dto
+     * @return
+     */
+    long getMonitorPointCount(MonitorPointInfoDTO dto);
 
+    /**
+     * 删除点位
+     * @param mpCd
+     * @return
+     */
+    boolean removePoint(String mpCd);
 }

src/main/java/org/springblade/modules/baseinfo/monitorpoint/service/impl/MonitorPointRelServiceImpl.java

@@ -1,22 +1,22 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/10/19
  */
 package org.springblade.modules.baseinfo.monitorpoint.service.impl;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.modules.baseinfo.monitorpoint.entity.MonitorPointInfoEntity;
+import org.springblade.core.tool.utils.Func;
 import org.springblade.modules.baseinfo.monitorpoint.entity.MonitorPointRelEntity;
-import org.springblade.modules.baseinfo.monitorpoint.mapper.MonitorPointMapper;
 import org.springblade.modules.baseinfo.monitorpoint.mapper.MonitorPointRelMapper;
 import org.springblade.modules.baseinfo.monitorpoint.service.IMonitorPointRelService;
-import org.springblade.modules.baseinfo.monitorpoint.service.IMonitorPointService;
-import org.springblade.modules.baseinfo.monitorpoint.vo.MonitorPointInfoVO;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /***
  * Date:2023/10/19
  * Title:文件所属模块（必须填写）
@@ -29,4 +29,30 @@ import org.springframework.stereotype.Service;
 public class MonitorPointRelServiceImpl extends BaseServiceImpl<MonitorPointRelMapper, MonitorPointRelEntity> implements IMonitorPointRelService {
 
 
+    @Override
+    public boolean addRel(String siteCode, String mpCd) {
+        LambdaQueryWrapper<MonitorPointRelEntity> wrapper = Wrappers.<MonitorPointRelEntity>query().lambda();
+        wrapper.eq(MonitorPointRelEntity::getIsDeleted, 0);
+        wrapper.eq(MonitorPointRelEntity::getMpCd, mpCd);
+        List<MonitorPointRelEntity> list = this.list(wrapper);
+        for (MonitorPointRelEntity entity : list) {
+            this.deleteLogic(Func.toLongList(Func.toStr(entity.getId())));
+        }
+        MonitorPointRelEntity relEntity = new MonitorPointRelEntity();
+        relEntity.setWiustCd(siteCode);
+        relEntity.setMpCd(mpCd);
+        return this.save(relEntity);
+    }
+
+    @Override
+    public boolean removeRel(String mpCd) {
+        LambdaQueryWrapper<MonitorPointRelEntity> wrapper = Wrappers.<MonitorPointRelEntity>query().lambda();
+        wrapper.eq(MonitorPointRelEntity::getIsDeleted, 0);
+        wrapper.eq(MonitorPointRelEntity::getMpCd, mpCd);
+        List<MonitorPointRelEntity> list = this.list(wrapper);
+        for (MonitorPointRelEntity entity : list) {
+            this.deleteLogic(Func.toLongList(Func.toStr(entity.getId())));
+        }
+        return true;
+    }
 }

src/main/java/org/springblade/modules/baseinfo/monitorpoint/service/impl/MonitorPointServiceImpl.java

@@ -1,22 +1,28 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/10/19
  */
 package org.springblade.modules.baseinfo.monitorpoint.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.tool.utils.Func;
 import org.springblade.modules.baseinfo.monitorpoint.dto.MonitorPointInfoDTO;
 import org.springblade.modules.baseinfo.monitorpoint.entity.MonitorPointInfoEntity;
 import org.springblade.modules.baseinfo.monitorpoint.mapper.MonitorPointMapper;
+import org.springblade.modules.baseinfo.monitorpoint.service.IMonitorPointRelService;
 import org.springblade.modules.baseinfo.monitorpoint.service.IMonitorPointService;
 import org.springblade.modules.baseinfo.monitorpoint.vo.MonitorPointInfoVO;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.List;
 
+
 /***
  * Date:2023/10/19
  * Title:文件所属模块（必须填写）
@@ -27,15 +33,31 @@ import java.util.List;
  */
 @Service
 public class MonitorPointServiceImpl extends BaseServiceImpl<MonitorPointMapper, MonitorPointInfoEntity> implements IMonitorPointService {
+
+    @Resource
+    private IMonitorPointRelService monitorPointRelService;
+
     @Override
     public IPage<MonitorPointInfoVO> selectPage(IPage<MonitorPointInfoVO> page, MonitorPointInfoEntity dto) {
         return page.setRecords(baseMapper.selectPage(page, dto));
     }
 
     @Override
-    public long gtMonitorPointCount(MonitorPointInfoDTO dto) {
+    public long getMonitorPointCount(MonitorPointInfoDTO dto) {
         return baseMapper.gtMonitorPointCount(dto);
     }
 
+    @Override
+    public boolean removePoint(String mpCd) {
+        LambdaQueryWrapper<MonitorPointInfoEntity> wrapper = Wrappers.<MonitorPointInfoEntity>query().lambda();
+        wrapper.eq(MonitorPointInfoEntity::getIsDeleted, 0);
+        wrapper.eq(MonitorPointInfoEntity::getMpCd, mpCd);
+        List<MonitorPointInfoEntity> points = this.list(wrapper);
+        for (MonitorPointInfoEntity point : points) {
+            monitorPointRelService.removeRel(point.getMpCd());
+            this.deleteLogic(Func.toLongList(Func.toStr(point.getId())));
+        }
+        return true;
+    }
 
 }

src/main/java/org/springblade/modules/baseinfo/monitorpoint/vo/MonitorPointInfoVO.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/10/19
  */
 package org.springblade.modules.baseinfo.monitorpoint.vo;

src/main/java/org/springblade/modules/baseinfo/monitorpoint/wrapper/MonitorPointWrapper.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/10/19
  */
 package org.springblade.modules.baseinfo.monitorpoint.wrapper;

src/main/java/org/springblade/modules/baseinfo/monitorsite/controller/MonitorSiteController.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/10/19
  */
 package org.springblade.modules.baseinfo.monitorsite.controller;
@@ -18,8 +18,9 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.modules.baseinfo.monitorpoint.entity.MonitorPointInfoEntity;
-import org.springblade.modules.baseinfo.monitorpoint.vo.MonitorPointInfoVO;
-import org.springblade.modules.baseinfo.monitorpoint.wrapper.MonitorPointWrapper;
+import org.springblade.modules.baseinfo.monitorpoint.entity.MonitorPointRelEntity;
+import org.springblade.modules.baseinfo.monitorpoint.service.IMonitorPointRelService;
+import org.springblade.modules.baseinfo.monitorpoint.service.IMonitorPointService;
 import org.springblade.modules.baseinfo.monitorsite.dto.MonitorSiteInfoDTO;
 import org.springblade.modules.baseinfo.monitorsite.entity.MonitorSiteInfoEntity;
 import org.springblade.modules.baseinfo.monitorsite.entity.MonitorSiteRelEntity;
@@ -31,7 +32,8 @@ import org.springblade.modules.baseinfo.rtu.entity.RtuInfoEntity;
 import org.springblade.modules.baseinfo.rtu.service.IRtuBaseInfoService;
 import org.springblade.modules.baseinfo.wateruseconsumer.entity.WaterUseConsumerInfoEntity;
 import org.springblade.modules.baseinfo.wateruseconsumer.service.IWaterUseConsumerService;
-import org.springblade.modules.system.entity.Dept;
+import org.springblade.modules.business.rtumanage.entity.RtuStatusEntity;
+import org.springblade.modules.business.rtumanage.service.IRtuManageService;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
@@ -54,6 +56,10 @@ public class MonitorSiteController extends BladeController {
     private final IMonitorSiteRelService monitorSiteRelService;
     private final IRtuBaseInfoService rtuBaseInfoService;
     private final IWaterUseConsumerService waterUseConsumerService;
+    private final IMonitorPointRelService monitorPointRelService;
+    private final IMonitorPointService monitorPointService;
+    private final IRtuManageService rtuManageService;
+
 
     /**
      * 多表联合查询自定义分页
@@ -89,7 +95,6 @@ public class MonitorSiteController extends BladeController {
         return R.data(MonitorSiteWrapper.build().listVO(list));
     }
 
-
     /**
      * 详情
      */
@@ -101,7 +106,6 @@ public class MonitorSiteController extends BladeController {
         return R.data(MonitorSiteWrapper.build().entityVO(detail));
     }
 
-
     /**
      * 新增
      */
@@ -109,28 +113,38 @@ public class MonitorSiteController extends BladeController {
     @ApiOperationSupport(order = 4)
     @ApiOperation(value = "新增", notes = "")
     public R save(@RequestBody MonitorSiteInfoDTO dto) {
-        if (monitorSiteService.save(dto)) {
-
-            RtuInfoEntity rtuInfoEntity = new RtuInfoEntity();
-            rtuInfoEntity.setRtuCode(dto.getWiustCd());
-            rtuInfoEntity.setRtuName(dto.getWiustNm());
-//            LambdaQueryWrapper<MonitorSiteRelEntity> wrapper = Wrappers.<MonitorSiteRelEntity>query().lambda();
-//            wrapper.eq(MonitorSiteRelEntity::getWiustCd, dto.getWiustCd());
-//            wrapper.last("limit 1");
-//            MonitorSiteRelEntity relEntity = monitorSiteRelService.getOne(wrapper);
-            LambdaQueryWrapper<WaterUseConsumerInfoEntity> wrapper2 = Wrappers.<WaterUseConsumerInfoEntity>query().lambda();
-            wrapper2.eq(WaterUseConsumerInfoEntity::getWiuCd, dto.getWiuCd());
-            wrapper2.last("limit 1");
-            WaterUseConsumerInfoEntity waterUseConsumerInfoEntity = waterUseConsumerService.getOne(wrapper2);
+        if (Func.isNull(dto.getWiustCd()) || Func.isNull(dto.getWiuCd())) {
+            return R.fail("参数错误");
+        }
+        LambdaQueryWrapper<MonitorSiteInfoEntity> wrapper = Wrappers.<MonitorSiteInfoEntity>query().lambda();
+        wrapper.eq(MonitorSiteInfoEntity::getIsDeleted, 0);
+        wrapper.eq(MonitorSiteInfoEntity::getWiustCd, dto.getWiustCd());
+        long count = monitorSiteService.count(wrapper);
+        if (count > 0) {
+            return R.fail("测站已经存在");
+        }
+        //添加RTU
+        RtuInfoEntity rtuInfoEntity = rtuBaseInfoService.rtuInfoByRtuCode(dto.getWiustCd());
+        if (Func.isNull(rtuInfoEntity)) {
+            rtuInfoEntity = new RtuInfoEntity();
+        }
+        rtuInfoEntity.setRtuCode(dto.getWiustCd());
+        rtuInfoEntity.setRtuName(dto.getWiustNm());
+        LambdaQueryWrapper<WaterUseConsumerInfoEntity> wrapper2 = Wrappers.<WaterUseConsumerInfoEntity>query().lambda();
+        wrapper2.eq(WaterUseConsumerInfoEntity::getIsDeleted, 0);
+        wrapper2.eq(WaterUseConsumerInfoEntity::getWiuCd, dto.getWiuCd());
+        WaterUseConsumerInfoEntity waterUseConsumerInfoEntity = waterUseConsumerService.getOne(wrapper2);
+        if (Func.notNull(waterUseConsumerInfoEntity)) {
             rtuInfoEntity.setOrgId(waterUseConsumerInfoEntity.getOrgId());
-            rtuBaseInfoService.save(rtuInfoEntity);
-
-            MonitorSiteRelEntity relEntity = new MonitorSiteRelEntity();
-            relEntity.setWiustCd(dto.getWiustCd());
-            relEntity.setWiuCd(dto.getWiuCd());
-            return R.status(monitorSiteRelService.save(relEntity));
         }
-        return R.status(false);
+        rtuBaseInfoService.saveOrUpdate(rtuInfoEntity);
+        //测站和用水户关联表
+        monitorSiteRelService.removeRel(dto.getWiustCd());
+        MonitorSiteRelEntity relEntity = new MonitorSiteRelEntity();
+        relEntity.setWiustCd(dto.getWiustCd());
+        relEntity.setWiuCd(dto.getWiuCd());
+        monitorSiteRelService.save(relEntity);
+        return R.status(monitorSiteService.save(dto));
     }
 
     /**
@@ -140,33 +154,17 @@ public class MonitorSiteController extends BladeController {
     @ApiOperationSupport(order = 5)
     @ApiOperation(value = "修改", notes = "")
     public R update(@RequestBody MonitorSiteInfoDTO dto) {
-//        LambdaQueryWrapper<MonitorSiteRelEntity> wrapper = Wrappers.<MonitorSiteRelEntity>query().lambda();
-//        wrapper.eq(MonitorSiteRelEntity::getWiustCd, dto.getWiustCd());
-//        wrapper.last("limit 1");
-//        MonitorSiteRelEntity relEntity = monitorSiteRelService.getOne(wrapper);
-//        relEntity.setWiuCd(dto.getWiuCd());
-//        monitorSiteRelService.updateById(relEntity);
-        return R.status(monitorSiteService.updateById(dto));
-    }
-
-    /**
-     * 新增或修改
-     */
-    @PostMapping("/submit")
-    @ApiOperationSupport(order = 6)
-    @ApiOperation(value = "新增或修改", notes = "")
-    public R submit(@RequestBody MonitorSiteInfoDTO dto) {
-        if (dto.getId() != null) {
-            return R.status(monitorSiteService.updateById(dto));
-        } else {
-            if (monitorSiteService.save(dto)) {
-                MonitorSiteRelEntity relEntity = new MonitorSiteRelEntity();
-                relEntity.setWiustCd(dto.getWiustCd());
-                relEntity.setWiuCd(dto.getWiuCd());
-                return R.status(monitorSiteRelService.save(relEntity));
+        if (Func.isNull(dto.getId())) {
+            return R.fail("参数错误");
+        }
+        if (monitorSiteService.updateById(dto)) {
+            RtuInfoEntity rtuInfoEntity = rtuBaseInfoService.rtuInfoByRtuCode(dto.getWiustCd());
+            if (Func.notNull(rtuInfoEntity)) {
+                rtuInfoEntity.setRtuName(dto.getWiustNm());
+                rtuBaseInfoService.updateById(rtuInfoEntity);
             }
         }
-        return R.status(false);
+        return R.status(true);
     }
 
     /**
@@ -176,7 +174,29 @@ public class MonitorSiteController extends BladeController {
     @ApiOperationSupport(order = 7)
     @ApiOperation(value = "逻辑删除", notes = "")
     public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) {
+        List<Long> idArr = Func.toLongList(ids);
+        for (Long id : idArr) {
+            MonitorSiteInfoEntity entity = monitorSiteService.getById(id);
+            //删除RTU
+            RtuInfoEntity rtuInfoEntity = rtuBaseInfoService.rtuInfoByRtuCode(entity.getWiustCd());
+            if (Func.notNull(rtuInfoEntity)) {
+                rtuBaseInfoService.deleteLogic(Func.toLongList(Func.toStr(rtuInfoEntity.getId())));
+            }
+            //删除RTU状态
+//            LambdaQueryWrapper<RtuStatusEntity> wrapper = Wrappers.<RtuStatusEntity>query().lambda();
+//            wrapper.eq(RtuStatusEntity::getIsDeleted, 0);
+//            wrapper.eq(RtuStatusEntity::getRtuCode, entity.getWiustCd());
+//            RtuStatusEntity rtuStatusEntity = rtuManageService.getOne(wrapper);
+//            if (Func.notNull(rtuStatusEntity)) {
+//                rtuManageService.deleteLogic(Func.toLongList(Func.toStr(rtuStatusEntity.getId())));
+//            }
+            //删除站点下点位
+            monitorSiteService.removeRelPoints(entity.getWiustCd());
+            //删除测站和用水户关联表
+            monitorSiteRelService.removeRel(entity.getWiustCd());
+        }
+        //删除站点
         boolean temp = monitorSiteService.deleteLogic(Func.toLongList(ids));
-        return R.status(temp);
+        return R.status(true);
     }
 }

src/main/java/org/springblade/modules/baseinfo/monitorsite/dto/MonitorSiteInfoDTO.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/10/19
  */
 package org.springblade.modules.baseinfo.monitorsite.dto;

src/main/java/org/springblade/modules/baseinfo/monitorsite/entity/MonitorSiteInfoEntity.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/10/19
  */
 package org.springblade.modules.baseinfo.monitorsite.entity;

src/main/java/org/springblade/modules/baseinfo/monitorsite/entity/MonitorSiteRelEntity.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/10/19
  */
 package org.springblade.modules.baseinfo.monitorsite.entity;

src/main/java/org/springblade/modules/baseinfo/monitorsite/mapper/MonitorSiteMapper.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/10/19
  */
 package org.springblade.modules.baseinfo.monitorsite.mapper;
@@ -9,7 +9,6 @@ package org.springblade.modules.baseinfo.monitorsite.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
-import org.springblade.modules.baseinfo.monitorpoint.entity.MonitorPointInfoEntity;
 import org.springblade.modules.baseinfo.monitorsite.dto.MonitorSiteInfoDTO;
 import org.springblade.modules.baseinfo.monitorsite.entity.MonitorSiteInfoEntity;
 import org.springblade.modules.baseinfo.monitorsite.vo.MonitorSiteInfoVO;
@@ -26,7 +25,25 @@ import java.util.List;
  * Remark：认为有必要的其他信息
  */
 public interface MonitorSiteMapper extends BaseMapper<MonitorSiteInfoEntity> {
+    /**
+     * 分页查询
+     * @param page
+     * @param dto
+     * @return
+     */
     List<MonitorSiteInfoVO> selectPage(IPage<MonitorSiteInfoVO> page, @Param("dto") MonitorSiteInfoEntity dto);
+
+    /**
+     * 查询所有站点
+     * @param dto
+     * @return
+     */
     List<MonitorSiteInfoEntity> selectAll(@Param("dto") MonitorSiteInfoEntity dto);
+
+    /**
+     * 查询站点数量
+     * @param dto
+     * @return
+     */
     Long  getMonitorSiteCount(@Param("dto") MonitorSiteInfoDTO dto);
 }

src/main/java/org/springblade/modules/baseinfo/monitorsite/mapper/MonitorSiteRelMapper.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/10/19
  */
 package org.springblade.modules.baseinfo.monitorsite.mapper;

src/main/java/org/springblade/modules/baseinfo/monitorsite/service/IMonitorSiteRelService.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/10/19
  */
 package org.springblade.modules.baseinfo.monitorsite.service;
@@ -20,5 +20,10 @@ import org.springblade.modules.baseinfo.monitorsite.entity.MonitorSiteRelEntity;
  * Remark：认为有必要的其他信息
  */
 public interface IMonitorSiteRelService extends BaseService<MonitorSiteRelEntity> {
-
+    /**
+     * 删除站点关联
+     * @param siteCode
+     * @return
+     */
+    boolean removeRel(String siteCode);
 }

src/main/java/org/springblade/modules/baseinfo/monitorsite/service/IMonitorSiteService.java

@@ -1,18 +1,16 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/10/19
  */
 package org.springblade.modules.baseinfo.monitorsite.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
-import org.springblade.modules.baseinfo.monitorpoint.entity.MonitorPointInfoEntity;
 import org.springblade.modules.baseinfo.monitorsite.dto.MonitorSiteInfoDTO;
 import org.springblade.modules.baseinfo.monitorsite.entity.MonitorSiteInfoEntity;
 import org.springblade.modules.baseinfo.monitorsite.vo.MonitorSiteInfoVO;
-import org.springblade.modules.baseinfo.wateruseconsumer.dto.WaterUseConsumerInfoDTO;
 
 import java.util.List;
 
@@ -26,10 +24,39 @@ import java.util.List;
  * Remark：认为有必要的其他信息
  */
 public interface IMonitorSiteService extends BaseService<MonitorSiteInfoEntity> {
+    /**
+     * 分页查询站点
+     * @param page
+     * @param dto
+     * @return
+     */
     IPage<MonitorSiteInfoVO> selectPage(IPage<MonitorSiteInfoVO> page, MonitorSiteInfoEntity dto);
 
+    /**
+     * 查询所有站点
+     * @param dto
+     * @return
+     */
     List<MonitorSiteInfoEntity> selectAll(MonitorSiteInfoEntity dto);
 
+    /**
+     * 查询站点数量
+     * @param dto
+     * @return
+     */
     Long getMonitorSiteCount(MonitorSiteInfoDTO dto);
 
+    /**
+     * 删除站点关联点位
+     * @param siteCode
+     * @return
+     */
+    boolean removeRelPoints(String siteCode);
+
+    /**
+     * 删除用水户下站点
+     * @param wiuCode
+     * @return
+     */
+    boolean removeSite(String wiuCode);
 }

src/main/java/org/springblade/modules/baseinfo/monitorsite/service/impl/MonitorSiteRelServiceImpl.java

@@ -1,17 +1,22 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/10/19
  */
 package org.springblade.modules.baseinfo.monitorsite.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.tool.utils.Func;
 import org.springblade.modules.baseinfo.monitorsite.entity.MonitorSiteRelEntity;
 import org.springblade.modules.baseinfo.monitorsite.mapper.MonitorSiteRelMapper;
 import org.springblade.modules.baseinfo.monitorsite.service.IMonitorSiteRelService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /***
  * Date:2023/10/19
  * Title:文件所属模块（必须填写）
@@ -23,4 +28,15 @@ import org.springframework.stereotype.Service;
 @Service
 public class MonitorSiteRelServiceImpl extends BaseServiceImpl<MonitorSiteRelMapper, MonitorSiteRelEntity> implements IMonitorSiteRelService {
 
+    @Override
+    public boolean removeRel(String siteCode) {
+        LambdaQueryWrapper<MonitorSiteRelEntity> wrapper = Wrappers.<MonitorSiteRelEntity>query().lambda();
+        wrapper.eq(MonitorSiteRelEntity::getIsDeleted, 0);
+        wrapper.eq(MonitorSiteRelEntity::getWiustCd, siteCode);
+        List<MonitorSiteRelEntity> list = this.list(wrapper);
+        for (MonitorSiteRelEntity entity : list) {
+            this.deleteLogic(Func.toLongList(Func.toStr(entity.getId())));
+        }
+        return true;
+    }
 }

src/main/java/org/springblade/modules/baseinfo/monitorsite/service/impl/MonitorSiteServiceImpl.java

@@ -1,20 +1,33 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/10/19
  */
 package org.springblade.modules.baseinfo.monitorsite.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.baseinfo.monitorpoint.entity.MonitorPointRelEntity;
+import org.springblade.modules.baseinfo.monitorpoint.service.IMonitorPointRelService;
+import org.springblade.modules.baseinfo.monitorpoint.service.IMonitorPointService;
 import org.springblade.modules.baseinfo.monitorsite.dto.MonitorSiteInfoDTO;
 import org.springblade.modules.baseinfo.monitorsite.entity.MonitorSiteInfoEntity;
+import org.springblade.modules.baseinfo.monitorsite.entity.MonitorSiteRelEntity;
 import org.springblade.modules.baseinfo.monitorsite.mapper.MonitorSiteMapper;
+import org.springblade.modules.baseinfo.monitorsite.service.IMonitorSiteRelService;
 import org.springblade.modules.baseinfo.monitorsite.service.IMonitorSiteService;
 import org.springblade.modules.baseinfo.monitorsite.vo.MonitorSiteInfoVO;
+import org.springblade.modules.baseinfo.rtu.entity.RtuInfoEntity;
+import org.springblade.modules.baseinfo.rtu.service.IRtuBaseInfoService;
+import org.springblade.modules.business.rtumanage.entity.RtuStatusEntity;
+import org.springblade.modules.business.rtumanage.service.IRtuManageService;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /***
@@ -27,6 +40,23 @@ import java.util.List;
  */
 @Service
 public class MonitorSiteServiceImpl extends BaseServiceImpl<MonitorSiteMapper, MonitorSiteInfoEntity> implements IMonitorSiteService {
+
+    @Resource
+    private IMonitorPointService monitorPointService;
+
+    @Resource
+    private IMonitorPointRelService pointRelService;
+
+    @Resource
+    private IMonitorSiteRelService siteRelService;
+
+    @Resource
+    private IRtuBaseInfoService rtuBaseInfoService;
+
+    @Resource
+    private IRtuManageService rtuManageService;
+
+
     @Override
     public IPage<MonitorSiteInfoVO> selectPage(IPage<MonitorSiteInfoVO> page, MonitorSiteInfoEntity dto) {
         return page.setRecords(baseMapper.selectPage(page, dto));
@@ -41,4 +71,53 @@ public class MonitorSiteServiceImpl extends BaseServiceImpl<MonitorSiteMapper, M
     public Long getMonitorSiteCount(MonitorSiteInfoDTO dto) {
         return baseMapper.getMonitorSiteCount(dto);
     }
+
+    @Override
+    public boolean removeRelPoints(String siteCode) {
+        //删除点位
+        LambdaQueryWrapper<MonitorPointRelEntity> wrapper = Wrappers.<MonitorPointRelEntity>query().lambda();
+        wrapper.eq(MonitorPointRelEntity::getIsDeleted, 0);
+        wrapper.eq(MonitorPointRelEntity::getWiustCd, siteCode);
+        List<MonitorPointRelEntity> list = pointRelService.list(wrapper);
+        for (MonitorPointRelEntity entity : list) {
+            monitorPointService.removePoint(entity.getMpCd());
+        }
+        return true;
+    }
+
+    @Override
+    public boolean removeSite(String wiuCode) {
+        LambdaQueryWrapper<MonitorSiteRelEntity> wrapper = Wrappers.<MonitorSiteRelEntity>query().lambda();
+        wrapper.eq(MonitorSiteRelEntity::getIsDeleted, 0);
+        wrapper.eq(MonitorSiteRelEntity::getWiuCd, wiuCode);
+        List<MonitorSiteRelEntity> relEntityList = siteRelService.list(wrapper);
+        for (MonitorSiteRelEntity relEntity : relEntityList) {
+            LambdaQueryWrapper<MonitorSiteInfoEntity> wrapper2 = Wrappers.<MonitorSiteInfoEntity>query().lambda();
+            wrapper2.eq(MonitorSiteInfoEntity::getIsDeleted, 0);
+            wrapper2.eq(MonitorSiteInfoEntity::getWiustCd, relEntity.getWiustCd());
+            List<MonitorSiteInfoEntity> list = this.list(wrapper2);
+            for (MonitorSiteInfoEntity entity : list) {
+                //删除站点下的点位
+                this.removeRelPoints(entity.getWiustCd());
+                //删除RTU
+                RtuInfoEntity rtuInfoEntity = rtuBaseInfoService.rtuInfoByRtuCode(entity.getWiustCd());
+                if (Func.notNull(rtuInfoEntity)) {
+                    rtuBaseInfoService.deleteLogic(Func.toLongList(Func.toStr(rtuInfoEntity.getId())));
+                }
+                //删除RTU状态
+//                LambdaQueryWrapper<RtuStatusEntity> wrapper3 = Wrappers.<RtuStatusEntity>query().lambda();
+//                wrapper3.eq(RtuStatusEntity::getIsDeleted, 0);
+//                wrapper3.eq(RtuStatusEntity::getRtuCode, entity.getWiustCd());
+//                RtuStatusEntity rtuStatusEntity = rtuManageService.getOne(wrapper3);
+//                if (Func.notNull(rtuStatusEntity)) {
+//                    rtuManageService.deleteLogic(Func.toLongList(Func.toStr(rtuStatusEntity.getId())));
+//                }
+                //删除站点
+                this.deleteLogic(Func.toLongList(Func.toStr(entity.getId())));
+            }
+            //删除站点关联
+            siteRelService.removeRel(relEntity.getWiustCd());
+        }
+        return true;
+    }
 }

src/main/java/org/springblade/modules/baseinfo/monitorsite/vo/MonitorSiteInfoVO.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/10/19
  */
 package org.springblade.modules.baseinfo.monitorsite.vo;

src/main/java/org/springblade/modules/baseinfo/monitorsite/wrapper/MonitorSiteWrapper.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/10/19
  */
 package org.springblade.modules.baseinfo.monitorsite.wrapper;

src/main/java/org/springblade/modules/baseinfo/org/entity/OrgInfoEntity.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/6/30
  */
 package org.springblade.modules.baseinfo.org.entity;

src/main/java/org/springblade/modules/baseinfo/org/entity/OrgTreeNodeEntity.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/9/6
  */
 package org.springblade.modules.baseinfo.org.entity;

src/main/java/org/springblade/modules/baseinfo/org/mapper/BaseOrgMapper.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/2/23
  */
 package org.springblade.modules.baseinfo.org.mapper;

src/main/java/org/springblade/modules/baseinfo/org/service/IBaseOrgService.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/6/30
  */
 package org.springblade.modules.baseinfo.org.service;

src/main/java/org/springblade/modules/baseinfo/org/service/impl/BaseOrgServiceImpl.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/6/30
  */
 package org.springblade.modules.baseinfo.org.service.impl;

src/main/java/org/springblade/modules/baseinfo/project/controller/ProjectBaseInfoController.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.baseinfo.project.controller;

src/main/java/org/springblade/modules/baseinfo/project/entity/ProjectInfoEntity.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.baseinfo.project.entity;

src/main/java/org/springblade/modules/baseinfo/project/entity/ProjectTreeNodeEntity.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/28
  */
 package org.springblade.modules.baseinfo.project.entity;

src/main/java/org/springblade/modules/baseinfo/project/entity/ProjectWarningSettingEntity.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/23
  */
 package org.springblade.modules.baseinfo.project.entity;

src/main/java/org/springblade/modules/baseinfo/project/mapper/ProjectInfoMapper.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.baseinfo.project.mapper;

src/main/java/org/springblade/modules/baseinfo/project/mapper/ProjectWarningSettingMapper.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/23
  */
 package org.springblade.modules.baseinfo.project.mapper;

src/main/java/org/springblade/modules/baseinfo/project/service/IProjectBaseInfoService.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.baseinfo.project.service;

src/main/java/org/springblade/modules/baseinfo/project/service/IProjectWarningSettingService.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/23
  */
 package org.springblade.modules.baseinfo.project.service;

src/main/java/org/springblade/modules/baseinfo/project/service/impl/ProjectBaseInfoServiceImpl.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.baseinfo.project.service.impl;

src/main/java/org/springblade/modules/baseinfo/project/service/impl/ProjectWarningSettingServiceImpl.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/23
  */
 package org.springblade.modules.baseinfo.project.service.impl;

src/main/java/org/springblade/modules/baseinfo/project/vo/ProjectInfoVO.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.baseinfo.project.vo;

src/main/java/org/springblade/modules/baseinfo/region/dto/RegionInfoDTO.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.baseinfo.region.dto;

src/main/java/org/springblade/modules/baseinfo/region/entity/RegionTreeNodeEntity.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/9/6
  */
 package org.springblade.modules.baseinfo.region.entity;

src/main/java/org/springblade/modules/baseinfo/region/mapper/RegionInfoMapper.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.baseinfo.region.mapper;

src/main/java/org/springblade/modules/baseinfo/region/vo/RegionInfoVO.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.baseinfo.region.vo;

src/main/java/org/springblade/modules/baseinfo/region/wrapper/RegionInfoNodeWrapper.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.baseinfo.region.wrapper;

src/main/java/org/springblade/modules/baseinfo/region/wrapper/RegionInfoWrapper.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.baseinfo.region.wrapper;

src/main/java/org/springblade/modules/baseinfo/rtu/dto/RtuInfoDTO.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/9/7
  */
 package org.springblade.modules.baseinfo.rtu.dto;

src/main/java/org/springblade/modules/baseinfo/rtu/mapper/RtuInfoMapper.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.baseinfo.rtu.mapper;

src/main/java/org/springblade/modules/baseinfo/rtu/service/IRtuBaseInfoService.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.baseinfo.rtu.service;

src/main/java/org/springblade/modules/baseinfo/rtu/service/impl/RtuBaseInfoServiceImpl.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.baseinfo.rtu.service.impl;

src/main/java/org/springblade/modules/baseinfo/rtu/vo/RtuInfoVO.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.baseinfo.rtu.vo;

src/main/java/org/springblade/modules/baseinfo/rtu/vo/RtuStatisticsInfoVO.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/9/24
  */
 package org.springblade.modules.baseinfo.rtu.vo;

src/main/java/org/springblade/modules/baseinfo/rtu/wrapper/RtuInfoWrapper.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.baseinfo.rtu.wrapper;

src/main/java/org/springblade/modules/baseinfo/stbase/entity/MvAttStBaseEntity.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/9/8
  */
 package org.springblade.modules.baseinfo.stbase.entity;

src/main/java/org/springblade/modules/baseinfo/stbase/mapper/MvAttStBaseMapper.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/24
  */
 package org.springblade.modules.baseinfo.stbase.mapper;

src/main/java/org/springblade/modules/baseinfo/stbase/service/IMvAttStBaseService.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/9/8
  */
 package org.springblade.modules.baseinfo.stbase.service;

src/main/java/org/springblade/modules/baseinfo/stbase/service/impl/MvAttStBaseServiceImpl.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/9/8
  */
 package org.springblade.modules.baseinfo.stbase.service.impl;

src/main/java/org/springblade/modules/baseinfo/warn/entity/BaseWarnSettingEntity.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/24
  */
 package org.springblade.modules.baseinfo.warn.entity;

src/main/java/org/springblade/modules/baseinfo/warn/mapper/BaseWarnSettingMapper.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/4/23
  */
 package org.springblade.modules.baseinfo.warn.mapper;

src/main/java/org/springblade/modules/baseinfo/warn/service/IBaseWarnSettingService.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/4/23
  */
 package org.springblade.modules.baseinfo.warn.service;

src/main/java/org/springblade/modules/baseinfo/warn/service/impl/BaseWarnSettingServiceImpl.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/4/23
  */
 package org.springblade.modules.baseinfo.warn.service.impl;

src/main/java/org/springblade/modules/baseinfo/wateruseconsumer/controller/WaterUseConsumerController.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/10/19
  */
 package org.springblade.modules.baseinfo.wateruseconsumer.controller;
@@ -16,6 +16,8 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 
+import org.springblade.modules.baseinfo.monitorsite.service.IMonitorSiteRelService;
+import org.springblade.modules.baseinfo.monitorsite.service.IMonitorSiteService;
 import org.springblade.modules.baseinfo.wateruseconsumer.entity.WaterUseConsumerInfoEntity;
 import org.springblade.modules.baseinfo.wateruseconsumer.service.IWaterUseConsumerService;
 import org.springblade.modules.baseinfo.wateruseconsumer.vo.WaterUseConsumerInfoVO;
@@ -39,6 +41,8 @@ import java.util.List;
 @Api(value = "监测点模块", tags = "监测点接口")
 public class WaterUseConsumerController extends BladeController {
     private final IWaterUseConsumerService waterUseConsumerService;
+    private final IMonitorSiteService monitorSiteService;
+    private final IMonitorSiteRelService monitorSiteRelService;
 
     /**
      * 多表联合查询自定义分页
@@ -68,7 +72,7 @@ public class WaterUseConsumerController extends BladeController {
     @ApiOperation(value = "分页")
     public R<List<WaterUseConsumerInfoVO>> list(@ApiIgnore WaterUseConsumerInfoEntity dto) {
         List<WaterUseConsumerInfoEntity> list = waterUseConsumerService.selectAll(dto);
-        return R.data( WaterUseConsumerWrapper.build().listVO(list));
+        return R.data(WaterUseConsumerWrapper.build().listVO(list));
     }
 
     /**
@@ -103,16 +107,6 @@ public class WaterUseConsumerController extends BladeController {
         return R.status(waterUseConsumerService.updateById(dto));
     }
 
-    /**
-     * 新增或修改
-     */
-    @PostMapping("/submit")
-    @ApiOperationSupport(order = 6)
-    @ApiOperation(value = "新增或修改", notes = "")
-    public R submit(@RequestBody WaterUseConsumerInfoEntity dto) {
-        return R.status(waterUseConsumerService.saveOrUpdate(dto));
-    }
-
     /**
      * 删除
      */
@@ -120,6 +114,11 @@ public class WaterUseConsumerController extends BladeController {
     @ApiOperationSupport(order = 7)
     @ApiOperation(value = "逻辑删除", notes = "")
     public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) {
+        List<Long> idArr = Func.toLongList(ids);
+        for (Long id : idArr) {
+            WaterUseConsumerInfoEntity waterUseConsumerInfoEntity = waterUseConsumerService.getById(id);
+            monitorSiteService.removeSite(waterUseConsumerInfoEntity.getWiuCd());
+        }
         boolean temp = waterUseConsumerService.deleteLogic(Func.toLongList(ids));
         return R.status(temp);
     }

src/main/java/org/springblade/modules/baseinfo/wateruseconsumer/dto/WaterUseConsumerInfoDTO.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/10/19
  */
 package org.springblade.modules.baseinfo.wateruseconsumer.dto;

src/main/java/org/springblade/modules/baseinfo/wateruseconsumer/entity/WaterUseConsumerInfoEntity.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/10/19
  */
 package org.springblade.modules.baseinfo.wateruseconsumer.entity;

src/main/java/org/springblade/modules/baseinfo/wateruseconsumer/mapper/WaterUseConsumerMapper.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/10/19
  */
 package org.springblade.modules.baseinfo.wateruseconsumer.mapper;

src/main/java/org/springblade/modules/baseinfo/wateruseconsumer/service/IWaterUseConsumerService.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/10/19
  */
 package org.springblade.modules.baseinfo.wateruseconsumer.service;

src/main/java/org/springblade/modules/baseinfo/wateruseconsumer/service/impl/WaterUseConsumerServiceImpl.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/10/19
  */
 package org.springblade.modules.baseinfo.wateruseconsumer.service.impl;

src/main/java/org/springblade/modules/baseinfo/wateruseconsumer/vo/WaterUseConsumerInfoVO.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/10/19
  */
 package org.springblade.modules.baseinfo.wateruseconsumer.vo;

src/main/java/org/springblade/modules/baseinfo/wateruseconsumer/wrapper/WaterUseConsumerWrapper.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/10/19
  */
 package org.springblade.modules.baseinfo.wateruseconsumer.wrapper;

src/main/java/org/springblade/modules/business/check/order/dto/CheckOrderInfoDTO.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.business.check.order.dto;

src/main/java/org/springblade/modules/business/check/order/entity/CheckOrderInfoEntity.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.business.check.order.entity;

src/main/java/org/springblade/modules/business/check/order/entity/CheckOrderSettingEntity.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/3/8
  */
 package org.springblade.modules.business.check.order.entity;

src/main/java/org/springblade/modules/business/check/order/mapper/CheckOrderSettingMapper.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.business.check.order.mapper;

src/main/java/org/springblade/modules/business/check/order/mapper/RtuCheckOrderMapper.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.business.check.order.mapper;

src/main/java/org/springblade/modules/business/check/order/service/ICheckOrderSettingService.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.business.check.order.service;

src/main/java/org/springblade/modules/business/check/order/service/IRtuCheckOrderService.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.business.check.order.service;

src/main/java/org/springblade/modules/business/check/order/service/impl/CheckOrderSettingServiceImpl.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.business.check.order.service.impl;

src/main/java/org/springblade/modules/business/check/order/service/impl/RtuCheckOrderServiceImpl.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.business.check.order.service.impl;

src/main/java/org/springblade/modules/business/check/order/vo/CheckOrderCountVO.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/9/22
  */
 package org.springblade.modules.business.check.order.vo;

src/main/java/org/springblade/modules/business/check/order/vo/CheckOrderHistroyVO.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/6/7
  */
 package org.springblade.modules.business.check.order.vo;

src/main/java/org/springblade/modules/business/check/order/vo/CheckOrderInfoVO.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.business.check.order.vo;

src/main/java/org/springblade/modules/business/check/order/vo/OrgCheckOrderCountVO.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/9/22
  */
 package org.springblade.modules.business.check.order.vo;

src/main/java/org/springblade/modules/business/check/process/dto/OrderProcessInfoDTO.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.business.check.process.dto;

src/main/java/org/springblade/modules/business/check/process/entity/OrderProcessInfoEntity.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.business.check.process.entity;

src/main/java/org/springblade/modules/business/check/process/service/IRtuOrderProcessService.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.business.check.process.service;

src/main/java/org/springblade/modules/business/check/process/service/impl/RtuOrderProcessServiceImpl.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.business.check.process.service.impl;

src/main/java/org/springblade/modules/business/check/process/vo/OrderProcessInfoVO.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2022/8/22
  */
 package org.springblade.modules.business.check.process.vo;

src/main/java/org/springblade/modules/business/count/controller/CountController.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/10/26
  */
 package org.springblade.modules.business.count.controller;
@@ -104,7 +104,7 @@ public class CountController extends BladeController {
             //监测点
             MonitorPointInfoDTO monitorPointInfoDTO = new MonitorPointInfoDTO();
             monitorPointInfoDTO.setOrgId(dept.getId());
-            count = monitorPointService.gtMonitorPointCount(monitorPointInfoDTO);
+            count = monitorPointService.getMonitorPointCount(monitorPointInfoDTO);
             vo.setMonitorPoint(count);
             list.add(vo);
         }

src/main/java/org/springblade/modules/business/count/dto/OrgWaterUseCountDTO.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/10/26
  */
 package org.springblade.modules.business.count.dto;

src/main/java/org/springblade/modules/business/count/dto/WaterUseConsumerCountDTO.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/10/26
  */
 package org.springblade.modules.business.count.dto;

src/main/java/org/springblade/modules/business/count/entity/HistoryComparisonCountEntity.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/10/26
  */
 package org.springblade.modules.business.count.entity;

src/main/java/org/springblade/modules/business/count/entity/MonitorSiteCountEntity.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2019 DH
  * All right reserved.
- * 项目名称: 大恒泰山系统
+ * 项目名称: 运维系统
  * 创建日期:2023/10/26
  */
 package org.springblade.modules.business.count.entity;