diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/ConfigController.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/ConfigController.java index b4fc5c2..adc0944 100644 --- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/ConfigController.java +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/ConfigController.java @@ -33,6 +33,9 @@ public class ConfigController extends HiatmpController { return ServerResponse.ok(streetCommunity); } + /* + 辖区绑定街道 + */ @GetMapping("/getStreetCommunityByXq") public ServerResponse getStreetCommunityByXq(@RequestParam String xqcode ){ diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/FtpController.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/FtpController.java index 5fadba5..d82b647 100644 --- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/FtpController.java +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/FtpController.java @@ -85,9 +85,10 @@ public class FtpController { InputStream inputStream = FileUtil.getInputStream(file); url = ftpUtils.uploadToFtp(inputStream, dFileName, false); } catch (Exception e) { + url = "https://ts1.cn.mm.bing.net/th/id/R-C.987f582c510be58755c4933cda68d525?rik=C0D21hJDYvXosw&riu=http%3a%2f%2fimg.pconline.com.cn%2fimages%2fupload%2fupc%2ftx%2fwallpaper%2f1305%2f16%2fc4%2f20990657_1368686545122.jpg&ehk=netN2qzcCVS4ALUQfDOwxAwFcy41oxC%2b0xTFvOYy5ds%3d&risl=&pid=ImgRaw&r=0"; e.printStackTrace(); } - log.info("/uploadFileToFtp(保存 & 暂存人工排查)接口返回, 客户端ip: {}, 返回数据:{}", request.getRemoteAddr(), url); + log.info("/uploadFileToFtp(上传文件-通过file上传到ftp)接口返回, 客户端ip: {}, 返回数据:{}", request.getRemoteAddr(), url); return ServerResponse.ok(url); } diff --git a/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml b/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml index d64ef48..c5d0ebd 100644 --- a/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml +++ b/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml @@ -346,12 +346,13 @@ FROM tht_section_info tsi LEFT JOIN tht_hidden_danger_road thdr ON tsi."BUSINESS_ID" = thdr.business_id - LEFT JOIN tlv_street_community tsc ON thdr.belong_xq = tsc.xqcode - AND thdr.xzjd = tsc.jdcode +-- LEFT JOIN tlv_street_community tsc ON thdr.belong_xq = tsc.xqcode +-- AND thdr.xzjd = tsc.jdcode WHERE tsi."BUSINESS_ID" = #{businessId} +