From dfe27308ba5690cd3506127c9a308048bee9ad15 Mon Sep 17 00:00:00 2001
From: guo <guo@guo>
Date: Fri, 26 Jan 2024 16:03:38 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/DischargingPlatformCurrentData.java     |  6 ++++++
 .../mapper/xml/DischargingPlatformAlarmMapper.xml  |  4 +++-
 .../FrontierProtectionNoNetDataController.java     |  2 +-
 .../{ => dto}/FrontierProtectionNoNetDataDto.java  |  2 +-
 .../IFrontierProtectionNoNetDataService.java       |  2 +-
 .../FrontierProtectionNoNetDataServiceImpl.java    |  4 +---
 .../FrontierProtectionNoNetDevServiceImpl.java     | 14 ++++++++++++++
 .../entity/PressureTestMachineDev.java             |  6 +++---
 8 files changed, 30 insertions(+), 10 deletions(-)
 rename src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/entity/{ => dto}/FrontierProtectionNoNetDataDto.java (91%)

diff --git a/src/main/java/com/zhgd/xmgl/modules/discharging/entity/DischargingPlatformCurrentData.java b/src/main/java/com/zhgd/xmgl/modules/discharging/entity/DischargingPlatformCurrentData.java
index 749516e5b..4c27ec757 100644
--- a/src/main/java/com/zhgd/xmgl/modules/discharging/entity/DischargingPlatformCurrentData.java
+++ b/src/main/java/com/zhgd/xmgl/modules/discharging/entity/DischargingPlatformCurrentData.java
@@ -96,4 +96,10 @@ public class DischargingPlatformCurrentData implements Serializable {
     @TableField(exist = false)
     @ApiModelProperty(value = "devName")
     private String devName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "1严重2较重3一般")
+    private Integer status;
+
+
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/discharging/mapper/xml/DischargingPlatformAlarmMapper.xml b/src/main/java/com/zhgd/xmgl/modules/discharging/mapper/xml/DischargingPlatformAlarmMapper.xml
index 81dd09736..77e3bb7b8 100644
--- a/src/main/java/com/zhgd/xmgl/modules/discharging/mapper/xml/DischargingPlatformAlarmMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/discharging/mapper/xml/DischargingPlatformAlarmMapper.xml
@@ -3,7 +3,9 @@
 <mapper namespace="com.zhgd.xmgl.modules.discharging.mapper.DischargingPlatformAlarmMapper">
     <select id="queryDischargingPlatformAlarmPageList"
             resultType="com.zhgd.xmgl.modules.discharging.entity.DischargingPlatformCurrentData">
-        SELECT b.*,a.alarm_type,a.add_time alarm_time,c.dev_name
+        SELECT b.*,a.alarm_type,a.add_time alarm_time,c.dev_name,
+        a.alarm_level,
+        CASE WHEN alarm_level=1 THEN 1 WHEN alarm_level=2 or alarm_level=3 THEN 2 ELSE 3 END as status
         from discharging_platform_alarm a INNER JOIN discharging_platform_current_data b ON a.currentdata_id=b.id
         LEFT JOIN discharging_platform_dev c ON c.dev_sn=b.dev_sn
         where a.project_sn=#{param.projectSn}
diff --git a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/controller/FrontierProtectionNoNetDataController.java b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/controller/FrontierProtectionNoNetDataController.java
index ef910250c..ab569c1a9 100644
--- a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/controller/FrontierProtectionNoNetDataController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/controller/FrontierProtectionNoNetDataController.java
@@ -1,7 +1,7 @@
 package com.zhgd.xmgl.modules.frontierprotectionnonet.controller;
 
 import com.zhgd.xmgl.modules.frontierprotectionnonet.entity.FrontierProtectionNoNetData;
-import com.zhgd.xmgl.modules.frontierprotectionnonet.entity.FrontierProtectionNoNetDataDto;
+import com.zhgd.xmgl.modules.frontierprotectionnonet.entity.dto.FrontierProtectionNoNetDataDto;
 import com.zhgd.xmgl.modules.frontierprotectionnonet.service.IFrontierProtectionNoNetDataService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
diff --git a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/entity/FrontierProtectionNoNetDataDto.java b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/entity/dto/FrontierProtectionNoNetDataDto.java
similarity index 91%
rename from src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/entity/FrontierProtectionNoNetDataDto.java
rename to src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/entity/dto/FrontierProtectionNoNetDataDto.java
index 66b8d9eac..71a6f91f0 100644
--- a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/entity/FrontierProtectionNoNetDataDto.java
+++ b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/entity/dto/FrontierProtectionNoNetDataDto.java
@@ -1,4 +1,4 @@
-package com.zhgd.xmgl.modules.frontierprotectionnonet.entity;
+package com.zhgd.xmgl.modules.frontierprotectionnonet.entity.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
diff --git a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/IFrontierProtectionNoNetDataService.java b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/IFrontierProtectionNoNetDataService.java
index 31bce6c9a..660c13f7b 100644
--- a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/IFrontierProtectionNoNetDataService.java
+++ b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/IFrontierProtectionNoNetDataService.java
@@ -3,7 +3,7 @@ package com.zhgd.xmgl.modules.frontierprotectionnonet.service;
 import com.zhgd.xmgl.modules.frontierprotectionnonet.entity.FrontierProtectionNoNetData;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.zhgd.xmgl.modules.frontierprotectionnonet.entity.FrontierProtectionNoNetDataDto;
+import com.zhgd.xmgl.modules.frontierprotectionnonet.entity.dto.FrontierProtectionNoNetDataDto;
 
 import java.util.HashMap;
 import java.util.List;
diff --git a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/impl/FrontierProtectionNoNetDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/impl/FrontierProtectionNoNetDataServiceImpl.java
index 0b1c85bec..ccefb7d14 100644
--- a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/impl/FrontierProtectionNoNetDataServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/impl/FrontierProtectionNoNetDataServiceImpl.java
@@ -1,16 +1,14 @@
 package com.zhgd.xmgl.modules.frontierprotectionnonet.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zhgd.jeecg.common.execption.OpenAlertException;
 import com.zhgd.xmgl.modules.frontierprotectionnonet.entity.FrontierProtectionNoNetData;
-import com.zhgd.xmgl.modules.frontierprotectionnonet.entity.FrontierProtectionNoNetDataDto;
+import com.zhgd.xmgl.modules.frontierprotectionnonet.entity.dto.FrontierProtectionNoNetDataDto;
 import com.zhgd.xmgl.modules.frontierprotectionnonet.entity.FrontierProtectionNoNetDev;
 import com.zhgd.xmgl.modules.frontierprotectionnonet.mapper.FrontierProtectionNoNetDataMapper;
 import com.zhgd.xmgl.modules.frontierprotectionnonet.mapper.FrontierProtectionNoNetDevMapper;
 import com.zhgd.xmgl.modules.frontierprotectionnonet.service.IFrontierProtectionNoNetDataService;
 import com.zhgd.xmgl.security.entity.UserInfo;
 import com.zhgd.xmgl.security.util.SecurityUtils;
-import io.swagger.models.auth.In;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
diff --git a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/impl/FrontierProtectionNoNetDevServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/impl/FrontierProtectionNoNetDevServiceImpl.java
index d0c97e0e2..e1614cc56 100644
--- a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/impl/FrontierProtectionNoNetDevServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/impl/FrontierProtectionNoNetDevServiceImpl.java
@@ -1,5 +1,7 @@
 package com.zhgd.xmgl.modules.frontierprotectionnonet.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zhgd.jeecg.common.execption.OpenAlertException;
 import com.zhgd.xmgl.modules.frontierprotectionnonet.entity.FrontierProtectionNoNetDev;
 import com.zhgd.xmgl.modules.frontierprotectionnonet.mapper.FrontierProtectionNoNetDevMapper;
 import com.zhgd.xmgl.modules.frontierprotectionnonet.service.IFrontierProtectionNoNetDevService;
@@ -58,12 +60,24 @@ public class FrontierProtectionNoNetDevServiceImpl extends ServiceImpl<FrontierP
 
     @Override
     public void add(FrontierProtectionNoNetDev frontierProtectionNoNetDev) {
+        FrontierProtectionNoNetDev dev = frontierProtectionNoNetDevMapper.selectOne(new LambdaQueryWrapper<FrontierProtectionNoNetDev>()
+                .eq(FrontierProtectionNoNetDev::getDevSn, frontierProtectionNoNetDev.getDevSn()));
+        if (dev != null) {
+            throw new OpenAlertException("设备SN已存在");
+        }
         frontierProtectionNoNetDev.setId(null);
         baseMapper.insert(frontierProtectionNoNetDev);
     }
 
     @Override
     public void edit(FrontierProtectionNoNetDev frontierProtectionNoNetDev) {
+        FrontierProtectionNoNetDev dev = frontierProtectionNoNetDevMapper.selectOne(new LambdaQueryWrapper<FrontierProtectionNoNetDev>()
+                .eq(FrontierProtectionNoNetDev::getDevSn, frontierProtectionNoNetDev.getDevSn())
+                .ne(FrontierProtectionNoNetDev::getId, frontierProtectionNoNetDev.getId())
+        );
+        if (dev != null) {
+            throw new OpenAlertException("设备SN已存在");
+        }
         baseMapper.updateById(frontierProtectionNoNetDev);
     }
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/pressuretest/entity/PressureTestMachineDev.java b/src/main/java/com/zhgd/xmgl/modules/pressuretest/entity/PressureTestMachineDev.java
index 1bca17a1b..af132cedf 100644
--- a/src/main/java/com/zhgd/xmgl/modules/pressuretest/entity/PressureTestMachineDev.java
+++ b/src/main/java/com/zhgd/xmgl/modules/pressuretest/entity/PressureTestMachineDev.java
@@ -64,9 +64,9 @@ public class PressureTestMachineDev implements Serializable {
 	/**
 	 * 进场时间
 	 */
-	@Excel(name = "进场时间", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@Excel(name = "进场时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	@ApiModelProperty(value = "进场时间")
 	private java.util.Date entryDate;
 	@ApiModelProperty(value = "负责人")