guoshilong
2023-07-20 3493d451eb51919445c6de4ce14eb36ff71615c0
巡查次数和隐患数量统计接口
5 files modified
1 files added
49 ■■■■■ changed files
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/controller/DangerReportController.java 10 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DangerReportMapper.java 3 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DangerReportMapper.xml 5 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/IDangerReportService.java 8 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/impl/DangerReportServiceImpl.java 6 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/vo/StatisticsVO.java 17 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/controller/DangerReportController.java
@@ -95,4 +95,14 @@
        return R.data(dangerReportService.removeBatchByIds(Func.toLongList(ids)));
    }
    /**
     * 获取水库巡查次数和险情问题数量
     * @param resGuid
     * @return
     */
    @GetMapping("/getStatistics")
    public R getStatistics(String resGuid){
        return R.data(dangerReportService.getStatistics(resGuid));
    }
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DangerReportMapper.java
@@ -3,6 +3,7 @@
import cn.gistack.sm.jcsb.entity.DangerReport;
import cn.gistack.sm.jcsb.vo.DangerReportVO;
import cn.gistack.sm.jcsb.vo.DeviceReportVO;
import cn.gistack.sm.jcsb.vo.StatisticsVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
@@ -19,4 +20,6 @@
    List<DangerReportVO> getAll(@Param("dangerReport") DangerReport dangerReport);
    List<DangerReportVO> selectRecordPage(IPage<DangerReportVO> page, @Param("dangerReportVO") DangerReportVO dangerReportVO);
    StatisticsVO getStatistics(@Param("resGuid") String resGuid);
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DangerReportMapper.xml
@@ -57,4 +57,9 @@
        </if>
        ORDER BY R.UPDATE_TIME DESC
    </select>
    <select id="getStatistics" resultType="cn.gistack.sm.jcsb.vo.StatisticsVO">
        SELECT * FROM
                     (SELECT COUNT(1)AS patrolCount FROM  SM_PATROL_TASK WHERE PROJECT_ID =#{resGuid} AND IS_DELETED = 0)p,
                     (SELECT COUNT(1)AS dangerCount FROM  SM_DANGER_REPORT WHERE RESERVOIR_ID = #{resGuid} AND IS_DELETED = 0)SDR
    </select>
</mapper>
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/IDangerReportService.java
@@ -3,6 +3,7 @@
import cn.gistack.sm.jcsb.entity.DangerReport;
import cn.gistack.sm.jcsb.vo.DangerReportVO;
import cn.gistack.sm.jcsb.vo.DeviceReportVO;
import cn.gistack.sm.jcsb.vo.StatisticsVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
@@ -18,4 +19,11 @@
    List<DangerReportVO> getAll(DangerReport dangerReport);
    IPage<DangerReportVO> selectPage(IPage<DangerReportVO> page, DangerReportVO dangerReportVO);
    /**
     * 获取巡查次数和隐患数量
     * @param resGuid 水库id
     * @return
     */
    StatisticsVO getStatistics(String resGuid);
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/impl/DangerReportServiceImpl.java
@@ -5,6 +5,7 @@
import cn.gistack.sm.jcsb.service.IDangerReportService;
import cn.gistack.sm.jcsb.vo.DangerReportVO;
import cn.gistack.sm.jcsb.vo.DeviceReportVO;
import cn.gistack.sm.jcsb.vo.StatisticsVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springframework.stereotype.Service;
@@ -29,4 +30,9 @@
    public IPage<DangerReportVO> selectPage(IPage<DangerReportVO> page, DangerReportVO dangerReportVO) {
        return page.setRecords(baseMapper.selectRecordPage(page,dangerReportVO));
    }
    @Override
    public StatisticsVO getStatistics(String resGuid) {
        return baseMapper.getStatistics(resGuid);
    }
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/vo/StatisticsVO.java
New file
@@ -0,0 +1,17 @@
package cn.gistack.sm.jcsb.vo;
import lombok.Data;
@Data
public class StatisticsVO {
    /**
     * 巡查次数
     */
    private Integer patrolCount;
    /**
     * 隐患数量
     */
    private Integer dangerCount;
}