湖北水库：项目统计返回修改

shenyijian

2024-10-09 e794991424c6ca580c275bfda86c3c36e64152f2

湖北水库：项目统计返回修改

 skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/VO/SgOperatingRateVO.java

@@ -11,24 +11,28 @@
     * 表面变形
     */
    private int surfaceNum;
    private int surfaceStartNum;
    private String surfaceProgress;

    /**
     * 视频
     */
    private int videoNum;
    private int videoStartNum;
    private String videoProgress;

    /**
     * 渗流压力
     */
    private int transNum;
    private int transStartNum;
    private String transProgress;

    /**
     * 渗流量
     */
    private int seepageNum;
    private int seepageStartNum;
    private String seepageProgress;
    private String proIds;
}

 skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/VO/SgStatisProVO.java

@@ -24,24 +24,28 @@
     * 表面变形
     */
    private int surfaceNum;
    private int surfaceStartNum;
    private String surfaceProgress;

    /**
     * 视频
     */
    private int videoNum;
    private int videoStartNum;
    private String videoProgress;

    /**
     * 渗流压力
     */
    private int transNum;
    private int transStartNum;
    private String transProgress;

    /**
     * 渗流量
     */
    private int seepageNum;
    private int seepageStartNum;
    private String seepageProgress;

    private String proIds;

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java

@@ -408,12 +408,16 @@
                SgOperatingRateVO sVo = deviceTypes.get(vo.getProIds());
                if (Objects.nonNull(sVo)){
                    vo.setSurfaceNum(sVo.getSurfaceNum());
                    vo.setSurfaceStartNum(sVo.getSurfaceStartNum());
                    vo.setSurfaceProgress(sVo.getSurfaceProgress());
                    vo.setVideoNum(sVo.getVideoNum());
                    vo.setVideoStartNum(sVo.getVideoStartNum());
                    vo.setVideoProgress(sVo.getVideoProgress());
                    vo.setTransNum(sVo.getTransNum());
                    vo.setTransStartNum(sVo.getTransStartNum());
                    vo.setTransProgress(sVo.getTransProgress());
                    vo.setSeepageNum(sVo.getSeepageNum());
                    vo.setSeepageStartNum(sVo.getSeepageStartNum());
                    vo.setSeepageProgress(sVo.getSeepageProgress());
                }
            }
@@ -465,6 +469,7 @@
                        Integer deviceCount = sg108.getDeviceCount();
                        Integer deviceStart = sg108.getDeviceStart();
                        sgOperatingRateVO.setSurfaceNum(deviceCount);
                        sgOperatingRateVO.setSurfaceStartNum(deviceStart);
                        if (deviceCount != 0){
                            BigDecimal divide = BigDecimal.valueOf(deviceStart).divide(BigDecimal.valueOf(deviceCount), 2, BigDecimal.ROUND_UP);
                            sgOperatingRateVO.setSeepageProgress(getBigDecimalPercent(divide));
@@ -478,6 +483,7 @@
                        Integer deviceCount = sg104.getDeviceCount();
                        Integer deviceStart = sg104.getDeviceStart();
                        sgOperatingRateVO.setVideoNum(deviceCount);
                        sgOperatingRateVO.setVideoStartNum(deviceStart);
                        if (deviceCount != 0){
                            BigDecimal divide = BigDecimal.valueOf(deviceStart).divide(BigDecimal.valueOf(deviceCount), 2, BigDecimal.ROUND_UP);
                            sgOperatingRateVO.setVideoProgress(getBigDecimalPercent(divide));
@@ -491,6 +497,7 @@
                        Integer deviceCount = sg101.getDeviceCount();
                        Integer deviceStart = sg101.getDeviceStart();
                        sgOperatingRateVO.setTransNum(deviceCount);
                        sgOperatingRateVO.setTransStartNum(deviceStart);
                        if (deviceCount != 0){
                            BigDecimal divide = BigDecimal.valueOf(deviceStart).divide(BigDecimal.valueOf(deviceCount), 2, BigDecimal.ROUND_UP);
                            sgOperatingRateVO.setTransProgress(getBigDecimalPercent(divide));
@@ -504,6 +511,7 @@
                        Integer deviceCount = sg102.getDeviceCount();
                        Integer deviceStart = sg102.getDeviceStart();
                        sgOperatingRateVO.setSeepageNum(deviceCount);
                        sgOperatingRateVO.setSeepageStartNum(deviceStart);
                        if (deviceCount != 0){
                            BigDecimal divide = BigDecimal.valueOf(deviceStart).divide(BigDecimal.valueOf(deviceCount), 2, BigDecimal.ROUND_UP);
                            sgOperatingRateVO.setSeepageProgress(getBigDecimalPercent(divide));