guoshilong
2024-01-24 13c91bbc8352de40e1df96934870c6e9c37e21d8
防汛情况,超汛统计接口修改
9 files modified
83 ■■■■ changed files
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResBaseController.java 11 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResBase.java 3 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.java 1 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml 13 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResBaseService.java 2 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java 5 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/controller/DownTemplateController.java 18 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/service/ISjztmdService.java 8 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/service/impl/SjztmdServiceImpl.java 22 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResBaseController.java
@@ -101,4 +101,15 @@
        return R.data(attResBaseService.getWaterRegionInfoByResGuid(guid));
    }
    /**
     * 更新报汛状态
     * @param ids
     * @param status
     * @return
     */
    @PostMapping(value = "/updateIsShowStatus")
    public R updateIsShowStatus(String ids,Integer status){
        return R.status(attResBaseService.updateIsShowStatus(ids,status));
    }
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResBase.java
@@ -350,5 +350,8 @@
//    @TableField("\"sys_resource\"")
//    private String sysResource;
    @ApiModelProperty(value = "抗震设计烈度 ")
    @TableField("\"is_show\"")
    private String isShow;
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.java
@@ -69,4 +69,5 @@
     */
    int getDimResInfoACount();
    Boolean updateIsShowStatus(@Param("ids") String ids, @Param("isShow") Integer status);
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml
@@ -182,6 +182,7 @@
        WHERE "guid" = #{attResBase.guid}
    </update>
    <!--查询当前水库对应的市级编号和县区编号-->
    <select id="getCityCountyCodeByResGuid" resultType="cn.gistack.sm.sjztmd.vo.AttResBaseVO">
        SELECT
@@ -224,4 +225,16 @@
        select count(*) from sjzt_dw."dim_res_info_a"
    </select>
    <update id="updateIsShowStatus">
        UPDATE SJZT_MD."att_res_base" SET "is_show" = #{isShow}
        WHERE
        "guid" IN
        <foreach collection="ids.split(',')" index="index" item="item" open="(" separator="," close=")">
            #{item}
        </foreach>
    </update>
</mapper>
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResBaseService.java
@@ -55,4 +55,6 @@
    AttResAdVO getWaterRegionInfoByResGuid(String guid);
    int getDimResInfoACount();
    Boolean updateIsShowStatus(String ids, Integer status);
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java
@@ -104,4 +104,9 @@
    public int getDimResInfoACount() {
        return baseMapper.getDimResInfoACount();
    }
    @Override
    public Boolean updateIsShowStatus(String ids, Integer status) {
        return baseMapper.updateIsShowStatus(ids,status);
    }
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/controller/DownTemplateController.java
@@ -63,15 +63,15 @@
    }
    @GetMapping("/download/overFloodInfo")
    public ResponseEntity overFloodInfo() throws Exception{
    public ResponseEntity overFloodInfo(String isShow) throws Exception{
        String time = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
        String fileName =  time+ "全省水库防汛情况.docx";
        String fileNameURL = URLEncoder.encode(fileName, "UTF-8");
        //获取总览、大中库、明细数据
        List<TotalInfo> totalList = sjztmdService.getTotalInfo();
        List<DzkInfo> dzkList = sjztmdService.getDzkInfo();
        List<OverDetail> overDetailList = sjztmdService.getOverDetailInfo();
        List<SzInfo> szInfoList = sjztmdService.getSzInfo();
        List<TotalInfo> totalList = sjztmdService.getTotalInfo(isShow);
        List<DzkInfo> dzkList = sjztmdService.getDzkInfo(isShow);
        List<OverDetail> overDetailList = sjztmdService.getOverDetailInfo(isShow);
        List<SzInfo> szInfoList = sjztmdService.getSzInfo(isShow);
        byte[] data = WordUtil.GetOverInfo(totalList,dzkList,overDetailList,szInfoList);
@@ -86,12 +86,12 @@
    }
    @GetMapping("/download/getOverFloodInfoExcel")
    public void getOverFloodInfoExcel(HttpServletResponse response) throws Exception {
    public void getOverFloodInfoExcel(HttpServletResponse response,String isShow) throws Exception {
        //获取总览、大中库、明细数据
        List<TotalInfo> totalList = sjztmdService.getTotalInfo();
        List<DzkInfo> dzkList = sjztmdService.getDzkInfo();
        List<OverDetail> overDetailList = sjztmdService.getOverDetailInfo();
        List<TotalInfo> totalList = sjztmdService.getTotalInfo(isShow);
        List<DzkInfo> dzkList = sjztmdService.getDzkInfo(isShow);
        List<OverDetail> overDetailList = sjztmdService.getOverDetailInfo(isShow);
        ExcelUtil.generateExcel(response,totalList,dzkList,overDetailList);
    }
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/service/ISjztmdService.java
@@ -20,13 +20,13 @@
    HashMap<String,Object> getTbWordVO(String resCd);
    List<TotalInfo> getTotalInfo();
    List<TotalInfo> getTotalInfo(String isShow);
    List<DzkInfo> getDzkInfo();
    List<DzkInfo> getDzkInfo(String isShow);
    List<OverDetail> getOverDetailInfo();
    List<OverDetail> getOverDetailInfo(String isShow);
    List<SzInfo> getSzInfo();
    List<SzInfo> getSzInfo(String isShow);
    List<StationExport> getWaterLevelInfo(HttpServletResponse response, StationParams params,String exportFunc);
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/service/impl/SjztmdServiceImpl.java
@@ -585,32 +585,32 @@
    @Override
    public List<TotalInfo> getTotalInfo() {
        JSONObject ztData = this.getZtData(null, RIBAO_SHEET1_TOTAL_URL);
    public List<TotalInfo> getTotalInfo(String isShow) {
        JSONObject ztData = this.getZtData("&is_show="+isShow, RIBAO_SHEET1_TOTAL_URL);
        JSONArray data = ztData.getJSONArray("data");
        List<TotalInfo> list = data.toJavaList(TotalInfo.class);
        return list;
    }
    @Override
    public List<DzkInfo> getDzkInfo() {
        JSONObject ztData = this.getZtData(null, RIBAO_SHEET2_ZDX_URL);
    public List<DzkInfo> getDzkInfo(String isShow) {
        JSONObject ztData = this.getZtData("&is_show="+isShow, RIBAO_SHEET2_ZDX_URL);
        JSONArray data = ztData.getJSONArray("data");
        List<DzkInfo> list = data.toJavaList(DzkInfo.class);
        return list;
    }
    @Override
    public List<OverDetail> getOverDetailInfo() {
        JSONObject ztData = this.getZtData(null, RIBAO_SHEET3_OVER_STAG_LIST_URL);
    public List<OverDetail> getOverDetailInfo(String isShow) {
        JSONObject ztData = this.getZtData("&is_show="+isShow, RIBAO_SHEET3_OVER_STAG_LIST_URL);
        JSONArray data = ztData.getJSONArray("data");
        List<OverDetail> list = data.toJavaList(OverDetail.class);
        return list;
    }
    @Override
    public List<SzInfo> getSzInfo() {
        JSONObject ztData = this.getZtData(null, SZ_INFO);
    public List<SzInfo> getSzInfo(String isShow) {
        JSONObject ztData = this.getZtData("?is_show="+isShow, SZ_INFO);
        JSONArray data = ztData.getJSONArray("data");
        List<SzInfo> list = data.toJavaList(SzInfo.class);
        return list;
@@ -1119,13 +1119,13 @@
        // 获取环境
        String activeProfile = SpringContextUtil.getActiveProfile();
        if (activeProfile.equals("dev")) {
            url = ZtApiUrlConstant.url_prefix_dev + url;
            url = ZtApiUrlConstant.url_prefix_dev + url + params;
        }
        if (activeProfile.equals("prod")) {
            url = ZtApiUrlConstant.url_prefix_prod + url;
            url = ZtApiUrlConstant.url_prefix_prod + url + params;
        }
        if (activeProfile.equals("test")) {
            url = ZtApiUrlConstant.url_prefix_test + url;
            url = ZtApiUrlConstant.url_prefix_test + url + params;
        }
        //设置请求头
        HttpHeaders headers = new HttpHeaders();