Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into dev...

zhangk

2024-06-22 fb4b7e74420e576c8baab78ae5498cdeda92d4a9

Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into develop_zk

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/controller/HkController.java

@@ -151,7 +151,7 @@
     * @return
     */
    @ApiOperation(value = "海康设备-海康摄像头云台的控制", notes = "海康设备-海康摄像头云台的控制")
    @GetMapping(value = "/handleCameraPosition")
    @GetMapping(value = "/handleCameraPosition2")
    public R handleCameraPosition(HkVO hk) {
        // 获取海康播放url
        String result = controlling(null==hk.getType()?1:hk.getType(),HkConstant.controllingURLs,

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/entity/ReportFloodRecord.java

@@ -32,6 +32,17 @@
    @ApiModelProperty("今日降雨（毫米）")
    private String curDrp;

    private String daysw;//当日水位

    private String daykr;//当日库容

    private String rkll;//入库流量

    private String ckllgg;//出库流量-灌溉
    private String ckllfd;//出库流量-发电
    private String ckllxth;//出库流量-泄调洪
    private String ckllqt;//出库流量-其它

    /**
     * 老站监测水位（米）
     */

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/mapper/ReportFloodRecordMapper.xml

@@ -11,6 +11,13 @@
        <result property="images" column="images" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
        <result property="videos" column="videos" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
        <result property="curDrp" column="cur_drp"/>
        <result property="daysw" column="daysw"/>
        <result property="daykr" column="daykr"/>
        <result property="rkll" column="rkll"/>
        <result property="ckllgg" column="ckllgg"/>
        <result property="ckllfd" column="ckllfd"/>
        <result property="ckllxth" column="ckllxth"/>
        <result property="ckllqt" column="ckllqt"/>
        <result property="gateStatus" column="gate_status"/>
        <result property="isOver" column="is_over"/>
        <result property="lkOverZ" column="lk_over_z"/>

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/OverWord.java

@@ -93,7 +93,7 @@
        double whtjCount = whtjList.size() > 0 ? whtjList.size() : 1;
        double jtl = Double.valueOf(jtCount) / whtjCount * 100;
        String str = StringUtil.format("过去24小时内，发送水库短信预警{}条，抽查{}等水库防汛责任人{}人次，应答率{}，责任人履职情况总体较好。",
            dxyjCount, cityNames, whtjList.size(), String.format("%.2f", jtl) + "%");
            dxyjCount, cityNames.replace("恩施土家族苗族自治州","恩施州"), whtjList.size(), String.format("%.2f", jtl) + "%");
        this.smsResultInfo = str;
    }