Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

base-manager/src/main/java/com/mortals/xhx/module/matter/model/vo/MatterInfo.java

@@ -54,4 +54,5 @@ public class MatterInfo {
      */
     private String promiseTimeLimitShow;
 
+
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/matter/model/vo/MatterVo.java

@@ -16,4 +16,9 @@ public class MatterVo extends BaseEntityLong {
 
     private List<Long> idList;
 
+    /**
+     * 行政处罚排除
+     */
+    private List <String> eventTypeShowNotList;
+
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterController.java

@@ -4,6 +4,7 @@ import cn.hutool.setting.Setting;
 import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.Rest;
+import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.Result;
@@ -25,6 +26,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -54,6 +56,23 @@ public class MatterController extends BaseCRUDJsonBodyMappingController<MatterSe
         super.setModuleDesc("基础事项");
     }
 
+    /**
+     * @param query
+     * @param model
+     * @param context
+     * @throws AppException
+     */
+    @Override
+    protected void doListBefore(MatterEntity query, Map<String, Object> model, Context context) throws AppException {
+        if(ObjectUtils.isEmpty(query.getEventTypeShowNotList())){
+            ArrayList<String> notList = new ArrayList<>();
+            notList.add("行政处罚");
+            query.setEventTypeShowNotList(notList);
+        }
+
+        super.doListBefore(query, model, context);
+    }
+
     @Override
     protected void init(Map<String, Object> model, Context context) {
         this.addDict(model, "appoveObjectShow", paramService.getParamBySecondOrganize("Matter", "appoveObjectShow"));

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

@@ -77,8 +77,7 @@ client.global.set("App_id", JSON.parse(response.body).data.id);
 %}
 
 ###自助终端应用查看
-GET {{baseUrl}}/app/info?id={{App_id}}
-Authorization: {{authToken}}
+GET {{baseUrl}}/app/info?id=1
 Accept: application/json
 
 ###自助终端应用编辑

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

@@ -20,9 +20,8 @@ POST {{baseUrl}}/matter/list
 Content-Type: application/json
 
 {
-  "siteId": "",
-  "matterName": "%对墓穴占地面积超过标准的处罚%",
-  "deptCode":"",
+  "siteId": 1,
+  "eventTypeShowNotList": ["行政处罚"],
   "page": 1,
   "size": 10
 }

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

 
 ###站点列表
 POST {{baseUrl}}/site/list
-Authorization: {{authToken}}
 Content-Type: application/json
 
 {

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

@@ -6,7 +6,7 @@ Content-Type: application/json
 {
     "siteId":1,
     "page":1,
-    "size":-1
+    "size":10
 }
 
 

portal-manager/pom.xml

@@ -116,7 +116,7 @@
 				<profiles.log.level>INFO</profiles.log.level>
 				<profiles.log.path>/home/mortals/app/logs</profiles.log.path>
 				<package.environment>yibin</package.environment>
-				<skipUi>true</skipUi>
+				<skipUi>false</skipUi>
 			</properties>
 		</profile>
 

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

@@ -12,6 +12,10 @@
     "baseUrl": "http://10.12.185.213:11078/zwfw"
   },
 
+  "portal-yibin-web": {
+    "baseUrl": "http://112.19.80.237:11078/zwfw"
+  },
+
   "portal-yibin-web": {
     "baseUrl": "http://112.19.80.237:11078/zwfw"
   }

portal-manager/src/test/java/com/mortals/httpclient/param/ParamController.http

 
 ###参数信息业务列表
 POST {{baseUrl}}/param/list
-Authorization: {{authToken}}
 Content-Type: application/json
 
 {
     "page":1,
-    "size":10
+    "size":1
 }
 
 

smart-gateway/src/main/resources/bootstrap.yml

@@ -85,6 +85,15 @@ spring:
           metadata:
             response-timeout: 200000
             connect-timeout: 200000
+        # 自助服务
+        - id: sst-manager
+          #uri: http://192.168.0.98:17002
+          uri: lb://sst-manager
+          predicates:
+            - Path=/sst/**
+          metadata:
+            response-timeout: 200000
+            connect-timeout: 200000
     nacos:
       # Nacos 作为注册中心的配置项，对应 NacosDiscoveryProperties 配置类
       discovery: