From 2363f002e9133332b1b12e95e803244ee2fef2d6 Mon Sep 17 00:00:00 2001
From: zhangye <654600784@qq.com>
Date: Tue, 24 Mar 2020 11:10:34 +0800
Subject: [PATCH] 0324.1

---
 .../java/com/ccsens/ct/bean/dto/SiteDto.java  | 13 +++++++---
 .../com/ccsens/ct/service/SiteService.java    | 24 +++++++++----------
 health/src/main/resources/application.yml     |  4 ++--
 3 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/ct/src/main/java/com/ccsens/ct/bean/dto/SiteDto.java b/ct/src/main/java/com/ccsens/ct/bean/dto/SiteDto.java
index 0b29541e..86361aab 100644
--- a/ct/src/main/java/com/ccsens/ct/bean/dto/SiteDto.java
+++ b/ct/src/main/java/com/ccsens/ct/bean/dto/SiteDto.java
@@ -17,12 +17,19 @@ public class SiteDto {
         @ApiModelProperty("所属商户id")
         @NotNull(message = "商户id不能为空")
         private Long id;
-        @ApiModelProperty("场所信息")
-        private List<SiteInfo> siteInfo;
+        @ApiModelProperty("场所名")
+        @NotEmpty(message = "场所名不能为空")
+        private String siteName;
+        @ApiModelProperty("经度")
+        private BigDecimal longitude;
+        @ApiModelProperty("纬度")
+        private BigDecimal latitude;
+//        @ApiModelProperty("场所信息")
+//        private List<SiteInfo> siteInfo;
     }
 
     @Data
-    @ApiModel("添加场所")
+    @ApiModel("添加时场所信息")
     public static class SiteInfo{
         @ApiModelProperty("场所名")
         @NotEmpty(message = "场所名不能为空")
diff --git a/ct/src/main/java/com/ccsens/ct/service/SiteService.java b/ct/src/main/java/com/ccsens/ct/service/SiteService.java
index f7939bab..953456fb 100644
--- a/ct/src/main/java/com/ccsens/ct/service/SiteService.java
+++ b/ct/src/main/java/com/ccsens/ct/service/SiteService.java
@@ -48,24 +48,24 @@ public class SiteService implements ISiteService {
         List<SiteVo.SiteInfo> siteInfos = new ArrayList<>();
 
         SiteDto.SiteInfoDto siteInfoDto = params.getParam();
-        if (CollectionUtil.isNotEmpty(siteInfoDto.getSiteInfo())){
-            if(siteInfoDto.getSiteInfo().size() > 5){
-                throw new BaseException(CodeEnum.SITE_EXCEED);
-            }
+//        if (CollectionUtil.isNotEmpty(siteInfoDto.getSiteInfo())){
+//            if(siteInfoDto.getSiteInfo().size() > 5){
+//                throw new BaseException(CodeEnum.SITE_EXCEED);
+//            }
             //查找该商户下已有场所
             SiteExample siteExample = new SiteExample();
             siteExample.createCriteria().andBusinessIdEqualTo(siteInfoDto.getId());
             List<Site> siteList = siteDao.selectByExample(siteExample);
             //目前一个商户只能添加五个场所
             if(CollectionUtil.isNotEmpty(siteList)) {
-                if (siteInfoDto.getSiteInfo().size() + siteList.size() > 5) {
+                if (siteList.size() >= 5) {
                     throw new BaseException(CodeEnum.SITE_EXCEED);
                 }
             }
             //添加场所
-            for (SiteDto.SiteInfo siteInfo : siteInfoDto.getSiteInfo()) {
+//            for (SiteDto.SiteInfo siteInfo : siteInfoDto.getSiteInfo()) {
                 SiteExample siteName = new SiteExample();
-                siteName.createCriteria().andBusinessIdEqualTo(siteInfoDto.getId()).andSiteNameEqualTo(siteInfo.getSiteName());
+                siteName.createCriteria().andBusinessIdEqualTo(siteInfoDto.getId()).andSiteNameEqualTo(siteInfoDto.getSiteName());
                 List<Site> sites = siteDao.selectByExample(siteName);
                 if(CollectionUtil.isNotEmpty(sites)){
                     throw new BaseException(CodeEnum.SITE_NAME_REPETITION);
@@ -74,9 +74,9 @@ public class SiteService implements ISiteService {
                 Site site = new Site();
                 site.setId(snowflake.nextId());
                 site.setBusinessId(siteInfoDto.getId());
-                site.setSiteName(siteInfo.getSiteName());
-                site.setLongitude(siteInfo.getLongitude());
-                site.setLatitude(siteInfo.getLatitude());
+                site.setSiteName(siteInfoDto.getSiteName());
+                site.setLongitude(siteInfoDto.getLongitude());
+                site.setLatitude(siteInfoDto.getLatitude());
                 siteDao.insertSelective(site);
 
                 String path = WebConstant.UPLOAD_PATH_BASE + "/business/" + siteInfoDto.getId() + "/siteqrcode/" + site.getSiteName();
@@ -111,8 +111,8 @@ public class SiteService implements ISiteService {
                 siteInfo1.setInQrCode(inSiteQrcode.getQrcodePath());
                 siteInfo1.setOutQrCode(outSiteQrcode.getQrcodePath());
                 siteInfos.add(siteInfo1);
-            }
-        }
+//            }
+//        }
 
         //生成场所二维码压缩包并返回下载路径
         ZipUtil.zip(WebConstant.UPLOAD_PATH_BASE + "/business/" + siteInfoDto.getId() + "/siteqrcode",WebConstant.UPLOAD_PATH_BASE + "/business/" + siteInfoDto.getId() + "/QrCode.zip");
diff --git a/health/src/main/resources/application.yml b/health/src/main/resources/application.yml
index 5889ff7f..5c2cd5c4 100644
--- a/health/src/main/resources/application.yml
+++ b/health/src/main/resources/application.yml
@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: test
-    include: common, util-test
\ No newline at end of file
+    active: dev
+    include: common, util-dev
\ No newline at end of file