测试流控功能

base-manager/src/main/java/com/mortals/xhx/module/app/service/impl/AppVersionServiceImpl.java

@@ -60,7 +60,7 @@ public class AppVersionServiceImpl extends AbstractCRUDServiceImpl<AppVersionDao
             throw new AppException("部署文件不存在！");
         }
         if (!FileUtil.getSuffix(appVersionEntity.getFilePath()).equals("zip")) {
-            throw new AppException("部署只支持zip文件！");
+            throw new AppException("部署只支持zip文件！fileName:" + appVersionEntity.getFilePath());
         }
         //部署路径是否存在 如果不存在 创建目录，
         //文件构成目录  基础path +站点编码+应用编码  /basepath/sitecode/appcode/v2/

base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java

@@ -3,6 +3,7 @@ package com.mortals.xhx.module.matter.service.impl;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.PageUtil;
 import cn.hutool.core.util.ReflectUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.setting.Setting;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -1423,22 +1424,25 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
 
                     //基本属性
                     sb.append(matterEntity.getMatterName()).append("-基本信息,");
+                    sb.append("事项名称:").append(matterEntity.getMatterName()).append("  ");
                     Map<String, String> baseInfoMap = MatterDetailHtmlParseUtil.getbaseInfoMapByHtml(dom);
                     StringBuilder sb1 = new StringBuilder();
+
                     for (Map.Entry<String, String> entry : baseInfoMap.entrySet()) {
-                        if (sb1.length() > 360) {
+                        if (sb1.length() > 300) {
                             sb.append(sb1);
                             sb.append("\n");
                             sb1 = new StringBuilder();
                             sb.append(matterEntity.getMatterName()).append("-基本信息,");
                         }
-                        sb1.append(entry.getKey()).append("  ").append(entry.getValue());
+                        sb1.append(entry.getKey()).append(":").append(StrUtil.replaceChars(entry.getValue(), ",", "，")).append("  ");
                     }
                     sb.append(sb1);
 
                     sb.append("\n");
                     //更新材料属性
                     sb.append(matterEntity.getMatterName()).append("-申请材料,");
+                    sb.append("事项名称:").append(matterEntity.getMatterName()).append("  ");
                     List<Map<String, Object>> sqclList = MatterDetailHtmlParseUtil.getsqclInfoMapByHtml(dom);
                     for (Map<String, Object> sqclMap : sqclList) {
                         Map<String, String> baseinfoMap = (HashMap<String, String>) sqclMap.get("baseinfo");
@@ -1446,7 +1450,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
                             if (!"材料名称".equals(entry.getKey())) {
                                 continue;
                             }
-                            sb.append(entry.getKey()).append("  ").append(entry.getValue());
+                            sb.append(entry.getKey()).append(":").append(StrUtil.replaceChars(entry.getValue(), ",", "，")).append("  ");
                         }
       /*                  List<MatterDatumFileEntity> datumFileEntities = (List<MatterDatumFileEntity>) sqclMap.get("blankList");
                         for (MatterDatumFileEntity datumFileEntity : datumFileEntities) {
@@ -1457,26 +1461,29 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
                     //更新受理条件
                     sb.append("\n");
                     sb.append(matterEntity.getMatterName()).append("-受理条件,");
+                    sb.append("事项名称:").append(matterEntity.getMatterName()).append("  ");
                     Map<String, String> sltjMap = MatterDetailHtmlParseUtil.getSltjMapByHtml(dom);
                     String sltjStr = sltjMap.getOrDefault("sltj", "  ");
                     sb.append(sltjStr);
                     //更新办理流程
                     sb.append("\n");
                     sb.append(matterEntity.getMatterName()).append("-办理流程,");
+                    sb.append("事项名称:").append(matterEntity.getMatterName()).append("  ");
                     List<Map<String, Object>> bllcMapList = MatterDetailHtmlParseUtil.getbllcMapByHtml(dom);
                     for (Map<String, Object> bllcMap : bllcMapList) {
                         for (Map.Entry<String, Object> entry : bllcMap.entrySet()) {
-                            sb.append(entry.getKey()).append("  ").append(entry.getValue());
+                            sb.append(entry.getKey()).append(":").append(StrUtil.replaceChars(entry.getValue().toString(), ",", "，")).append("  ");
                         }
                     }
 
                     //更新收费标准
                     sb.append("\n");
                     sb.append(matterEntity.getMatterName()).append("-收费标准,");
+                    sb.append("事项名称:").append(matterEntity.getMatterName()).append("  ");
                     Map<String, String> sfbzMap = MatterDetailHtmlParseUtil.getSfbzMapByHtml(dom);
 
                     String sfbzStr = sfbzMap.getOrDefault("sfbz", "  ");
-                    sb.append(sfbzStr);
+                    sb.append(StrUtil.replaceChars(sfbzStr, ",", "，"));
                     sb.append("\n");
 
                     //设定依据
@@ -1498,13 +1505,15 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
                     //中介服务
                     sb.append("\n");
                     sb.append(matterEntity.getMatterName()).append("-中介服务,");
+                    sb.append("事项名称:").append(matterEntity.getMatterName()).append("  ");
                     Map<String, String> zjfwMap = MatterDetailHtmlParseUtil.getZjfwMapByHtml(dom);
                     for (Map.Entry<String, String> entry : zjfwMap.entrySet()) {
-                        sb.append(entry.getKey()).append("  ").append(entry.getValue());
+                        sb.append(entry.getKey()).append(":").append(StrUtil.replaceChars(entry.getValue(), ",", "，")).append("  ");
                     }
                     //常见问题
                     sb.append("\n");
                     sb.append(matterEntity.getMatterName()).append("-常见问题,");
+                    sb.append("事项名称:").append(matterEntity.getMatterName()).append("  ");
                     StringBuilder sb3 = new StringBuilder();
                     List<Map<String, Object>> cjwtMapList = MatterDetailHtmlParseUtil.getCjwtMapByHtml(dom);
                     for (Map<String, Object> bllcMap : cjwtMapList) {
@@ -1515,7 +1524,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
                                 sb3 = new StringBuilder();
                                 sb.append(matterEntity.getMatterName()).append("-常见问题,");
                             }
-                            sb3.append(entry.getKey()).append("  ").append(entry.getValue());
+                            sb3.append(entry.getKey()).append(":").append(StrUtil.replaceChars(entry.getValue().toString(), ",", "，")).append("  ");
 
                         }
                     }
@@ -1751,6 +1760,13 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
 
     public static void main(String[] args) {
 
+
+
+        String sss="实施主体性质:法定机关  是否进驻政务大厅:是  村居社区名称:无  权力来源:法定本级行使  村居社区代码:无  法定时限办结说明:自受理之日起，在法定期限内办结  行使层级:县级  到办事现场次数:0  网办类型:全程网办  实施主体:邛崃市司法局  是否网办:是  监督投诉方式:投诉电话：028-12345,028-88794281;  事项类型:公共服务  行使方式:依申请行使  承诺时限办结说明:自受理之日起，在承诺期限内办结  是否支持全省就近取件:否  是否支持预约办理:否  事项版本:16  联办机构:无  办件类型:即办件  通办范围:全省  是否支持上门收取申请材料:无  是否支持自助终端办理:否";
+
+        String s = StrUtil.replaceChars(sss, ",", "，");
+        System.out.println(s);
+
 /*
         ArrayList<MatterEntity> matterEntities = new ArrayList<>();
 

base-manager/src/test/java/com/mortals/httpclient/app/AppController.http

@@ -20,11 +20,11 @@ client.global.set("authToken", JSON.parse(response.body).data.token);
 %}
 
 ###自助终端应用列表
+#POST {{baseUrl}}/app/interlist
 POST {{baseUrl}}/app/interlist
 Content-Type: application/json
 
 {
-  "idList": [2,3,1],
   "siteId": 1,
   "page": 1,
   "size": -1
@@ -91,7 +91,7 @@ client.global.set("App_id", JSON.parse(response.body).data.id);
 %}
 
 ###自助终端应用查看
-GET {{baseUrl}}/app/interinfo?id=19999999999999999999999
+GET {{baseUrl}}/app/interinfo?id=235
 Accept: application/json
 
 ###自助终端应用编辑

base-manager/src/test/java/com/mortals/httpclient/base/BaseAreaController.http

@@ -58,6 +58,33 @@ Content-Type: application/json
 }
 
 
+###子区域更新
+POST http://10.141.38.234:11078/base/base/area/genSubAreaByAreaName
+Content-Type: application/json
+
+{
+  "areaCode": "511523000000"
+}
+
+###同步事项数据
+POST http://10.141.38.234:11078/base/site/syncGovMatterBySiteId
+Content-Type: application/json
+
+{
+  "id":1
+}
+
+###同步事项数据
+POST http://10.141.38.234:11078/base/site/syncGovMatterBySiteId
+Content-Type: application/json
+
+{
+  "id":1
+}
+
+
+
+
 ###区域查看
 GET {{baseUrl}}/base/area/info?id={{BaseArea_id}}
 Authorization: {{authToken}}

base-manager/src/test/java/com/mortals/httpclient/http-client.env.json

@@ -22,6 +22,10 @@
     "baseUrl": "http://10.6.50.2:11078/base"
   },
 
+  "base-jiangan": {
+    "baseUrl": "http://10.141.38.234:11091/basics_api/base"
+  },
+
 
 
   "base-test-https": {

base-manager/src/test/java/com/mortals/httpclient/site/SiteController.http

@@ -146,7 +146,7 @@ POST {{baseUrl}}/site/syncGovMatterBySiteId
 Content-Type: application/json
 
 {
-  "id":63
+  "id":52
 }
 
 

base-manager/src/test/java/com/mortals/httpclient/system/system.http

@@ -289,3 +289,12 @@ Content-Type: application/json
 ###更新服务ip
 GET {{baseUrl}}/param/updateServerIp?serverIp=192.168.0.98
 Content-Type: application/json
+
+###刷新用户
+POST {{baseUrl}}/user/refreshUser
+Content-Type: application/json
+
+{}
+
+
+

base-manager/src/test/java/com/mortals/httpclient/workman/WorkmanController.http

@@ -57,4 +57,13 @@ Content-Type: application/json
 Authorization: {{authToken}}
 
 
+###模板导出
+POST http://172.54.191.130:11071/base/workman/exportExcel
+Content-Type: application/json
+Authorization: eyJhbGciOiJIUzI1NiJ9.eyJsb2dpbl91c2VyX2tleSI6IjE6YTMzN2IxNmFhMmU2NGIyZTg5YjA1ZjhjOWQ5NmM1ZjMifQ.Al-xx604Bg_-AmLcpLBvY3ToF3c3Sr_KmNS6D4Ny_iU
+
+{"page": 1,"size": 10
+}
+
+