hst调用修改，大坝安全监测接口

guoshilong

2023-08-10 acf4a8171ae814e0d7fb061d163f95640dc39abc

hst调用修改，大坝安全监测接口

 skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/entity/HstPredict.java

@@ -37,8 +37,11 @@
    /**
     * 数据
     */
    @TableField(value = "data",typeHandler = FastjsonTypeHandler.class)
    private Object data;
    @TableField(value = "PREDICT_LIST",typeHandler = FastjsonTypeHandler.class)
    private Object predictList;

    @TableField(value = "PRE_WATER_LIST",typeHandler = FastjsonTypeHandler.class)
    private Object preWaterList;

    /**
     * 时间

 skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/HsybServiceImpl.java

@@ -100,9 +100,13 @@
            }
        }
        List<List<String>> filterData =  data.stream().filter(item -> item.get(0) != null).filter(item -> CommonUtil.strToDate(item.get(0)).after(DateUtil.now())).collect(Collectors.toList());

        filterData.forEach(e->{
            e.set(0,e.get(0).split(" ")[0]);
        });

        return filterData;
    }


    public Integer findIndex(List<List<String>> list,String reg){
        for (int i = 0; i < list.size(); i++) {

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.java

@@ -24,4 +24,10 @@
    List<DamStatisticsRes> damResInfoCount(@Param("adCode") String adCode);

    List<DamStationStatistics> getResErrorList(@Param("dam") DamStatisticsRes damStatisticsRes, @Param("adCode") String adCode);

    List<DamStationStatistics> getResWyNormalList( @Param("adCode") String adCode);

    List<DamStationStatistics> getResSyNormalList(@Param("adCode") String adCode);

    List<DamStationStatistics> getResSlNormalList(@Param("adCode") String adCode);
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.xml

@@ -636,4 +636,139 @@
    </select>



    <select id="getResWyNormalList" resultType="cn.gistack.sm.damSecurity.vo.DamStationStatistics">
        SELECT
            DISTINCT arb."guid" AS resCd,
            arb."name" AS resName,
            arb."center_long" AS longitude,
            arb."center_lat" AS latitude
        FROM (
            SELECT
                   b."guid" as "res_cd",
                   'wy' as "sys_resource"
               FROM (
                   SELECT "station_code" from sjzt_md."att_mqtt_calc_data" group by "station_code"
                   ) a LEFT JOIN SJZT_MD."att_res_base" b on substr(a."station_code",0,length(a."station_code")-2) = b."guid"
               WHERE
                     b."guid"  IS NOT NULL
                 and b."guid" NOT IN  (
                     ifnull(
                         (
                        SELECT wm_concat(temp.resCd) FROM(
                        SELECT DISTINCT arb."guid" AS resCd
                        FROM YWXT.NKY_ALARM_GET NAG
                        LEFT JOIN SJZT_MD."att_res_base" arb ON arb."guid" = NAG.DAM_ID
                        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"
                        WHERE
                              DATE_FORMAT(time,'%Y-%m-%d')>= CURDATE()
                        AND (NAG.TYPE = 3 OR NAG.TYPE = 4 OR NAG.TYPE = 5)
                        <if test=" adCode != null and adCode !='' ">
                            AND  (province."ad_code" =#{adCode} or city."ad_code" = #{adCode} or county."ad_code" = #{adCode})
                        </if>
                        ) temp),'')
                     )
            ) baseRes
                 LEFT JOIN SJZT_MD."att_res_base" arb ON arb."guid" = baseRes."res_cd"
                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"
                WHERE 1=1
                <if test=" adCode != null and adCode !='' ">
                    AND  (province."ad_code" =#{adCode} or city."ad_code" = #{adCode} or county."ad_code" = #{adCode})
                </if>


    </select>
    <select id="getResSyNormalList" resultType="cn.gistack.sm.damSecurity.vo.DamStationStatistics">

        SELECT
            DISTINCT arb."guid" AS resCd,
                     arb."name" AS resName,
                     arb."center_long" AS longitude,
                     arb."center_lat" AS latitude
        FROM(
                SELECT
                       b."guid" as "res_cd",
                       'sy' as "sys_resource"
                FROM sjzt_ods."dsm_spg_spprmp" a LEFT JOIN SJZT_MD."att_res_base" b on a."rscd" = b."res_reg_code"
                WHERE b."guid"  IS NOT NULL
                  AND b."guid"  NOT IN  (
                      ifnull(
                      (
                            SELECT wm_concat(temp.resCd)
                            FROM (
                            SELECT DISTINCT arb."guid" AS resCd
                            FROM YWXT.NKY_ALARM_GET NAG
                            LEFT JOIN SJZT_MD."att_res_base" arb ON arb."guid" = NAG.DAM_ID
                            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"
                            WHERE NAG.TYPE = 1 AND  DATE_FORMAT(time,'%Y-%m-%d')>= CURDATE()
                            <if test=" adCode != null and adCode !='' ">
                                AND  (province."ad_code" =#{adCode} or city."ad_code" = #{adCode} or county."ad_code" = #{adCode})
                            </if>
                            ) temp),'')
                )
            ) baseRes
                LEFT JOIN SJZT_MD."att_res_base" arb ON arb."guid" = baseRes."res_cd"
        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"
        WHERE 1=1
        <if test=" adCode != null and adCode !='' ">
            AND  (province."ad_code" =#{adCode} or city."ad_code" = #{adCode} or county."ad_code" = #{adCode})
        </if>



    </select>
    <select id="getResSlNormalList" resultType="cn.gistack.sm.damSecurity.vo.DamStationStatistics">
        SELECT
            DISTINCT arb."guid" AS resCd,
                     arb."name" AS resName,
                     arb."center_long" AS longitude,
                     arb."center_lat" AS latitude
        FROM (SELECT b."guid" as "res_cd",'sl' as "sys_resource"
              FROM sjzt_ods."dsm_spg_spqnmp" a
                       LEFT JOIN SJZT_MD."att_res_base" b on a."rscd" = b."res_reg_code"
              WHERE b."guid"  IS NOT NULL
                AND b."guid"  NOT IN (
                  ifnull(
                      (SELECT wm_concat(temp.resCd) FROM
                          (
                              SELECT DISTINCT arb."guid" AS resCd

                              FROM YWXT.NKY_ALARM_GET NAG
                                       LEFT JOIN SJZT_MD."att_res_base" arb ON arb."guid" = NAG.DAM_ID
                                       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"
                              WHERE NAG.TYPE = 2 AND  DATE_FORMAT(time,'%Y-%m-%d')>= CURDATE()
                            <if test=" adCode != null and adCode !='' ">
                                AND  (province."ad_code" =#{adCode} or city."ad_code" = #{adCode} or county."ad_code" = #{adCode})
                            </if>
                          ) temp),''
                      )
                  )
              group by b."guid" ) baseRes
                 LEFT JOIN SJZT_MD."att_res_base" arb ON arb."guid" = baseRes."res_cd"
                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"
        WHERE 1=1
                <if test=" adCode != null and adCode !='' ">
                    AND  (province."ad_code" =#{adCode} or city."ad_code" = #{adCode} or county."ad_code" = #{adCode})
                </if>
    </select>


</mapper>

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/impl/DamSecurityServiceImpl.java

@@ -13,6 +13,7 @@
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;

@Service
@@ -52,11 +53,25 @@
        List<DamStatisticsRes> list = damSecurityMapper.damResInfoCount(adCode);

        list.forEach(damStatisticsRes -> {

            List<DamStationStatistics> errorList = damSecurityMapper.getResErrorList(damStatisticsRes,adCode);
            damStatisticsRes.setErrorList(errorList);
        });

        list.forEach(damStatisticsRes -> {
            List<DamStationStatistics> normalList = new ArrayList<>();
            if (damStatisticsRes.getType().equals("1")){
                //渗压
                normalList = damSecurityMapper.getResSyNormalList(adCode);
            }else if (damStatisticsRes.getType().equals("2")){
                //渗流
                normalList = damSecurityMapper.getResSlNormalList(adCode);
            }else if (damStatisticsRes.getType().equals("3")){
                //位移
                 normalList = damSecurityMapper.getResWyNormalList(adCode);
            }
            damStatisticsRes.setNormalList(normalList);
        });

        return list;
    }
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/vo/DamStatisticsRes.java

@@ -36,4 +36,6 @@
    private String typeName;

    private List<DamStationStatistics> errorList;

    private List<DamStationStatistics> normalList;
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java

@@ -161,7 +161,7 @@
    @ApiOperation(value = "巡查任务-自定义通过id查询", notes = "巡查任务-自定义通过id查询")
    @GetMapping(value = "/getPatrolTaskById")
    public R getPatrolTaskById(@RequestParam(name = "id", required = true) String id) {
        PatrolTask PatrolTask = patrolTaskService.getPatrolTaskById(id);
        PatrolTask PatrolTask = patrolTaskService.customizeGetById(id);
        return R.data(PatrolTask);
    }


 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml

@@ -194,9 +194,11 @@
    <select id="customizeGetById" resultType="cn.gistack.sm.patrol.vo.PatrolTaskVO">
        SELECT
            T.*,
               SPT.NAME AS taskTypeName,
            U.REAL_NAME AS toUserIdName
        FROM SM_PATROL_TASK T
        LEFT JOIN BLADE_USER U ON U.ID = T.TO_USER_ID
        LEFT JOIN SM_PATROL_TYPE SPT ON SPT.ID = T.TASK_TYPE
        WHERE T.ID = #{id}
        AND T.IS_DELETED = 0
    </select>
@@ -448,6 +450,7 @@
        t.start_time,
        u.real_name patrolUserName,
        t.state,
        t.id,
        (
        CASE t.state
        WHEN '1' THEN '未完成'

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/vo/PatrolTaskReport.java

@@ -9,6 +9,11 @@
public class PatrolTaskReport {

    /**
     * 任务id
     */
    private String id;

    /**
     * 行政区code
     */
    private String adCode;

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/vo/PatrolTaskVO.java

@@ -64,4 +64,6 @@
    private String regionName;

    private String adCode;

    private String taskTypeName;
}