From 2a5cdf98e669f724758865135f5fefabf7c8f185 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期一, 04 九月 2023 09:23:51 +0800
Subject: [PATCH] 井业务修改井号唯一性验证 电子围栏报警时间改为alarmTime
---
ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java | 64 ++++++++++++++++++++++++++++++-
1 files changed, 61 insertions(+), 3 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 5837b00..f28238b 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
@@ -3,7 +3,10 @@
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;
@@ -14,6 +17,7 @@
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;
@@ -90,11 +94,12 @@
@Override
@Transactional
public int insertArdAlarmpointsWell(ArdAlarmpointsWell ardAlarmpointsWell) {
- boolean wellIdExists = ardAlarmpointsWellMapper.checkWellIdExists(ardAlarmpointsWell.getWellId());
+ boolean wellIdExists = checkWellIdExists(ardAlarmpointsWell);
if(wellIdExists)
{
throw new RuntimeException("浜曞彿宸插瓨鍦�");
}
+ ardAlarmpointsWell.setId(IdUtils.simpleUUID());
ardAlarmpointsWell.setUserId(SecurityUtils.getUserId());
ardAlarmpointsWell.setCreateBy(SecurityUtils.getUsername());
ardAlarmpointsWell.setCreateTime(DateUtils.getNowDate());
@@ -110,7 +115,7 @@
@Override
@Transactional
public int updateArdAlarmpointsWell(ArdAlarmpointsWell ardAlarmpointsWell) {
- boolean wellIdExists = ardAlarmpointsWellMapper.checkWellIdExists(ardAlarmpointsWell.getWellId());
+ boolean wellIdExists = checkWellIdExists(ardAlarmpointsWell);
if(wellIdExists)
{
throw new RuntimeException("浜曞彿宸插瓨鍦�");
@@ -225,7 +230,25 @@
}
}
}
-
+ /**
+ * 鏍稿浜曞彿鏄惁鍞竴
+ *
+ * @param wellId 闇�瑕佹牳瀵圭殑浜曞彿
+ * @return 缁撴灉
+ */
+ @Override
+ public Boolean checkWellIdExists(ArdAlarmpointsWell well) {
+ // 鏍￠獙锛歸ellId
+ String id = (well.getId() == null) ? "" : well.getId();
+ String wellId = well.getWellId();
+ ArdAlarmpointsWell ardAlarmpointsWell = ardAlarmpointsWellMapper.checkWellIdExists(wellId);
+ String infoId = (ardAlarmpointsWell == null) ? "" : (ardAlarmpointsWell.getId());
+ if ((ardAlarmpointsWell != null) && !((infoId).equals(id))) {
+ //宸插瓨鍦�
+ return true;
+ }
+ return false;
+ }
@Override
public List<ArdAlarmpointsWell> wellByDeptList(List<Long> deptList) {
@@ -233,4 +256,39 @@
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