From 16f2440a337b00351818f360bb4c9d70b1e64a5d Mon Sep 17 00:00:00 2001 From: rongchao Date: Mon, 17 Feb 2020 23:23:43 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E5=93=A8=E5=8D=A1ID=E8=8E=B7=E5=8F=96=E5=93=A8=E5=8D=A1?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=A0=81=E7=9A=84=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E6=B5=81=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 1 + .../epdc-analysis-client/pom.xml | 2 +- .../EpidemicSentryPostController.java | 18 ++++++-- .../service/EpidemicSentryPostService.java | 14 ++++++- .../impl/EpidemicSentryPostServiceImpl.java | 41 +++++++++++++++++-- 5 files changed, 68 insertions(+), 8 deletions(-) diff --git a/esua-epdc/epdc-gateway/src/main/resources/application.yml b/esua-epdc/epdc-gateway/src/main/resources/application.yml index dd39b39a7..45a2bcc3c 100644 --- a/esua-epdc/epdc-gateway/src/main/resources/application.yml +++ b/esua-epdc/epdc-gateway/src/main/resources/application.yml @@ -225,6 +225,7 @@ renren: - /heart/** - /oss/file/download - /ws/** + - /custom/epidemicSentryPost/downloadQRCode/** workLoginUrls: - /api/work/user/getToken #工作端-获取token - /api/work/user/login #工作端-登录 diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/pom.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/pom.xml index 5da53a2cb..e0fbcb1b4 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/pom.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/pom.xml @@ -24,4 +24,4 @@ ${project.artifactId} - + \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/epidemic/controller/EpidemicSentryPostController.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/epidemic/controller/EpidemicSentryPostController.java index 4590f0e91..1b1620b76 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/epidemic/controller/EpidemicSentryPostController.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/epidemic/controller/EpidemicSentryPostController.java @@ -125,7 +125,7 @@ public class EpidemicSentryPostController { /** * @Description: 哨卡名称查询(未绑定网格id的) * @Param: [] - * @return: com.elink.esua.epdc.commons.tools.utils.Result>> + * @return: com.elink.esua.epdc.commons.tools.utils.Result>> * @Author: zy * @Date: 2020-02-14 */ @@ -164,7 +164,7 @@ public class EpidemicSentryPostController { /** * 生成哨卡单个小程序码 * - * @param [formDto] + * @param formDto * @return com.elink.esua.epdc.commons.tools.utils.Result * @author wangtong * @date 2020/2/14 17:46 @@ -177,7 +177,7 @@ public class EpidemicSentryPostController { /** * 生成哨卡多个小程序码 * - * @param [formDto] + * @param formDto * @return com.elink.esua.epdc.commons.tools.utils.Result * @author wangtong * @date 2020/2/14 17:46 @@ -187,4 +187,16 @@ public class EpidemicSentryPostController { return this.epidemicSentryPostService.createPostsCodes(formDto); } + /** + * 下载小程序码 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author rongchao + * @date 2020/2/14 17:46 + */ + @GetMapping("downloadQRCode/{postId}") + public void downloadQRCode(@PathVariable("postId") String postId, HttpServletResponse response) { + epidemicSentryPostService.downloadQRCode(postId, response); + } + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/epidemic/service/EpidemicSentryPostService.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/epidemic/service/EpidemicSentryPostService.java index e856fc7dc..5d151d63d 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/epidemic/service/EpidemicSentryPostService.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/epidemic/service/EpidemicSentryPostService.java @@ -25,6 +25,7 @@ import com.elink.esua.epdc.dto.form.CreateCodeFormDTO; import com.elink.esua.epdc.modules.epidemic.entity.EpidemicSentryPostEntity; import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; @@ -108,7 +109,7 @@ public interface EpidemicSentryPostService extends BaseService>> + * @return: com.elink.esua.epdc.commons.tools.utils.Result>> * @Author: zy * @Date: 2020-02-14 */ @@ -163,4 +164,15 @@ public interface EpidemicSentryPostService extends BaseService> listSentryPostName() { return baseDao.selectListSentryPostName(); From c07ea94eccde7c81e2c7c795e6ad27d24900b473 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Tue, 18 Feb 2020 13:57:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8E=BB=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epidemic/service/impl/EpidemicSentryPostServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/EpidemicSentryPostServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/EpidemicSentryPostServiceImpl.java index 5dcb2268e..9d992fcfe 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/EpidemicSentryPostServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/EpidemicSentryPostServiceImpl.java @@ -216,6 +216,9 @@ public class EpidemicSentryPostServiceImpl extends BaseServiceImpl Date: Tue, 18 Feb 2020 14:18:21 +0800 Subject: [PATCH 3/3] =?UTF-8?q?admin=E6=A8=A1=E5=9D=97pom=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- esua-epdc/epdc-admin/epdc-admin-server/pom.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml index 62661b3f0..78a99d64f 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml @@ -185,6 +185,7 @@ true 10.5.34.164:8848 + http://172.31.171.61:9411 @@ -215,6 +216,7 @@ true 172.16.1.238:8848 + http://172.31.171.61:9411 @@ -257,6 +259,7 @@ true 172.16.0.52:8848 + http://172.31.171.61:9411