skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/controller/DamSecurityController.java
@@ -155,7 +155,7 @@ } /** * 大坝安全监测预警异常统计 * 大坝安全监测预警异常统计-南科院 * @param damStationStatistics * @return */ @@ -166,6 +166,20 @@ return R.data(list); } /** * 大坝安全监测预警异常统计-中台预警 * @param damMonitor * @return */ @ApiOperation(value = "大坝安全统计-大坝安全监测预警异常统计", notes = "大坝安全统计-大坝安全监测预警异常统计") @GetMapping(value = "/alarmResCountZt") public R alarmResCountZt(DamMonitor damMonitor){ if (StringUtil.isBlank(damMonitor.getStartTime()) || StringUtil.isBlank(damMonitor.getEndTime())) return R.fail("查询时间不能为空"); List<DamStationStatistics> list = damSecurityService.alarmResCount(damMonitor); return R.data(list); } // /** // * 业务一张图 大坝安全监测 // * @param adCode skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.java
@@ -26,6 +26,8 @@ List<DamStationStatistics> alarmResCount(@Param("dam") DamStationStatistics damStationStatistics,@Param("basCodes") String basCodes); List<DamStationStatistics> alarmResCountByZt(@Param("dam") DamMonitor damMonitor); List<DamStatisticsRes> damResInfoCount(@Param("adCode") String adCode); List<DamStationStatistics> getResErrorList(@Param("dam") DamStatisticsRes damStatisticsRes, @Param("adCode") String adCode); skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.xml
@@ -932,6 +932,35 @@ <select id="alarmResCountByZt" resultType="cn.gistack.sm.damSecurity.vo.DamStationStatistics"> SELECT arb."center_long" AS longitude, arb."center_lat" AS latitude, arb."name" as resName, sar.reservoir_number resCd, abb."code" AS basCode, abb."name" AS basName FROM ( select sar.* from YWXT.sm_alarm_record sar left join ywxt.sm_alarm_rule b on (sar.alarm_rule_id = b.id) where sar.create_time >= #{dam.startTime} and sar.create_time <= #{dam.endTime} and b.create_alarm_type not like '%缺失%' and (b.type = '渗压监测' or b.type = '变形监测' or b.type = '渗流监测') and (b.ALARM_LEVEL = '红色预警' or b.ALARM_LEVEL = '橙色预警') ) sar LEFT JOIN SJZT_MD."att_res_base" arb ON arb."guid" = sar.reservoir_number LEFT JOIN SJZT_MD."att_ad_base" town ON town."guid" = arb."interior_ad_guid" LEFT JOIN SJZT_MD."att_ad_base" county ON county."guid" = town."p_ad_code" LEFT JOIN SJZT_MD."att_ad_base" city ON city."guid" = county."p_ad_code" LEFT JOIN SJZT_MD."att_ad_base" province ON province."guid" = city."p_ad_code" LEFT JOIN SJZT_MD."rel_res_bas_loc" rrbl ON rrbl."res_guid" = sar.reservoir_number LEFT JOIN SJZT_MD."att_bas_base" abb ON abb."code" = rrbl."bas_guid" LEFT JOIN SJZT_MD."att_bas_base" pabb ON abb."p_code" = pabb."code" </select> <select id="alarmResCount" resultType="cn.gistack.sm.damSecurity.vo.DamStationStatistics"> SELECT arb."center_long" AS longitude, skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/IDamSecurityService.java
@@ -39,6 +39,8 @@ */ List<DamStationStatistics> alarmResCount(DamStationStatistics damStationStatistics,String basCode); List<DamStationStatistics> alarmResCount(DamMonitor damMonitor); /** * 业务一张图大坝安全监测 * @param adCode 行政区划 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/impl/DamSecurityServiceImpl.java
@@ -60,6 +60,11 @@ } @Override public List<DamStationStatistics> alarmResCount(DamMonitor damMonitor) { return damSecurityMapper.alarmResCountByZt(damMonitor); } @Override public List<DamStatisticsRes> damResInfoCount(String adCode) { List<DamStatisticsRes> list = damSecurityMapper.damResInfoCount(adCode); skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgGxStepMapper.java
@@ -28,5 +28,5 @@ * @param deviceId * @return */ List<SgDeviceGxStepDO> getDeviceGXList(@Param("gxInfoId") Long deviceId); List<SgDeviceGxStepDO> getDeviceGXList(@Param("deviceId") Long deviceId); } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgGxStepMapper.xml
@@ -23,9 +23,9 @@ left join YWXT.SG_GX_STEP step on sg.id=step.gx_info_id where sd.id= = #{deviceId} where sd.id= #{deviceId} ) info left join YWXT.SG_PROGRESS_REPORT sp on info.gxDeviceId=sp.PROFRAM_ID and info.gxId=sp.GX_STEP_ID ) info left join YWXT.SG_PROGRESS_REPORT sp on info.gxDeviceId= sp.gx_device_id and info.gxId = sp.GX_STEP_ID
@@ -71,7 +71,7 @@ Long gxDeviceId = sgProgressReportDO.getGxDeviceId(); Long gxStepId = sgProgressReportDO.getGxStepId(); List<SgGxStepDO> list = sgGxStepMapper.selectByGxInfoId(gxDeviceId); SgGxStepDO sgGxStepDO = sgGxStepMapper.selectById(gxDeviceId); SgGxStepDO sgGxStepDO = sgGxStepMapper.selectById(gxStepId); for (SgGxStepDO gxStepDO : list) { if (Integer.parseInt(sgGxStepDO.getGxStepNum()) - Integer.parseInt(gxStepDO.getGxStepNum()) == 1) { LambdaQueryChainWrapper<SgProgressReportDO> wrapper = new LambdaQueryChainWrapper<>(sgProgressReportMapper).eq(SgProgressReportDO::getGxStepId, gxStepDO.getId()); @@ -110,7 +110,7 @@ } SgProjectInfoDO sgProjectInfoDO = sgProjectInfoMapper.selectById(sgProgressReportDO.getProframId()); if (sgProjectInfoDO != null && sgProjectInfoDO.getStatus() == 0) { sgDeviceDO.setStatus(1); sgProjectInfoDO.setStatus(1); sgProjectInfoMapper.updateById(sgProjectInfoDO); } } @@ -214,7 +214,7 @@ } int size = sgDeviceGxStepDOs.size(); if((size*2)/countStatus==1){ if(countStatus!=0&&(size*2)/countStatus==1){ //如果设备下全部工序审核完成 sgDeviceDO.setStatus(2); sgDeviceMapper.updateById(sgDeviceDO);
