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; } 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(); 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()); } //检查是否存在当日数据 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); } 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>