From 6e10fa6147dab847ef9d02248bdd028d6bdd2bb2 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 27 六月 2023 15:44:48 +0800
Subject: [PATCH] 雷达管理增加name
---
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java | 15 ++
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/AlarmTask.java | 2
ruoyi-admin/src/main/resources/application-druid.yml | 10 +-
ard-work/src/main/resources/mapper/device/ArdEquipRadarMapper.xml | 6 +
ard-work/src/main/java/com/ruoyi/device/radar/domain/ArdEquipRadar.java | 226 +++++++++++++++++++++++++--------------------
5 files changed, 150 insertions(+), 109 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java
index 8bb6f21..1bf8e38 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java
@@ -35,8 +35,15 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.io.UnsupportedEncodingException;
+import java.math.BigInteger;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import java.util.stream.Collectors;
@@ -359,7 +366,7 @@
*/
@Override
public Map<String, Object> selectAlarmLogsCount() {
- Map<String,Object> map=new HashMap<>();
+ Map<String, Object> map = new HashMap<>();
Map<String, Integer> countMap = new HashMap<>();
String refreshTime = configService.selectConfigByKey("refreshTime");
int count1001 = ardAlarmStealelecMapper.selectCountByStartTime(refreshTime);
@@ -368,12 +375,12 @@
countMap.put("1002", count1002);
int count1014 = ardAlarmTubeMapper.selectCountByAlarmTime(refreshTime);
countMap.put("1014", count1014);
- map.put("20000",countMap);
+ map.put("20000", countMap);
return map;
}
@Override
- public Object selectAlarmList(Integer command, String beginTime, String endTime,Integer pageNum,Integer pageSize) {
+ public Object selectAlarmList(Integer command, String beginTime, String endTime, Integer pageNum, Integer pageSize) {
Map<String, Object> params = new HashMap<>();
params.put("beginTime", beginTime);
params.put("endTime", endTime);
@@ -402,6 +409,7 @@
}
return null;
}
+
public static void main(String[] args) {
// 缁欏畾鍧愭爣 A
double Ax = 0;
@@ -423,4 +431,5 @@
// 杈撳嚭缁撴灉
System.out.println("鍧愭爣 B: (" + Bx + ", " + By + ")");
}
+
}
diff --git a/ard-work/src/main/java/com/ruoyi/device/radar/domain/ArdEquipRadar.java b/ard-work/src/main/java/com/ruoyi/device/radar/domain/ArdEquipRadar.java
index 792fec1..f823752 100644
--- a/ard-work/src/main/java/com/ruoyi/device/radar/domain/ArdEquipRadar.java
+++ b/ard-work/src/main/java/com/ruoyi/device/radar/domain/ArdEquipRadar.java
@@ -1,6 +1,7 @@
package com.ruoyi.device.radar.domain;
import java.util.Date;
+
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
@@ -9,202 +10,227 @@
/**
* radar瀵硅薄 ard_equip_radar
- *
+ *
* @author zj
* @date 2023-03-11
*/
-public class ArdEquipRadar extends BaseEntity
-{
+public class ArdEquipRadar extends BaseEntity {
private static final long serialVersionUID = 1L;
- /** id */
+ /**
+ * id
+ */
private String id;
-
- /** 绔彛 */
+ /**
+ * 鍚嶇О
+ */
+ private String name;
+ /**
+ * 绔彛
+ */
private String port;
- /** 鎿嶄綔鍛榠d */
+ /**
+ * 鎿嶄綔鍛榠d
+ */
private String operate;
- /** 鍒犻櫎鏍囪 */
+ /**
+ * 鍒犻櫎鏍囪
+ */
private String delFlag;
- /** 鐢ㄦ埛id */
+ /**
+ * 鐢ㄦ埛id
+ */
@Excel(name = "鐢ㄦ埛id")
private String userId;
- /** 缁忓害 */
+ /**
+ * 缁忓害
+ */
private String longitude;
- /** 缁村害 */
+ /**
+ * 缁村害
+ */
private String latitude;
- /** 楂樼▼ */
+ /**
+ * 楂樼▼
+ */
private String altitude;
- /** 瀹夎鏃堕棿 */
+ /**
+ * 瀹夎鏃堕棿
+ */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "瀹夎鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
private Date radarDate;
- /** 閮ㄩ棬id */
+ /**
+ * 閮ㄩ棬id
+ */
@Excel(name = "閮ㄩ棬id")
private Long deptId;
- /** 淇话瑙� */
+ /**
+ * 淇话瑙�
+ */
private String pitch;
- /** 濉攊d */
+ /**
+ * 濉攊d
+ */
@Excel(name = "濉攊d")
private String towerId;
private String towerName;
- /** 鍥惧儚瀹藉害 */
+ /**
+ * 鍥惧儚瀹藉害
+ */
private String imageWidth;
- /** 鍥惧儚楂樺害 */
+ /**
+ * 鍥惧儚楂樺害
+ */
private String imageHeight;
- /** 鍨嬪彿 */
+ /**
+ * 鍨嬪彿
+ */
private String type;
- /** ip */
+ /**
+ * ip
+ */
private String ip;
- public void setId(String id)
- {
+ public void setId(String id) {
this.id = id;
}
- public String getId()
- {
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getId() {
return id;
}
- public void setPort(String port)
- {
+
+ public void setPort(String port) {
this.port = port;
}
- public String getPort()
- {
+ public String getPort() {
return port;
}
- public void setOperate(String operate)
- {
+
+ public void setOperate(String operate) {
this.operate = operate;
}
- public String getOperate()
- {
+ public String getOperate() {
return operate;
}
- public void setDelFlag(String delFlag)
- {
+ public void setDelFlag(String delFlag) {
this.delFlag = delFlag;
}
- public String getDelFlag()
- {
+ public String getDelFlag() {
return delFlag;
}
- public void setUserId(String userId)
- {
+
+ public void setUserId(String userId) {
this.userId = userId;
}
- public String getUserId()
- {
+ public String getUserId() {
return userId;
}
- public void setLongitude(String longitude)
- {
+
+ public void setLongitude(String longitude) {
this.longitude = longitude;
}
- public String getLongitude()
- {
+ public String getLongitude() {
return longitude;
}
- public void setLatitude(String latitude)
- {
+
+ public void setLatitude(String latitude) {
this.latitude = latitude;
}
- public String getLatitude()
- {
+ public String getLatitude() {
return latitude;
}
- public void setAltitude(String altitude)
- {
+
+ public void setAltitude(String altitude) {
this.altitude = altitude;
}
- public String getAltitude()
- {
+ public String getAltitude() {
return altitude;
}
- public void setRadarDate(Date radarDate)
- {
+
+ public void setRadarDate(Date radarDate) {
this.radarDate = radarDate;
}
- public Date getRadarDate()
- {
+ public Date getRadarDate() {
return radarDate;
}
- public void setPitch(String pitch)
- {
+
+ public void setPitch(String pitch) {
this.pitch = pitch;
}
- public String getPitch()
- {
+ public String getPitch() {
return pitch;
}
- public void setTowerId(String towerId)
- {
+
+ public void setTowerId(String towerId) {
this.towerId = towerId;
}
- public String getTowerId()
- {
+ public String getTowerId() {
return towerId;
}
- public void setImageWidth(String imageWidth)
- {
+
+ public void setImageWidth(String imageWidth) {
this.imageWidth = imageWidth;
}
- public String getImageWidth()
- {
+ public String getImageWidth() {
return imageWidth;
}
- public void setImageHeight(String imageHeight)
- {
+
+ public void setImageHeight(String imageHeight) {
this.imageHeight = imageHeight;
}
- public String getImageHeight()
- {
+ public String getImageHeight() {
return imageHeight;
}
- public void setType(String type)
- {
+
+ public void setType(String type) {
this.type = type;
}
- public String getType()
- {
+ public String getType() {
return type;
}
- public void setIp(String ip)
- {
+
+ public void setIp(String ip) {
this.ip = ip;
}
- public String getIp()
- {
+ public String getIp() {
return ip;
}
@@ -218,26 +244,26 @@
@Override
public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("createBy", getCreateBy())
- .append("port", getPort())
- .append("operate", getOperate())
- .append("updateBy", getUpdateBy())
- .append("delFlag", getDelFlag())
- .append("userId", getUserId())
- .append("longitude", getLongitude())
- .append("latitude", getLatitude())
- .append("altitude", getAltitude())
- .append("radarDate", getRadarDate())
- .append("pitch", getPitch())
- .append("towerId", getTowerId())
- .append("towerName", getTowerName())
- .append("imageWidth", getImageWidth())
- .append("imageHeight", getImageHeight())
- .append("type", getType())
- .append("ip", getIp())
- .toString();
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("createBy", getCreateBy())
+ .append("port", getPort())
+ .append("operate", getOperate())
+ .append("updateBy", getUpdateBy())
+ .append("delFlag", getDelFlag())
+ .append("userId", getUserId())
+ .append("longitude", getLongitude())
+ .append("latitude", getLatitude())
+ .append("altitude", getAltitude())
+ .append("radarDate", getRadarDate())
+ .append("pitch", getPitch())
+ .append("towerId", getTowerId())
+ .append("towerName", getTowerName())
+ .append("imageWidth", getImageWidth())
+ .append("imageHeight", getImageHeight())
+ .append("type", getType())
+ .append("ip", getIp())
+ .toString();
}
public Long getDeptId() {
diff --git a/ard-work/src/main/resources/mapper/device/ArdEquipRadarMapper.xml b/ard-work/src/main/resources/mapper/device/ArdEquipRadarMapper.xml
index 6858b0c..4dc7134 100644
--- a/ard-work/src/main/resources/mapper/device/ArdEquipRadarMapper.xml
+++ b/ard-work/src/main/resources/mapper/device/ArdEquipRadarMapper.xml
@@ -6,6 +6,7 @@
<resultMap type="ArdEquipRadar" id="ArdEquipRadarResult">
<result property="id" column="id" />
+ <result property="name" column="name" />
<result property="createBy" column="create_by" />
<result property="port" column="port" />
<result property="operate" column="operate" />
@@ -30,6 +31,7 @@
<sql id="selectArdEquipRadarVo">
select c.id,
+ c.name,
c.create_by,
c.port,
c.operate,
@@ -56,6 +58,7 @@
<select id="selectArdEquipRadarList" parameterType="ArdEquipRadar" resultMap="ArdEquipRadarResult">
select c.id,
+ c.name,
c.create_by,
c.port,
c.operate,
@@ -106,6 +109,7 @@
insert into ard_equip_radar
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
+ <if test="name != null">name,</if>
<if test="createBy != null">create_by,</if>
<if test="port != null">port,</if>
<if test="operate != null">operate,</if>
@@ -128,6 +132,7 @@
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
+ <if test="name != null">#{name},</if>
<if test="createBy != null">#{createBy},</if>
<if test="port != null">#{port},</if>
<if test="operate != null">#{operate},</if>
@@ -153,6 +158,7 @@
<update id="updateArdEquipRadar" parameterType="ArdEquipRadar">
update ard_equip_radar
<trim prefix="SET" suffixOverrides=",">
+ <if test="name != null">name = #{name},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="port != null">port = #{port},</if>
<if test="operate != null">operate = #{operate},</if>
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 63e097b..fdcc11b 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -6,12 +6,12 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
-# url: jdbc:postgresql://111.40.46.199:15432/ry-vue?stringtype=unspecified
-# username: postgres
-# password: Yykj.2021
- url: jdbc:postgresql://192.168.1.15:5432/ry-vue?stringtype=unspecified
+ url: jdbc:postgresql://111.40.46.199:15432/ry-vue?stringtype=unspecified
username: postgres
- password: postgres
+ password: Yykj.2021
+# url: jdbc:postgresql://192.168.1.15:5432/ry-vue?stringtype=unspecified
+# username: postgres
+# password: postgres
# 浠庡簱鏁版嵁婧�
slave:
# 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/AlarmTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/AlarmTask.java
index 5257595..cf22a3f 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/AlarmTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/AlarmTask.java
@@ -44,4 +44,4 @@
WebSocketUtils.sendMessageAll(stringIntegerMap);
}
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3