skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/vo/AlarmGetVO.java
@@ -36,4 +36,6 @@ private String countyName; private String resCds; } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.xml
@@ -1421,6 +1421,13 @@ <if test="vo.engScal != null and vo.engScal !='' "> AND arb."eng_scal" = #{vo.engScal} </if> <if test="vo.resCds != null and resCds != ''"> AND NAG.dam_id in <foreach collection="vo.resCds.split(',')" item="item" index="index" open="(" separator="," close=")"> #{item} </foreach> </if> ORDER BY NAG.TIME DESC </select> skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/entity/DbReport.java
@@ -36,16 +36,16 @@ private Date recordTime; //监测值 private String val; private Double val; //水平监测值 private String deVal; private Double deVal; //上下监测值 private String dnVal; private Double dnVal; //位移垂直监测值 private String duVal; private Double duVal; //描述 private String description; skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DbReportMapper.java
@@ -14,4 +14,8 @@ List<DbReportVO> getDayList(@Param("vo") DbReportVO dbReport); DbReport getRecordTimeData(@Param("entity") DbReport entity); List<DbReportVO> getDayListWy(@Param("entity") DbReportVO dbReport); List<DbReportVO> getYearList(@Param("vo") DbReportVO dbReport); } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DbReporttMapper.xml
@@ -30,7 +30,7 @@ SDR.ID,SDR.RESERVOIR_NAME, SDR.RESERVOIR_ID, SDR.TYPE, SDR.STATION_ID,acb.stationName, SDR.STATION_ID,acb."cd_nm" as stationName, DATE_FORMAT(sdr.record_time,'%Y-%m-%d') AS record_time, SDR.VAL,SDR.DE_VAL,SDR.DN_VAL,SDR.DU_VAL FROM SM_DB_REPORT SDR @@ -39,11 +39,11 @@ <if test="vo.type != null and vo.type != ''"> AND SDR.TYPE = #{vo.type} </if> <if test="db.startTime !=null and db.startTime !=''"> AND DATE_FORMAT(sdr.record_time,'%Y-%m-%d') >= #{db.startTime} <if test="vo.startTime !=null and vo.startTime !=''"> AND DATE_FORMAT(sdr.record_time,'%Y-%m-%d') >= #{vo.startTime} </if> <if test="db.endTime !=null and db.endTime !=''"> AND DATE_FORMAT(sdr.record_time,'%Y-%m-%d') <= #{db.endTime} <if test="vo.endTime !=null and vo.endTime !=''"> AND DATE_FORMAT(sdr.record_time,'%Y-%m-%d') <= #{vo.endTime} </if> <if test="vo.ch != null and vo.ch != ''"> AND acb."ch" = #{vo.ch} @@ -62,4 +62,36 @@ AND DATE_FORMAT(record_time,'%Y-%m-%d') = DATE_FORMAT(#{entity.recordTime},'%Y-%m-%d') </select> <select id="getDayListWy" resultType="cn.gistack.sm.jcsb.vo.DbReportVO"> SELECT SDR.ID,SDR.RESERVOIR_NAME, SDR.RESERVOIR_ID, SDR.TYPE, SDR.STATION_ID,awcb."cd_nm" as stationName, DATE_FORMAT(sdr.record_time,'%Y-%m-%d') AS record_time, SDR.VAL,SDR.DE_VAL,SDR.DN_VAL,SDR.DU_VAL FROM SM_DB_REPORT SDR LEFT JOIN SJZT_MD."att_wy_cd_base" awcb ON awcb."res_cd" = sdr.reservoir_id and awcb."cd" = SDR.station_id WHERE SDR.IS_DELETED = 0 <if test="vo.type != null and vo.type != ''"> AND SDR.TYPE = #{vo.type} </if> <if test="vo.startTime !=null and vo.startTime !=''"> AND DATE_FORMAT(sdr.record_time,'%Y-%m-%d') >= #{vo.startTime} </if> <if test="vo.endTime !=null and vo.endTime !=''"> AND DATE_FORMAT(sdr.record_time,'%Y-%m-%d') <= #{vo.endTime} </if> <if test="vo.ch != null and vo.ch != ''"> AND acb."ch" = #{vo.ch} </if> </select> <select id="getYearList" resultType="cn.gistack.sm.jcsb.vo.DbReportVO"> SELECT AVG(VAL) AS average, MONTH(RECORD_TIME) AS month FROM YWXT.SM_DB_REPORT where type = 'sy' GROUP BY MONTH(RECORD_TIME) </select> </mapper> skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/impl/DbReportServiceImpl.java
@@ -23,14 +23,20 @@ List<DbReportVO> list = new ArrayList<>(); if (dbReport.getTimeFlag().equals("day")){ if (dbReport.getType().equals("3")){ if (dbReport.getType().equals("wy")){ //位移 list = baseMapper.getDayListWy(dbReport); }else{ list = baseMapper.getDayList(dbReport); } }else if (dbReport.getTimeFlag().equals("year")){ // if (dbReport.getType().equals("wy")){ // //位移 // list = baseMapper.getYearListWy(dbReport); // }else{ // list = baseMapper.getYearList(dbReport); // } } return list; @@ -41,7 +47,15 @@ //先判断上报时间当天是否有 DbReport dbReport = baseMapper.getRecordTimeData(entity); boolean result = false; if (dbReport != null){ entity.setId(dbReport.getId()); //更新数据 result= updateById(entity); }else{ result = super.save(entity); } return result; return super.save(entity); } }
