From 8ccfae47d3fe6bae05ea4b8f614216f4ccc191a2 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期六, 03 八月 2024 14:39:05 +0800
Subject: [PATCH] 查重点点位和省厅点位
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwPoint.java | 4 ++++
ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml | 11 +++++++++++
ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java | 16 ++++++++++++++++
ycl-server/src/main/java/com/ycl/platform/mapper/YwPointMapper.java | 5 +++++
ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java | 14 ++++++++------
5 files changed, 44 insertions(+), 6 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwPoint.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwPoint.java
index dab8936..db2f07a 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwPoint.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwPoint.java
@@ -64,6 +64,9 @@
@TableField("point_tag")
private String pointTag;
+ @TableField("serial_number")
+ private String serialNumber;
+
@TableField("reason")
private String reason;
@@ -74,4 +77,5 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date recoveryTime;
+
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java
index 2e36314..76deb13 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java
@@ -1,5 +1,7 @@
package com.ycl.platform.domain.form;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.system.domain.group.Update;
import com.ycl.system.domain.group.Add;
import com.ycl.platform.base.AbsForm;
@@ -15,6 +17,7 @@
import lombok.experimental.Accessors;
import java.time.LocalDateTime;
+import java.util.Date;
import java.util.List;
/**
@@ -53,6 +56,19 @@
@ApiModelProperty("绫诲瀷")
private Short category;
+ @ApiModelProperty("璁惧缂栧彿")
+ private String serialNumber;
+
+ @TableField("reason")
+ private String reason;
+
+ @TableField("recovery")
+ private Integer recovery;
+
+ @TableField("recovery_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date recoveryTime;
+
public static YwPoint getEntityByForm(@NonNull YwPointForm form, YwPoint entity) {
if(entity == null) {
entity = new YwPoint();
diff --git a/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java b/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java
index de0049f..6bdf620 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java
@@ -5,7 +5,9 @@
import com.ycl.platform.base.CheckIndex;
import com.ycl.platform.domain.entity.CheckIndexCar;
import com.ycl.platform.domain.entity.TMonitor;
+import com.ycl.platform.domain.entity.YwPoint;
import com.ycl.platform.domain.result.HK.SnapshotDataMonitorResult;
+import com.ycl.platform.mapper.YwPointMapper;
import com.ycl.platform.service.ITMonitorService;
import constant.CheckConstants;
import lombok.extern.slf4j.Slf4j;
@@ -25,6 +27,8 @@
@Component
@Slf4j
public class IndexCalculationServe {
+ @Autowired
+ private YwPointMapper pointMapper;
//鐐逛綅鍦ㄧ嚎鐜�
public BigDecimal siteOnline(Map<String, Object> param) {
@@ -119,16 +123,14 @@
//杩斿洖鐪佸巺鍥芥爣鐮侀泦鍚�
public List<String> getProvince() {
- // TODO: 鍒嗙渷鍘呭競灞� 闇�瑕佽ˉ鍏呴泦鍚堟暟鎹�
- List<String> list = new ArrayList<>();
- return list;
+ List<YwPoint> province = pointMapper.selectByTag(null, "province");
+ return province.stream().map(YwPoint::getSerialNumber).collect(Collectors.toList());
}
//杩斿洖閲嶇偣鐐逛綅闆嗗悎
public List<String> getImportant() {
- // TODO: 閲嶇偣鐐逛綅 闇�瑕佽ˉ鍏呴泦鍚堟暟鎹�
- List<String> list = new ArrayList<>();
- return list;
+ List<YwPoint> important = pointMapper.selectByTag("important", null);
+ return important.stream().map(YwPoint::getSerialNumber).collect(Collectors.toList());
}
//妫�鏌ユ槸鍚﹀瓨鍦ㄥ綋鏃ユ暟鎹�
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/YwPointMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/YwPointMapper.java
index aada066..650ff2d 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/YwPointMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/YwPointMapper.java
@@ -35,4 +35,9 @@
* @return 鏁版嵁
*/
List<YwPoint> home();
+
+ /**
+ * 閫氳繃鏍囩鏌ラ噸鐐圭偣浣嶆垨鐪佸巺鐐逛綅
+ */
+ List<YwPoint> selectByTag(@Param("important")String important, @Param("province")String province);
}
diff --git a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
index 0932367..ead5205 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
@@ -63,4 +63,15 @@
]]>
</select>
+ <select id="selectByTag" resultType="com.ycl.platform.domain.entity.YwPoint">
+ select * from t_yw_point
+ <where>
+ <if test="important!=null and important!= '' ">
+ and point_tag like concat('%', #{important}, '%')
+ </if>
+ <if test="province!=null and province!= '' ">
+ and point_tag like concat('%', #{province}, '%')
+ </if>
+ </where>
+ </select>
</mapper>
--
Gitblit v1.8.0