From 6e54b432ab969eccb47b0aa388b95bf14e398790 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 31 八月 2023 10:34:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java |   74 +++++++++++++++++++++++++++++++++++++
 1 files changed, 74 insertions(+), 0 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java b/ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java
index e7c4321..c18c197 100644
--- a/ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java
@@ -2,7 +2,11 @@
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWell;
+import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWellParam;
 import com.ruoyi.alarmpoints.well.mapper.ArdAlarmpointsWellMapper;
 import com.ruoyi.alarmpoints.well.service.IArdAlarmpointsWellService;
 import com.ruoyi.common.annotation.DataScope;
@@ -13,10 +17,13 @@
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.bean.BeanValidators;
 import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.common.utils.uuid.IdUtils;
+import lombok.ToString;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import javax.validation.Validator;
@@ -68,13 +75,31 @@
     }
 
     /**
+     *
+     * @param ardAlarmpointsWell 鎸変簳缂栧彿鏌ヨ
+     * @return
+     */
+    @Override
+    @DataScope(deptAlias = "d",userAlias = "u")
+    public List<ArdAlarmpointsWell> selectArdAlarmpointsWellByWellIdLike(ArdAlarmpointsWell ardAlarmpointsWell) {
+        return ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellIdLike(ardAlarmpointsWell);
+    }
+
+    /**
      * 鏂板浜曠鐞�
      *
      * @param ardAlarmpointsWell 浜曠鐞�
      * @return 缁撴灉
      */
     @Override
+    @Transactional
     public int insertArdAlarmpointsWell(ArdAlarmpointsWell ardAlarmpointsWell) {
+        boolean wellIdExists = ardAlarmpointsWellMapper.checkWellIdExists(ardAlarmpointsWell.getWellId());
+        if(wellIdExists)
+        {
+            throw new RuntimeException("浜曞彿宸插瓨鍦�");
+        }
+        ardAlarmpointsWell.setId(IdUtils.simpleUUID());
         ardAlarmpointsWell.setUserId(SecurityUtils.getUserId());
         ardAlarmpointsWell.setCreateBy(SecurityUtils.getUsername());
         ardAlarmpointsWell.setCreateTime(DateUtils.getNowDate());
@@ -88,7 +113,13 @@
      * @return 缁撴灉
      */
     @Override
+    @Transactional
     public int updateArdAlarmpointsWell(ArdAlarmpointsWell ardAlarmpointsWell) {
+        boolean wellIdExists = ardAlarmpointsWellMapper.checkWellIdExists(ardAlarmpointsWell.getWellId());
+        if(wellIdExists)
+        {
+            throw new RuntimeException("浜曞彿宸插瓨鍦�");
+        }
         ardAlarmpointsWell.setUpdateBy(SecurityUtils.getUsername());
         ardAlarmpointsWell.setUpdateTime(DateUtils.getNowDate());
         return ardAlarmpointsWellMapper.updateArdAlarmpointsWell(ardAlarmpointsWell);
@@ -199,4 +230,47 @@
             }
         }
     }
+
+
+    @Override
+    public List<ArdAlarmpointsWell> wellByDeptList(List<Long> deptList) {
+        QueryWrapper<ArdAlarmpointsWell> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("dept_id",deptList);
+        return ardAlarmpointsWellMapper.selectList(queryWrapper);
+    }
+
+    @Override
+    public ArdAlarmpointsWell wellById(String id) {
+        return ardAlarmpointsWellMapper.selectById(id);
+    }
+
+    @Override
+    public List<ArdAlarmpointsWell> wellList(List<Long> deptList) {
+        QueryWrapper<ArdAlarmpointsWell> queryWrapper = new QueryWrapper<>();
+        queryWrapper.select("id","well_id","oil_production","longitude","latitude","altitude").in("dept_id",deptList);
+        return ardAlarmpointsWellMapper.selectList(queryWrapper);
+    }
+
+    @Override
+    public PageInfo<ArdAlarmpointsWell> conditionList(ArdAlarmpointsWellParam ardAlarmpointsWellParam){
+        Integer pageNum = ardAlarmpointsWellParam.getPageNum();
+        Integer pageSize = ardAlarmpointsWellParam.getPageSize();
+        PageHelper.startPage(pageNum,pageSize);
+        QueryWrapper<ArdAlarmpointsWell> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("dept_id",ardAlarmpointsWellParam.getDeptList())
+        .like(!StringUtils.isBlank(ardAlarmpointsWellParam.getWellId()),"well_id",ardAlarmpointsWellParam.getWellId());
+//        .eq(!StringUtils.isBlank(ardAlarmpointsWellParam.getWellNumber()),"well_number",ardAlarmpointsWellParam.getWellNumber())
+//        .eq(!StringUtils.isBlank(ardAlarmpointsWellParam.getOilProduction()),"oil_production",ardAlarmpointsWellParam.getOilProduction())
+//        .eq(!StringUtils.isBlank(ardAlarmpointsWellParam.getWellBlock()),"well_block",ardAlarmpointsWellParam.getWellBlock())
+//        .eq(!StringUtils.isBlank(ardAlarmpointsWellParam.getDisplacementMode()),"displacement_mode",ardAlarmpointsWellParam.getDisplacementMode())
+//        .eq(!StringUtils.isBlank(ardAlarmpointsWellParam.getSurroundingEnvironment()),"surrounding_environment",ardAlarmpointsWellParam.getSurroundingEnvironment())
+//        .eq(!StringUtils.isBlank(ardAlarmpointsWellParam.getWellType()),"well_type",ardAlarmpointsWellParam.getWellType())
+//        .eq(!StringUtils.isBlank(ardAlarmpointsWellParam.getInstalledLoad()),"installed_load",ardAlarmpointsWellParam.getInstalledLoad())
+//        .eq(!StringUtils.isBlank(ardAlarmpointsWellParam.getMeteringStation()),"metering_station",ardAlarmpointsWellParam.getMeteringStation())
+//        .eq(!StringUtils.isBlank(ardAlarmpointsWellParam.getTransferStation()),"transfer_station",ardAlarmpointsWellParam.getTransferStation())
+//        .eq(!StringUtils.isBlank(ardAlarmpointsWellParam.getDehydrationStation()),"dehydration_station",ardAlarmpointsWellParam.getDehydrationStation())
+//        .eq(!StringUtils.isBlank(ardAlarmpointsWellParam.getRunStatus()),"run_status",ardAlarmpointsWellParam.getRunStatus());
+        List<ArdAlarmpointsWell> list = ardAlarmpointsWellMapper.selectList(queryWrapper);
+        return new PageInfo<>(list);
+    }
 }

--
Gitblit v1.9.3