skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/vo/AlarmGetVO.java
@@ -6,6 +6,7 @@ @Data public class AlarmGetVO extends AlarmGet { private String [] dateRange; private String startTime; private String endTime; } skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/mapper/AlarmGetMapper.xml
@@ -25,8 +25,11 @@ <select id="getAlarmDetail" resultMap="vo"> SELECT * FROM NKY_ALARM_GET WHERE 1=1 <if test="vo.dateRange !=null and vo.dateRange.length > 0"> AND time >= #{vo.daterange[0]} AND time <= #{vo.daterange[1]} <if test="vo.startTime != null and vo.startTime != ''"> AND DATE_FORMAT(time,'%Y-%m-%d') >= #{vo.startTime} </if> <if test="vo.endTime != null and vo.endTime !='' "> AND DATE_FORMAT(time,'%Y-%m-%d') <= #{vo.endTime} </if> <if test="vo.level != null and vo.level !='' "> AND level = #{vo.level} skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.xml
@@ -62,6 +62,14 @@ <if test="dam.adCode != null and dam.adCode != '' "> and (aab."ad_code" =#{dam.adCode} or aa."ad_code" = #{dam.adCode} or ab."ad_code" = #{dam.adCode} or ac."ad_code" = #{dam.adCode}) </if> <if test="dam.startTime != null and dam.startTime != ''"> AND DATE_FORMAT(time,'%Y-%m-%d') >= #{dam.startTime} </if> <if test="dam.endTime != null and dam.endTime !='' "> AND DATE_FORMAT(time,'%Y-%m-%d') <= #{dam.endTime} </if> )) errorNum ),SJZT_MD."att_ad_base" aab where 1=1 @@ -172,6 +180,14 @@ left join SJZT_MD."att_ad_base" c on b."p_ad_code" = c."ad_code" left join SJZT_MD."att_ad_base" d on c."p_ad_code" = d."ad_code" where (d."ad_code" = aab."guid" or c."ad_code" = aab."guid" or b."ad_code" = aab."guid" ) <if test="dam.startTime != null and dam.startTime != ''"> AND DATE_FORMAT(time,'%Y-%m-%d') >= #{dam.startTime} </if> <if test="dam.endTime != null and dam.endTime !='' "> AND DATE_FORMAT(time,'%Y-%m-%d') <= #{dam.endTime} </if> )) errorNum, aab."ad_name" adName , aab."guid" adCode from SJZT_MD."att_ad_base" aab where @@ -321,9 +337,34 @@ FROM sjzt_ods."dsm_spg_spqnmp" a LEFT JOIN SJZT_MD."att_res_base" b on a."rscd" = b."res_reg_code" group by b."guid" ) GROUP BY "res_cd" ) sl ON sl."res_cd" = baseRes."guid" LEFT JOIN ( SELECT DAM_ID ,COUNT(*) errorNum FROM NKY_ALARM_GET GROUP BY "DAM_ID" ) alarm ON alarm.DAM_ID = baseRes."guid" LEFT JOIN ( SELECT DAM_ID ,COUNT(*) errorNum FROM NKY_ALARM_GET WHERE 1=1 LEFT JOIN (SELECT DAM_ID ,COUNT(*) errorCountNum FROM (SELECT DAM_ID, COUNT(*) FROM YWXT.NKY_ALARM_GET GROUP BY DAM_ID,POINT_ID) baseCount GROUP BY DAM_ID) c1 ON c1.dam_id = baseRes."guid" <if test="dam.startTime != null and dam.startTime != ''"> AND DATE_FORMAT(time,'%Y-%m-%d') >= #{dam.startTime} </if> <if test="dam.endTime != null and dam.endTime !='' "> AND DATE_FORMAT(time,'%Y-%m-%d') <= #{dam.endTime} </if> GROUP BY "DAM_ID" ) alarm ON alarm.DAM_ID = baseRes."guid" LEFT JOIN ( SELECT DAM_ID ,COUNT(*) errorCountNum FROM ( SELECT DAM_ID, COUNT(*) FROM YWXT.NKY_ALARM_GET WHERE 1=1 <if test="dam.startTime != null and dam.startTime != ''"> AND DATE_FORMAT(time,'%Y-%m-%d') >= #{dam.startTime} </if> <if test="dam.endTime != null and dam.endTime !='' "> AND DATE_FORMAT(time,'%Y-%m-%d') <= #{dam.endTime} </if> GROUP BY DAM_ID,POINT_ID ) baseCount GROUP BY DAM_ID) c1 ON c1.dam_id = baseRes."guid" LEFT JOIN SJZT_MD."att_ad_base" town ON town."guid" = "town_ad_code" LEFT JOIN SJZT_MD."att_ad_base" county ON county."guid" = town."p_ad_code" @@ -338,11 +379,6 @@ <if test="dam.resName != null and dam.resName !='' "> AND "name" LIKE CONCAT('%',#{dam.resName},'%') </if> <if test="dam.dateRange !=null and dam.dateRange.length > 0"> AND time >= #{dam.daterange[0]} AND time <= #{dam.daterange[1]} </if> ) info </select> skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/impl/DamSecurityServiceImpl.java
@@ -5,9 +5,13 @@ import cn.gistack.sm.damSecurity.vo.DamSecurityStatistics; import cn.gistack.sm.damSecurity.vo.DamStationStatistics; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.tool.utils.ObjectUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.nio.charset.StandardCharsets; import java.util.List; @Service skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/vo/DamSecurityStatistics.java
@@ -29,4 +29,8 @@ * 总数 */ private Integer allNum; private String startTime; private String endTime; } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/vo/DamStationStatistics.java
@@ -88,5 +88,7 @@ */ private String latitude; private String[] dateRange; private String startTime; private String endTime; } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/log/mapper/SmLogManageMapper.xml
@@ -41,8 +41,11 @@ <if test="vo.source !=null and vo.source !=''"> AND L.SOURCE = #{vo.source} </if> <if test="vo.daterange !=null and vo.daterange.length > 0"> AND L.CREATE_TIME >= #{vo.daterange[0]} AND L.CREATE_TIME <= #{vo.daterange[1]} <if test="vo.startTime !=null and vo.startTime !=''"> AND DATE_FORMAT(L.create_time,'%Y-%m-%d') >= #{vo.startTime} </if> <if test="vo.endTime !=null and vo.endTime !=''"> AND DATE_FORMAT(L.create_time,'%Y-%m-%d') <= #{vo.endTime} </if> ORDER BY L.CREATE_TIME DESC </select> skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/log/vo/SmLogManageVO.java
@@ -10,5 +10,7 @@ */ private String createUserName; private String [] daterange; private String startTime; private String endTime; }
