Merge branch 'develop' into release_temp

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/BarcodeUtils.java

@@ -106,7 +106,7 @@ public class BarcodeUtils {
                 String s = outStringByByte(pressText, maxSize);
                 g.drawString(s, (WIDTH - (FONTSIZE * (WIDTH / FONTSIZE - 2))) / 2, startY);
                 pressText = pressText.substring(s.length(), pressText.length());
-                startY = startY + 30;
+                startY = startY + 35;
             }
             if (v != 0) {
                 g.drawString(pressText, (WIDTH - (FONTSIZE * v)) / 2, startY);

epmet-module/epmet-ext/epmet-ext-server/src/main/resources/bootstrap.yml

@@ -93,6 +93,12 @@ hystrix:
         isolation:
           thread:
             timeoutInMilliseconds: 60000
+  threadpool:
+    default:
+      coreSize: 20
+      maximumSize: 50
+      maxQueueSize: 500
+      queueSizeRejectionThreshold: 800
 
 ribbon:
   ReadTimeout: 300000

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml

@@ -111,6 +111,12 @@ hystrix:
         isolation:
           thread:
             timeoutInMilliseconds: 60000 #缺省为1000
+  threadpool:
+    default:
+      coreSize: 20
+      maximumSize: 50
+      maxQueueSize: 500
+      queueSizeRejectionThreshold: 800
 
 ribbon:
   ReadTimeout: 300000

epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml

@@ -113,6 +113,12 @@ hystrix:
         isolation:
           thread:
             timeoutInMilliseconds: 60000 #缺省为1000
+  threadpool:
+    default:
+      coreSize: 20
+      maximumSize: 50
+      maxQueueSize: 500
+      queueSizeRejectionThreshold: 800
 
 ribbon:
   ReadTimeout: 300000

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java

@@ -245,12 +245,12 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
                     //存缓存
                     redisThird.setComponentAccessToken(componentAccessToken);
                     //推送到私有化平台们
-                    try {
-                        pushComponentAccessToken2PrivateEpmetPlatforms(formDTO);
-                    } catch (Exception e) {
-                        String detail = ExceptionUtils.getErrorStackTrace(e);
-                        log.error(detail);
-                    }
+                    //try {
+                    //    pushComponentAccessToken2PrivateEpmetPlatforms(formDTO);
+                    //} catch (Exception e) {
+                    //    String detail = ExceptionUtils.getErrorStackTrace(e);
+                    //    log.error(detail);
+                    //}
                 } else {
                     throw new RenException(ThirdRunTimeInfoConstant.FAILURE_ACCESS_TOKEN);
                 }

epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml

@@ -93,6 +93,12 @@ hystrix:
         isolation:
           thread:
             timeoutInMilliseconds: 60000
+  threadpool:
+    default:
+      coreSize: 20
+      maximumSize: 50
+      maxQueueSize: 500
+      queueSizeRejectionThreshold: 800
 
 ribbon:
   ReadTimeout: 300000

epmet-module/gov-access/gov-access-server/src/main/resources/bootstrap.yml

@@ -112,6 +112,12 @@ hystrix:
         isolation:
           thread:
             timeoutInMilliseconds: 60000 #缺省为1000
+  threadpool:
+    default:
+      coreSize: 20
+      maximumSize: 50
+      maxQueueSize: 500
+      queueSizeRejectionThreshold: 800
 
 ribbon:
   ReadTimeout: 300000

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java

@@ -138,6 +138,11 @@ public class ImportGeneralDTO implements Serializable {
 
     private Boolean existStatus = false;
 
+    /**
+     * 错误信息添加状态
+     */
+    private Boolean addStatus = false;
+
     /**
      * 楼栋重复状态
      */

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java

@@ -52,7 +52,10 @@ import javax.imageio.ImageIO;
 import javax.imageio.stream.ImageOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.awt.image.BufferedImage;
-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.net.URLEncoder;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
@@ -408,7 +411,9 @@ public class AgencyController {
             }
             //url组成:数字社区地址?小区id&用户id
             //String url = "https://demo.tduckapp.com/s/7314b64b3a26455ab793fb8c640856b6?id="+id;
-            String url = EnvEnum.getCurrentEnv().getUrl().replace("api/", StrConstant.EPMETY_STR)
+            String url = EnvEnum.getCurrentEnv().getUrl()
+                    .replace("cloud","open")
+                    .replace("api/", StrConstant.EPMETY_STR)
                     .concat("epmet-oper-gov/#/caiji/")
                     .concat(id).concat("?")
                     .concat("name=").concat(URLEncoder.encode(name,StrConstant.UTF_8)).concat(StrConstant.AND_MARK)

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java

@@ -142,10 +142,13 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
                 for (ImportGeneralDTO r : needDisposeList) {
                     if (k.equals(r.getAgencyName() + "_" + r.getGridName() + "_" +
                             r.getNeighborHoodName() + "_" + r.getBuildingName())){
-                        // 集合里重复的
-                        nums.add(r.getNum());
-                        disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
-                        r.setExistStatus(true);
+                        if (!r.getAddStatus()){
+                            // 集合里重复的
+                            nums.add(r.getNum());
+                            disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
+                            r.setExistStatus(true);
+                            r.setAddStatus(true);
+                        }
                     }
                 }
             }
@@ -158,8 +161,11 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
             List<ImportGeneralDTO> existList = groupByBuildingExistStatus.get(true);
             if (!CollectionUtils.isEmpty(existList)){
                 existList.forEach(e -> {
-                    nums.add(e.getNum());
-                    disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
+                    if (!e.getAddStatus()){
+                        nums.add(e.getNum());
+                        disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
+                        e.setAddStatus(true);
+                    }
                 });
             }
         }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java

@@ -210,13 +210,17 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
         }
         Map<String, Long> collect = needInsertList.stream().collect(Collectors.groupingBy(n -> n.getBuildingUnitId() + "_" + n.getDoorName(), Collectors.counting()));
         collect.forEach((k,v) -> {
-            if (Integer.valueOf(v.toString()).compareTo(1) > 0){
+            if (Integer.valueOf(v.toString()).compareTo(1) != 0){
                 for (ImportGeneralDTO r : needInsertList) {
                     if (k.equals(r.getBuildingUnitId()+"_"+r.getDoorName())){
-                        // 集合里重复的
-                        nums.add(r.getNum());
-                        disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
-                        r.setExistStatus(true);
+                        // 只添加没添加过的
+                        if (!r.getAddStatus()){
+                            // 集合里重复的
+                            nums.add(r.getNum());
+                            disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
+                            r.setExistStatus(true);
+                            r.setAddStatus(true);
+                        }
                     }
                 }
             }
@@ -227,10 +231,13 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
         existHouses.forEach(e -> {
             for (ImportGeneralDTO n : needInsertList) {
                 if ((n.getBuildingUnitId()+"_"+n.getDoorName()).equals(e)){
-                    // 库里存在的
-                    nums.add(n.getNum());
-                    disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
-                    n.setExistStatus(true);
+                    if (!n.getAddStatus()){
+                        // 库里存在的
+                        nums.add(n.getNum());
+                        disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
+                        n.setExistStatus(true);
+                        n.setAddStatus(true);
+                    }
                 }
             }
         });

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java

@@ -136,10 +136,13 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
             if (Integer.valueOf(v.toString()).compareTo(1) > 0){
                 for (ImportGeneralDTO r : needDisposeList) {
                     if (k.equals(r.getAgencyName() + "_" + r.getGridName() + "_" + r.getNeighborHoodName())){
-                        // 集合里重复的
-                        nums.add(r.getNum());
-                        disposeErrorMsg(info, ImportErrorMsgConstants.EXIST_ERROR);
-                        r.setExistStatus(true);
+                        if (!r.getAddStatus()){
+                            // 集合里重复的
+                            nums.add(r.getNum());
+                            disposeErrorMsg(info, ImportErrorMsgConstants.EXIST_ERROR);
+                            r.setExistStatus(true);
+                            r.setAddStatus(true);
+                        }
                     }
                 }
             }
@@ -152,8 +155,11 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
             List<ImportGeneralDTO> existList = groupByBuildingExistStatus.get(true);
             if (!CollectionUtils.isEmpty(existList)){
                 existList.forEach(e -> {
-                    nums.add(e.getNum());
-                    disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
+                    if (!e.getAddStatus()){
+                        nums.add(e.getNum());
+                        disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
+                        e.setAddStatus(true);
+                    }
                 });
             }
             List<ImportGeneralDTO> notExistList = groupByBuildingExistStatus.get(false);

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java

@@ -141,7 +141,7 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
         return list.stream().map(item -> {
             OptionResultDTO dto = new OptionResultDTO();
             dto.setValue(item.getId());
-            dto.setLabel(item.getHouseName());
+            dto.setLabel(item.getDoorName());
             return dto;
         }).collect(Collectors.toList());
     }

epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml

@@ -127,6 +127,12 @@ hystrix:
         isolation:
           thread:
             timeoutInMilliseconds: 60000 #缺省为1000
+  threadpool:
+    default:
+      coreSize: 20
+      maximumSize: 50
+      maxQueueSize: 500
+      queueSizeRejectionThreshold: 800
 
 ribbon:
   ReadTimeout: 300000

epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.13__changeHomeColumeName.sql

@@ -0,0 +1,2 @@
+-- 修改所属家庭项label为户号
+update ic_form_item set LABEL='房间号' where LABEL='所属家庭';

epmet-user/epmet-user-server/src/main/resources/bootstrap.yml

@@ -132,6 +132,12 @@ hystrix:
         isolation:
           thread:
             timeoutInMilliseconds: 60000 #缺省为1000
+  threadpool:
+    default:
+      coreSize: 20
+      maximumSize: 50
+      maxQueueSize: 500
+      queueSizeRejectionThreshold: 800
 
 ribbon:
   ReadTimeout: 300000