From 7a1eef271181a6ffc0283f65df112a13d980c85d Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Sun, 16 Feb 2020 10:58:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E7=A0=81=E6=B7=BB=E5=8A=A0=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EpidemicSentryPostServiceImpl.java | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

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 0627bde2f..5f4ef413e 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
@@ -76,7 +76,7 @@ public class EpidemicSentryPostServiceImpl extends BaseServiceImpl<EpidemicSentr
     /**
      * 小程序首页
      */
-    private static String MA_FRONT_PAGE_URL = "pages/index/index";
+    private static String MA_FRONT_PAGE_URL = "pages/fromVirus/fromVirus";
 
     @Override
     public PageData<EpidemicSentryPostDTO> page(Map<String, Object> params) {
@@ -201,6 +201,9 @@ public class EpidemicSentryPostServiceImpl extends BaseServiceImpl<EpidemicSentr
         if (!StringUtils.isNotBlank(entity.getGridId())) {
             throw new RenException("根据哨卡id未查到网格id信息！");
         }
+        if (StringUtils.isNotBlank(entity.getMaCodeUrl())) {
+            throw new RenException("该小程序码已经存在！");
+        }
         String param = entity.getGridId().concat("-").concat(entity.getSentryPostCode());
         entity.setMaCodeUrl(this.createMaCode(param, MA_FRONT_PAGE_URL));
         baseDao.updateById(entity);
@@ -220,10 +223,18 @@ public class EpidemicSentryPostServiceImpl extends BaseServiceImpl<EpidemicSentr
         if (CollUtil.isEmpty(categoryEntityList)) {
             throw new RenException("根据网格id未查到哨卡信息！");
         }
+        Boolean isHave = false;
         for (EpidemicSentryPostEntity entity : categoryEntityList) {
+            if (StringUtils.isNotBlank(entity.getMaCodeUrl())) {
+                continue;
+            }
             String param = entity.getGridId().concat("-").concat(entity.getSentryPostCode());
             entity.setMaCodeUrl(this.createMaCode(param, MA_FRONT_PAGE_URL));
             baseDao.updateById(entity);
+            isHave = true;
+        }
+        if(!isHave){
+            throw new RenException("该网格下的哨卡编码已经全部存在，不可重复生成！");
         }
         return new Result().ok("批量生成小程序码成功。");
     }