修改测试服下载文件地址

tangxiaobao

2021-08-24 3e4562c98fc95cc95a51114c7e153a9c35792732

修改测试服下载文件地址

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -338,20 +338,20 @@
     * 城管随手拍统计
     */
    @PostMapping("/esayPhotoCount")
    R  esayphotoCount(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);
    R esayphotoCount(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);

    /**
     *
     * 城管安排
     */
    @PostMapping("updatePageeasyphoto")
    R updatePageeasyphoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);

    /**
     *
     * 随手拍城管导出
     */
    @PostMapping("exportEasyPhoto")
    R exportEasyPhoto(@RequestBody ExportEasyPhotoDTO exportEasyPhotoDTO);

    /**
     * 新增社区
     *
@@ -1915,7 +1915,7 @@
     * 小程序-社区问卷列表
     *
     * @param pageQuestnaireDTO 请求参数
     * @return  社区问卷列表
     * @return 社区问卷列表
     */
    @PostMapping("/questnaire/pagequestnaire")
    R pageQuestnaire(@RequestBody PageQuestnaireDTO pageQuestnaireDTO);
@@ -1924,7 +1924,7 @@
     * 社区后台-社区问卷列表
     *
     * @param pageQuestnaireDTO 请求参数
     * @return  社区问卷列表
     * @return 社区问卷列表
     */
    @PostMapping("/questnaire/admin/pagequestnaire")
    R pageQuestnaireAdmin(@RequestBody PageQuestnaireDTO pageQuestnaireDTO);
@@ -1978,34 +1978,38 @@

    /**
     * 小程序-问卷调查详情
     * @param userId    用户id
     * @param questId   问卷id
     * @return  问卷调查详情
     *
     * @param userId  用户id
     * @param questId 问卷id
     * @return 问卷调查详情
     */
    @GetMapping("/questnaire/view/detail")
    R viewDetail(@RequestParam("userId") Long userId, @RequestParam("questId") Long questId);

    /**
     * 小程序-新增问卷调查浏览数量
     * @param questId   问卷调查id
     * @return  增加结果
     *
     * @param questId 问卷调查id
     * @return 增加结果
     */
    @GetMapping("/questnaire/add/view")
    R addView(@RequestParam("questId") Long questId);

    /**
     * 小程序-用户弹窗添加不在提醒接口
     * @param questId   问卷id
     * @param userId    用户id
     * @return  添加结果
     *
     * @param questId 问卷id
     * @param userId  用户id
     * @return 添加结果
     */
    @GetMapping("/questnaire/add/noNotice")
    R addNoNotice(@RequestParam("questId") Long questId,@RequestParam("userId") Long userId);
    R addNoNotice(@RequestParam("questId") Long questId, @RequestParam("userId") Long userId);

    /**
     * 社区后台-查询问卷调查详情
     * @param questId   问卷id
     * @return  问卷调查详情
     *
     * @param questId 问卷id
     * @return 问卷调查详情
     */
    @GetMapping("/questnaire/admin/detail")
    R QuesDetail(@RequestParam("questId") Long questId);
@@ -3808,40 +3812,45 @@

    /**
     * 查询用户交易记录总额
     *
     * @param pageTradeAdminDTO 请求参数
     * @return  交易记录总额
     * @return 交易记录总额
     */
    @PostMapping("/user/wallet/trade/total")
    R getTradeUserTotalWalletTradeAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO);

    /**
     * 查询用户导出数据
     *
     * @param pageTradeAdminDTO 请求参数
     * @return  用户导出数据
     * @return 用户导出数据
     */
    @PostMapping("/user/wallet/trade/export")
    R getTradeUserTotalWalletTradeExportAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO);

    /**
     * 导出奖励台账数据
     *
     * @param pageTradeAdminDTO 请求参数
     * @return  奖励台账数据
     * @return 奖励台账数据
     */
    @PostMapping("/user/wallet/trade/reward/export")
    R getTradeUserTotalJLWalletTradeExportAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO);

    /**
     * 查询社区统计数据
     *
     * @param pageTradeAdminDTO 查询社区统计数据
     * @return  社区统计数据
     * @return 社区统计数据
     */
    @PostMapping("/user/wallet/trade/statistics")
    R getTradeUserStatisticsAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO);

    /**
     * 社区随手拍列表统计
     * @param communityId   社区id
     * @return  统计结果
     *
     * @param communityId 社区id
     * @return 统计结果
     */
    @GetMapping("/easyphoto/statistics")
    R easyPhotoStatistics(@RequestParam("communityId") Long communityId);
@@ -4090,80 +4099,90 @@

    /**
     * 小程序-查询积分说明
     * @return  积分说明
     *
     * @return 积分说明
     */
    @GetMapping("/integral/explain/applets")
    R getIntegralExplainApplets();

    /**
     * 小程序-用户查询当前社区可领取积分规则列表
     * @param userId    用户id
     * @param communityId   社区id
     * @return  可领取积分规则列表
     *
     * @param userId      用户id
     * @param communityId 社区id
     * @return 可领取积分规则列表
     */
    @PostMapping("/integral/receive/applets")
    R getIntegralReceiveApplets(@RequestParam("userId") Long userId,@RequestParam("communityId") Long communityId);
    R getIntegralReceiveApplets(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId);

    /**
     * 小程序-查询用户积分列表
     * @param userId    用户id
     * @return  用户积分列表
     *
     * @param userId 用户id
     * @return 用户积分列表
     */
    @PostMapping("/integral/user/list/applets")
    R getIntegralUserListApplets(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId);

    /**
     * 小程序-查询社区积分账户排行榜
     * @param communityRankDTO  请求参数
     * @return  社区积分账户排行榜
     *
     * @param communityRankDTO 请求参数
     * @return 社区积分账户排行榜
     */
    @PostMapping("/integral/community/rank/applets")
    R getIntegralCommunityRankApplets(@RequestBody ComActIntegralCommunityRankDTO communityRankDTO);

    /**
     * 小程序-查询用户社区积分明细
     *
     * @param communityTradeDTO 请求参数
     * @return  用户社区积分明细
     * @return 用户社区积分明细
     */
    @PostMapping("/integral/community/trade/applets")
    R getIntegralCommunityTradeApplets(@RequestBody ComActIntegralCommunityRankDTO communityTradeDTO);

    /**
     * 社区后台-根据社区id查询社区下积分规则列表
     * @param integralRuleDTO   请求参数
     * @return  社区下积分规则列表
     *
     * @param integralRuleDTO 请求参数
     * @return 社区下积分规则列表
     */
    @PostMapping("/integral/rule/list/admin")
    R getIntegralRuleAdminList(@RequestBody PageComActIntegralRuleDTO integralRuleDTO);

    /**
     * 社区后台-编辑社区积分规则
     * @param integralRuleDTO   请求参数
     * @return  编辑结果
     *
     * @param integralRuleDTO 请求参数
     * @return 编辑结果
     */
    @PostMapping("/integral/rule/edit/admin")
    R editIntegralRuleAdmin(@RequestBody EditComActIntegralRuleDTO integralRuleDTO);

    /**
     * 社区后台-分页查询社区下积分明细记录
     * @param integralRuleDTO   请求参数
     * @return  社区下积分明细记录
     *
     * @param integralRuleDTO 请求参数
     * @return 社区下积分明细记录
     */
    @PostMapping("/integral/user/trade/page/admin")
    R getIntegralTradeListAdmin(@RequestBody PageComActIntegralTradeDTO integralRuleDTO);

    /**
     * 给用户添加积分
     * @param integralUserDTO   请求参数
     * @return  添加积分结果
     *
     * @param integralUserDTO 请求参数
     * @return 添加积分结果
     */
    @PostMapping("/integral/user/add/admin")
    R addIntegralTradeAdmin(@RequestBody AddComActIntegralUserDTO integralUserDTO);

    /**
     * 根据社区活动id查询社区活动报名人员列表
     * @param activityId    活动id
     * @return  社区活动报名人员列表
     *
     * @param activityId 活动id
     * @return 社区活动报名人员列表
     */
    @PostMapping("/integral/act/activity/admin")
    R getTaskActivityPeopleList(@RequestParam("activityId") Long activityId);
@@ -4179,6 +4198,7 @@

    /**
     * 根据id查询值班表
     *
     * @param rotaId 值班表id
     * @return 值班表详情
     */
@@ -4196,6 +4216,7 @@

    /**
     * 批量删除值班表
     *
     * @param rotaIds 值班ids
     * @return 删除结果
     */
@@ -4240,112 +4261,129 @@

    /**
     * 查询社区所有列表
     * @return  社区列表
     *
     * @return 社区列表
     */
    @GetMapping("/switch/community/all/list")
    R communitySwitchList();

    /**
     * 根据名字查询所有社区列表
     * @param name  社区名字
     * @return  社区列表
     *
     * @param name 社区名字
     * @return 社区列表
     */
    @GetMapping("/switch/community/search/list")
    R communitySwitchSearchList(@RequestParam(value = "name") String name);

    /**
     * 根据经纬度以及距离搜索附近社区列表
     * @param communityDTO  请求参数
     * @return  社区列表
     *
     * @param communityDTO 请求参数
     * @return 社区列表
     */
    @PostMapping("/switch/community/search/distance/list")
    R communitySwitchSearchDistanceList(@RequestBody SearchCommunityDTO communityDTO);

    /**
     * 问卷调查统计汇总
     * @param summaryDTO   请求参数
     * @return  统计汇总
     *
     * @param summaryDTO 请求参数
     * @return 统计汇总
     */
    @PostMapping("/questnaire/statisticsSummary")
    R statisticsSummary(@RequestBody StatisticsSummaryDTO summaryDTO);

    /**
     * 问卷调查统计汇总导出数据查询
     * @param questId   调查问卷id
     * @return  调查统计汇总导出数据
     *
     * @param questId 调查问卷id
     * @return 调查统计汇总导出数据
     */
    @GetMapping("/questnaire/statisticsSummary/export")
    R statisticsSummaryExport(@RequestParam("questId") Long questId);

    /**
     * 问卷调查统计汇总表头统计
     * @param questId   调查问卷id
     * @return  问卷调查统计汇总表头统计数据
     *
     * @param questId 调查问卷id
     * @return 问卷调查统计汇总表头统计数据
     */
    @GetMapping("/questnaire/statisticsSummary/header")
    R statisticsSummaryHeader(@RequestParam("questId") Long questId,@RequestParam("communityId") Long communityId);
    R statisticsSummaryHeader(@RequestParam("questId") Long questId, @RequestParam("communityId") Long communityId);


    /**
     * 运营后台-新增随手拍分类
     * @param addPhotoClassify  请求参数
     * @return  新增结果
     *
     * @param addPhotoClassify 请求参数
     * @return 新增结果
     */
    @PostMapping("/classify/admin/add")
    R addPhotoClassify(@RequestBody AddEasyPhotoClassifyDTO addPhotoClassify);

    /**
     * 运营后台-编辑随手拍分类
     * @param addPhotoClassify  请求参数
     * @return  编辑结果
     *
     * @param addPhotoClassify 请求参数
     * @return 编辑结果
     */
    @PostMapping("/classify/admin/edit")
    R editPhotoClassify(@RequestBody AddEasyPhotoClassifyDTO addPhotoClassify);

    /**
     * 运营后台-分页查询随手拍分类
     * @param addPhotoClassify  请求参数
     * @return  随手拍分类列表
     *
     * @param addPhotoClassify 请求参数
     * @return 随手拍分类列表
     */
    @PostMapping("/classify/admin/page")
    R pagePhotoClassify(@RequestBody AddEasyPhotoClassifyDTO addPhotoClassify);

    /**
     * 运营后台-随手拍分类详情
     * @param id    随手拍分类id
     * @return  随手拍分类
     *
     * @param id 随手拍分类id
     * @return 随手拍分类
     */
    @GetMapping("/classify/admin/detail")
    R detailPhotoClassify(@RequestParam("id") Long id);

    /**
     * 运营后台-随手拍分类删除
     * @param id    随手拍分类id
     * @return  删除结果
     *
     * @param id 随手拍分类id
     * @return 删除结果
     */
    @GetMapping("/classify/admin/delete")
    R deletePhotoClassify(@RequestParam("id") Long id);

    /**
     * 运营后台-查询随手拍分类列表
     * @return  随手拍分类列表
     *
     * @return 随手拍分类列表
     */
    @GetMapping("/classify/admin/list")
    R listPhotoClassify();

    /**
     * 社区后台-切换随手拍公示状态
     *
     * @param comActEasyPhotoVO 请求参数
     * @return  切换结果
     * @return 切换结果
     */
    @PostMapping("/easyphoto/switch/publicity")
    R easyPhotoSwitchPublicity(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);

    /**
     * 查询社区待处理随手拍id集合
     * @param communityId   社区id
     * @return  社区待处理随手拍id集合
     *
     * @param communityId 社区id
     * @return 社区待处理随手拍id集合
     */
    @GetMapping("/easyphoto/noHandle/list")
    R easyPhotoNoHandleList(@RequestParam("communityId") Long communityId);

    @GetMapping("/common/data/my")
    void add();
}

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComSwPatrolRecordApi.java

@@ -497,9 +497,9 @@
                                    for (int i = 0; i < 9; i++){
                                        if (i < 1) {
                                            downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i);
                                            dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                            dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/picture/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                        }else {
                                            dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                            dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/blank.jpg"));
                                        }
                                    }
                                }
@@ -507,9 +507,9 @@
                                    for (int i = 0; i < 9; i++){
                                        if (i < 2) {
                                            downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i);
                                            dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                            dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/picture/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                        }else {
                                            dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                            dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/blank.jpg"));
                                        }
                                    }
                                }
@@ -517,9 +517,9 @@
                                    for (int i = 0; i < 9; i++){
                                        if (i < 3) {
                                            downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i);
                                            dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                            dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/picture/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                        }else {
                                            dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                            dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/blank.jpg"));
                                        }
                                    }
                                }
@@ -527,9 +527,9 @@
                                    for (int i = 0; i < 9; i++){
                                        if (i < 4) {
                                            downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i);
                                            dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                            dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/picture/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                        }else {
                                            dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                            dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/blank.jpg"));
                                        }
                                    }
                                }
@@ -537,9 +537,9 @@
                                    for (int i = 0; i < 9; i++){
                                        if (i < 5) {
                                            downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i);
                                            dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                            dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/picture/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                        }else {
                                            dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                            dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/blank.jpg"));
                                        }
                                    }
                                }
@@ -547,9 +547,9 @@
                                    for (int i = 0; i < 9; i++){
                                        if (i < 6) {
                                            downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i);
                                            dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                            dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/picture/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                        }else {
                                            dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                            dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/blank.jpg"));
                                        }
                                    }
                                }
@@ -557,9 +557,9 @@
                                    for (int i = 0; i < 9; i++){
                                        if (i < 7) {
                                            downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i);
                                            dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                            dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/picture/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                        }else {
                                            dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                            dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/blank.jpg"));
                                        }
                                    }
                                }
@@ -567,21 +567,21 @@
                                    for (int i = 0; i < 9; i++){
                                        if (i < 8) {
                                            downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i);
                                            dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                            dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/picture/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                        }else {
                                            dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                            dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/blank.jpg"));
                                        }
                                    }
                                }
                                if (photo.size() == 9){
                                    for (int i = 0; i < 9; i++){
                                        downloadPicture(photo.get(i), comSwSafetyWorkRecordVO.getId() + "_" + i);
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/picture/" + comSwSafetyWorkRecordVO.getId() + "_" + i + ".jpg"));
                                    }
                                }
                            }else{
                                for (int i = 0; i < 9; i++){
                                    dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                    dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/blank.jpg"));
                                }
                            }
                            //备注
@@ -624,7 +624,7 @@
                            //                configuration.setClassForTemplateLoading(this.getClass(), "");

                            //指定路径的第二种方式，我的路径是C：/a.ftl
                            configuration.setDirectoryForTemplateLoading(new File("c:/"));
                            configuration.setDirectoryForTemplateLoading(new File("/mnt/data/web/"));

                            //输出文档路径及名称
    //                    File outFile = new File("mnt/data/web/excel/安全工作记录_" + comSwSafetyWorkRecordVO.getId() + ".doc");
@@ -704,9 +704,9 @@
                                for (int i = 0; i < 9; i++) {
                                    if (i < 1) {
                                        downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i);
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/picture/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/blank.jpg"));
                                    }
                                }
                            }
@@ -714,9 +714,9 @@
                                for (int i = 0; i < 9; i++) {
                                    if (i < 2) {
                                        downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i);
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/picture/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/blank.jpg"));
                                    }
                                }
                            }
@@ -724,9 +724,9 @@
                                for (int i = 0; i < 9; i++) {
                                    if (i < 3) {
                                        downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i);
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/picture/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/blank.jpg"));
                                    }
                                }
                            }
@@ -734,9 +734,9 @@
                                for (int i = 0; i < 9; i++) {
                                    if (i < 4) {
                                        downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i);
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/picture/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/blank.jpg"));
                                    }
                                }
                            }
@@ -744,9 +744,9 @@
                                for (int i = 0; i < 9; i++) {
                                    if (i < 5) {
                                        downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i);
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/picture/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/blank.jpg"));
                                    }
                                }
                            }
@@ -754,9 +754,9 @@
                                for (int i = 0; i < 9; i++) {
                                    if (i < 6) {
                                        downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i);
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/picture/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/blank.jpg"));
                                    }
                                }
                            }
@@ -764,9 +764,9 @@
                                for (int i = 0; i < 9; i++) {
                                    if (i < 7) {
                                        downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i);
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/picture/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/blank.jpg"));
                                    }
                                }
                            }
@@ -774,25 +774,29 @@
                                for (int i = 0; i < 9; i++) {
                                    if (i < 8) {
                                        downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i);
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/picture/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 9) {
                                for (int i = 0; i < 9; i++) {
                                    downloadPicture(photo.get(i), comSwPatrolRecordVO.getId() + "_" + i);
                                    dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                    dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/picture/" + comSwPatrolRecordVO.getId() + "_" + i + ".jpg"));
                                }
                            }
                        } else {
                            for (int i = 0; i < 9; i++) {
                                dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/blank.jpg"));
                            }
                        }
                        //备注
                        dataMap.put("remark", comSwPatrolRecordVO.getRemark());
                        if (StringUtils.isNotEmpty(comSwPatrolRecordVO.getRemark())) {
                            dataMap.put("remark", comSwPatrolRecordVO.getRemark());
                        }else {
                            dataMap.put("remark", "");
                        }
                        //巡查时间
                        //                    dataMap.put("patrolTime", new SimpleDateFormat("yyyy-MM-dd").format(comSwPatrolRecordVO.getPatrolTime()));
                        //工作人员
@@ -838,7 +842,7 @@
                        //                configuration.setClassForTemplateLoading(this.getClass(), "");

                        //指定路径的第二种方式，我的路径是C：/a.ftl
                        configuration.setDirectoryForTemplateLoading(new File("c:/"));
                        configuration.setDirectoryForTemplateLoading(new File("/mnt/data/web/"));

                        //输出文档路径及名称
                        //                    File outFile = new File("mnt/data/web/excel/安全工作记录_" + comSwSafetyWorkRecordVO.getId() + ".doc");
@@ -942,16 +946,16 @@
                                for (int i = 0; i < 9; i++) {
                                    if (i < 1) {
                                        downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i);
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/picture/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/blank.jpg"));
                                    }
                                }
                                for (int i = 0; i < 9; i++) {
                                    if (i < 1) {
                                        dataMap.put("imgStr" + (i + 19), getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                        dataMap.put("imgStr" + (i + 19), getImageStr("/mnt/data/web/picture/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 19), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 19), getImageStr("/mnt/data/web/blank.jpg"));
                                    }
                                }
                            }
@@ -959,16 +963,16 @@
                                for (int i = 0; i < 9; i++) {
                                    if (i < 2) {
                                        downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i);
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/picture/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/blank.jpg"));
                                    }
                                }
                                for (int i = 0; i < 9; i++) {
                                    if (i < 2) {
                                        dataMap.put("imgStr" + (i + 19), getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                        dataMap.put("imgStr" + (i + 19), getImageStr("/mnt/data/web/picture/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 19), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 19), getImageStr("/mnt/data/web/blank.jpg"));
                                    }
                                }
                            }
@@ -976,16 +980,16 @@
                                for (int i = 0; i < 9; i++) {
                                    if (i < 3) {
                                        downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_" + i);
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/picture/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/blank.jpg"));
                                    }
                                }
                                for (int i = 0; i < 9; i++) {
                                    if (i < 3) {
                                        dataMap.put("imgStr" + (i + 19), getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                        dataMap.put("imgStr" + (i + 19), getImageStr("/mnt/data/web/picture/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 19), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 19), getImageStr("/mnt/data/web/blank.jpg"));
                                    }
                                }
                            }
@@ -993,16 +997,16 @@
                                for (int i = 0; i < 9; i++) {
                                    if (i < 4) {
                                        downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i);
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/picture/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/blank.jpg"));
                                    }
                                }
                                for (int i = 0; i < 9; i++) {
                                    if (i < 4) {
                                        dataMap.put("imgStr" + (i + 19), getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                        dataMap.put("imgStr" + (i + 19), getImageStr("/mnt/data/web/picture/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 19), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 19), getImageStr("/mnt/data/web/blank.jpg"));
                                    }
                                }
                            }
@@ -1010,16 +1014,16 @@
                                for (int i = 0; i < 9; i++) {
                                    if (i < 5) {
                                        downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i);
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/picture/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/blank.jpg"));
                                    }
                                }
                                for (int i = 0; i < 9; i++) {
                                    if (i < 5) {
                                        dataMap.put("imgStr" + (i + 19), getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                        dataMap.put("imgStr" + (i + 19), getImageStr("/mnt/data/web/picture/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 19), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 19), getImageStr("/mnt/data/web/blank.jpg"));
                                    }
                                }
                            }
@@ -1027,16 +1031,16 @@
                                for (int i = 0; i < 9; i++) {
                                    if (i < 6) {
                                        downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i);
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/picture/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/blank.jpg"));
                                    }
                                }
                                for (int i = 0; i < 9; i++) {
                                    if (i < 6) {
                                        dataMap.put("imgStr" + (i + 19), getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                        dataMap.put("imgStr" + (i + 19), getImageStr("/mnt/data/web/picture/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 19), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 19), getImageStr("/mnt/data/web/blank.jpg"));
                                    }
                                }
                            }
@@ -1044,16 +1048,16 @@
                                for (int i = 0; i < 9; i++) {
                                    if (i < 7) {
                                        downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i);
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/picture/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/blank.jpg"));
                                    }
                                }
                                for (int i = 0; i < 9; i++) {
                                    if (i < 7) {
                                        dataMap.put("imgStr" + (i + 19), getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                        dataMap.put("imgStr" + (i + 19), getImageStr("/mnt/data/web/picture/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 19), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 19), getImageStr("/mnt/data/web/blank.jpg"));
                                    }
                                }
                            }
@@ -1061,35 +1065,35 @@
                                for (int i = 0; i < 9; i++) {
                                    if (i < 8) {
                                        downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i);
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/picture/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/blank.jpg"));
                                    }
                                }
                                for (int i = 0; i < 9; i++) {
                                    if (i < 8) {
                                        dataMap.put("imgStr" + (i + 19), getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                        dataMap.put("imgStr" + (i + 19), getImageStr("/mnt/data/web/picture/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 19), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 19), getImageStr("/mnt/data/web/blank.jpg"));
                                    }
                                }
                            }
                            if (stepsPhoto.size() == 9) {
                                for (int i = 0; i < 9; i++) {
                                    downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i);
                                    dataMap.put("imgStr" + (i + 19), getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                    dataMap.put("imgStr" + (i + 19), getImageStr("/mnt/data/web/picture/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                }
                                for (int i = 0; i < 9; i++) {
                                    downloadPicture(stepsPhoto.get(i), comSwDangerReportVO.getId() + "_steps_" + i);
                                    dataMap.put("imgStr" + (i + 1), getImageStr("d:/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                    dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/picture/" + comSwDangerReportVO.getId() + "_steps_" + i + ".jpg"));
                                }
                            }
                        } else {
                            for (int i = 0; i < 9; i++) {
                                dataMap.put("imgStr" + (i + 1), getImageStr("d:/blank.jpg"));
                                dataMap.put("imgStr" + (i + 1), getImageStr("/mnt/data/web/blank.jpg"));
                            }
                            for (int i = 0; i < 9; i++) {
                                dataMap.put("imgStr" + (i + 19), getImageStr("d:/blank.jpg"));
                                dataMap.put("imgStr" + (i + 19), getImageStr("/mnt/data/web/blank.jpg"));
                            }
                        }
                        //社区处理建议
@@ -1138,9 +1142,9 @@
                                for (int i = 0; i < 9; i++) {
                                    if (i < 1) {
                                        downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i);
                                        dataMap.put("imgStr" + (i + 10), getImageStr("d:/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                        dataMap.put("imgStr" + (i + 10), getImageStr("/mnt/data/web/picture/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 10), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 10), getImageStr("/mnt/data/web/blank.jpg"));
                                    }
                                }
                            }
@@ -1148,9 +1152,9 @@
                                for (int i = 0; i < 9; i++) {
                                    if (i < 2) {
                                        downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i);
                                        dataMap.put("imgStr" + (i + 10), getImageStr("d:/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                        dataMap.put("imgStr" + (i + 10), getImageStr("/mnt/data/web/picture/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 10), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 10), getImageStr("/mnt/data/web/blank.jpg"));
                                    }
                                }
                            }
@@ -1158,9 +1162,9 @@
                                for (int i = 0; i < 9; i++) {
                                    if (i < 3) {
                                        downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i);
                                        dataMap.put("imgStr" + (i + 10), getImageStr("d:/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                        dataMap.put("imgStr" + (i + 10), getImageStr("/mnt/data/web/picture/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 10), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 10), getImageStr("/mnt/data/web/blank.jpg"));
                                    }
                                }
                            }
@@ -1168,9 +1172,9 @@
                                for (int i = 0; i < 9; i++) {
                                    if (i < 4) {
                                        downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i);
                                        dataMap.put("imgStr" + (i + 10), getImageStr("d:/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                        dataMap.put("imgStr" + (i + 10), getImageStr("/mnt/data/web/picture/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 10), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 10), getImageStr("/mnt/data/web/blank.jpg"));
                                    }
                                }
                            }
@@ -1178,9 +1182,9 @@
                                for (int i = 0; i < 9; i++) {
                                    if (i < 5) {
                                        downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i);
                                        dataMap.put("imgStr" + (i + 10), getImageStr("d:/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                        dataMap.put("imgStr" + (i + 10), getImageStr("/mnt/data/web/picture/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 10), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 10), getImageStr("/mnt/data/web/blank.jpg"));
                                    }
                                }
                            }
@@ -1188,9 +1192,9 @@
                                for (int i = 0; i < 9; i++) {
                                    if (i < 6) {
                                        downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i);
                                        dataMap.put("imgStr" + (i + 10), getImageStr("d:/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                        dataMap.put("imgStr" + (i + 10), getImageStr("/mnt/data/web/picture/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 10), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 10), getImageStr("/mnt/data/web/blank.jpg"));
                                    }
                                }
                            }
@@ -1198,9 +1202,9 @@
                                for (int i = 0; i < 9; i++) {
                                    if (i < 7) {
                                        downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i);
                                        dataMap.put("imgStr" + (i + 10), getImageStr("d:/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                        dataMap.put("imgStr" + (i + 10), getImageStr("/mnt/data/web/picture/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 10), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 10), getImageStr("/mnt/data/web/blank.jpg"));
                                    }
                                }
                            }
@@ -1208,21 +1212,21 @@
                                for (int i = 0; i < 9; i++) {
                                    if (i < 8) {
                                        downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i);
                                        dataMap.put("imgStr" + (i + 10), getImageStr("d:/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                        dataMap.put("imgStr" + (i + 10), getImageStr("/mnt/data/web/picture/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                    } else {
                                        dataMap.put("imgStr" + (i + 10), getImageStr("d:/blank.jpg"));
                                        dataMap.put("imgStr" + (i + 10), getImageStr("/mnt/data/web/blank.jpg"));
                                    }
                                }
                            }
                            if (photo.size() == 9) {
                                for (int i = 0; i < 9; i++) {
                                    downloadPicture(photo.get(i), comSwDangerReportVO.getId() + "_find_" + i);
                                    dataMap.put("imgStr" + (i + 10), getImageStr("d:/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                    dataMap.put("imgStr" + (i + 10), getImageStr("/mnt/data/web/picture/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                                }
                            }
                        } else {
                            for (int i = 0; i < 9; i++) {
                                dataMap.put("imgStr" + (i + 10), getImageStr("d:/blank.jpg"));
                                dataMap.put("imgStr" + (i + 10), getImageStr("/mnt/data/web/blank.jpg"));
                            }
                        }
                        //备注
@@ -1275,7 +1279,7 @@
                        //                configuration.setClassForTemplateLoading(this.getClass(), "");

                        //指定路径的第二种方式，我的路径是C：/a.ftl
                        configuration.setDirectoryForTemplateLoading(new File("c:/"));
                        configuration.setDirectoryForTemplateLoading(new File("/mnt/data/web/"));

                        //输出文档路径及名称
                        //                    File outFile = new File("mnt/data/web/excel/安全工作记录_" + comSwSafetyWorkRecordVO.getId() + ".doc");
@@ -1372,7 +1376,7 @@
        // 读取到的数据长度
        int len;
        // 输出的文件流
        String filename = "d:/" + fileName + ".jpg";  //下载路径及下载图片名称
        String filename = "/mnt/data/web/picture/" + fileName + ".jpg";  //下载路径及下载图片名称
        File file = new File(filename);
        FileOutputStream os = new FileOutputStream(file, true);
        // 开始读取

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/PopulationApi.java

@@ -3047,4 +3047,10 @@
            return R.fail();
        }
    }

    @ApiOperation(value = "新增人口社区关系")
    @PostMapping("/population/add")
    public void add() {
        communityService.add();
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java

@@ -734,4 +734,9 @@
        return comMngVillageService.villageStatistics(communityId);
    }

    @GetMapping("/my")
    public void add() {
        comMngPopulationService.addPopuCommunity();
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java

@@ -416,4 +416,6 @@
    R relationVillage(String name);

    R getVillagePopulationAdmin(PageComMngVillagePopulationDTO villagePopulationDTO);

    void addPopuCommunity();
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java

@@ -6332,6 +6332,23 @@
        return R.ok(this.baseMapper.getVillagePopulationAdmin(new Page(villagePopulationDTO.getPageNum(),villagePopulationDTO.getPageSize()),villagePopulationDTO));
    }

    @Override
    public void addPopuCommunity() {
        List<ComMngPopulationDO> list = comMngPopulationDAO.selectList(null);
        List<ComMngPopulationCommunityTagsDO> adds = new ArrayList<>();
        list.forEach(comMngPopulationDO -> {
            ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO = new ComMngPopulationCommunityTagsDO();
            comMngPopulationCommunityTagsDO.setId(Snowflake.getId());
            comMngPopulationCommunityTagsDO.setPopulationId(comMngPopulationDO.getId());
            comMngPopulationCommunityTagsDO.setCommunityId(comMngPopulationDO.getActId());
            if (comMngPopulationDO.getLabel() != null && !"".equals(comMngPopulationDO.getLabel())) {
                comMngPopulationCommunityTagsDO.setLabel(comMngPopulationDO.getLabel());
            }
            adds.add(comMngPopulationCommunityTagsDO);
            comMngPopulationCommunityTagsDAO.insert(comMngPopulationCommunityTagsDO);
        });
    }

    private void setMistake(ComMngPopulationMistakeExcelVO mvo, ComMngPopulationServeExcelVO vo){
        mvo.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCnDescByName(vo.getPoliticalOutlook()));
        mvo.setIsRent(PopulHouseUseEnum.getCnDescByName(vo.getIsRent()));