Merge remote-tracking branch 'origin/dev_qr_code' into dev_qr_code

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

@@ -102,7 +102,7 @@ public class BarcodeUtils {
         Graphics2D g = outImage.createGraphics();
         g.drawImage(image, 0, 0, imageW, imageH, null);
         g.setColor(QRCOLOR);
-        g.setFont(new Font("微软雅黑", Font.BOLD, FONTSIZE));
+//        g.setFont(new Font("微软雅黑", Font.BOLD, FONTSIZE));
         g.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
         g.setBackground(Color.white);
 //        获取文字数量  按照字节展示
@@ -153,7 +153,7 @@ public class BarcodeUtils {
 
 
     private static String outStringByByte(String str, int len) throws IOException {
-        byte[] btf = str.getBytes("gbk");
+        byte[] btf = str.getBytes("GBK");
         int count = 0;
 
         for (int j = len - 1; j >= 0; j--) {
@@ -165,9 +165,9 @@ public class BarcodeUtils {
         }
 
         if (count % 2 == 0) {
-            return new String(btf, 0, len, "gbk");
+            return new String(btf, 0, len, "GBK");
         } else {
-            return new String(btf, 0, len - 1, "gbk");
+            return new String(btf, 0, len - 1, "GBK");
         }
 
     }

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

@@ -406,7 +406,7 @@ public class AgencyController {
                     throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"组织信息不存在");
                 }
                 name = customerAgencyDTO.getOrganizationName();
-            }else if (type.equals(OrgInfoConstant.COMMUNITY)){
+            }else if (type.equals(OrgInfoConstant.NEIGHBOR_HOOD)){
                 IcNeighborHoodDTO icNeighborHoodDTO = neighborHoodService.get(id);
                 if (icNeighborHoodDTO == null){
                     throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"小区信息不存在");
@@ -416,8 +416,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)
-                    .concat("epmet-oper-gov/#/")
-                    .concat(id).concat(StrConstant.QUESTION_MARK_TRANSFER)
+                    .concat("epmet-oper-gov/#/caiji/")
+                    .concat(id).concat("?")
+                    .concat("name=").concat(name).concat(StrConstant.AND_MARK)
                     .concat("type=").concat(type).concat(StrConstant.AND_MARK)
                     .concat("userId=").concat(tokenDto.getUserId())
                     .concat(StrConstant.AND_MARK).concat(String.valueOf(LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli()));

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

@@ -195,7 +195,7 @@ public class IcNeighborHoodController {
             //url组成:数字社区地址?小区id&用户id
             //String url = "https://demo.tduckapp.com/s/7314b64b3a26455ab793fb8c640856b6?id="+id;
             String url = EnvEnum.getCurrentEnv().getUrl().replace("api/",StrConstant.EPMETY_STR)
-                    .concat("epmet-oper-gov/#/")
+                    .concat("epmet-oper-gov/#/caiji/")
                     .concat(id)
                     .concat(StrConstant.AND_MARK).concat("userId=").concat(tokenDto.getUserId());
             BufferedImage image = BarcodeUtils.drawQRImage(neighborhoodName, url);