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

base-manager/src/main/java/com/mortals/xhx/common/utils/SyncTreeSiteThread.java

@@ -28,7 +28,7 @@ public class SyncTreeSiteThread implements Runnable {
         SiteService siteService = SpringUtils.getBean(SiteService.class);
         List<SiteTreeSelect> siteTreeSelects = siteService.siteTree(context);
         siteService.setSiteTree(siteTreeSelects, context);
-        log.info("刷新用户站点树=》userID:{} siteTree:{}",context.getUser().getId(), JSON.toJSONString(siteService.getSiteTree(context)));
+        log.info("刷新用户站点树=》userID:{} siteIds:{} siteTree:{}",context.getUser().getId(),context.getUser().getSiteIds(), JSON.toJSONString(siteService.getSiteTree(context)));
     }
 
 }

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

@@ -200,6 +200,10 @@ public class MatterServiceImpl extends AbstractCRUDCacheServiceImpl<MatterDao, M
 
     @Override
     public Result<MatterEntity> findSubList(MatterEntity matterQuery, PageInfo pageInfo, Context context) throws AppException {
+        SiteEntity siteCache = siteService.getCache(matterQuery.getSiteId().toString());
+        if(ObjectUtils.isEmpty(matterQuery.getAreaCode())){
+            matterQuery.setAreaCode(siteCache==null?null:siteCache.getAreaCode());
+        }
         return this.dao.getSubList(matterQuery, pageInfo);
     }
 

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

@@ -155,7 +155,6 @@ public class MatterController extends BaseCRUDJsonBodyMappingController<MatterSe
         this.init(model, context);
         ret.setCode(code);
         ret.setData(model);
-        ret.setDict(model.get(KEY_RESULT_DICT));
         ret.setMsg(model.get(MESSAGE_INFO) == null ? "" : model.remove(MESSAGE_INFO).toString());
         return ret;
     }

base-manager/src/main/resources/sqlmap/module/matter/MatterMapperExt.xml

@@ -11,9 +11,17 @@
         mortals_sys_matter AS a
         LEFT JOIN ( SELECT matterCode FROM mortals_sys_site_matter WHERE siteId = #{condition.siteId} ) AS b ON a.matterNo = b.matterCode
         <trim suffixOverrides="where" suffix="">
-            where b.matterCode IS NULL
+            where b.matterCode IS NULL and
             <trim prefixOverrides="and" prefix="">
-                <include refid="_condition_"/>
+                <if test="condition.areaCode!=null and condition.areaCode!=''">
+                    and a.areaCode = #{condition.areaCode,jdbcType=VARCHAR}
+                </if>
+                <if test="condition.deptCode!=null and condition.deptCode!=''">
+                    and a.deptCode = #{condition.deptCode,jdbcType=VARCHAR}
+                </if>
+                <if test="condition.matterName != null and condition.matterName != ''">
+                    a.matterName like #{condition.matterName}
+                </if>
             </trim>
         </trim>
     </select>
@@ -26,9 +34,17 @@
         mortals_sys_matter AS a
         LEFT JOIN ( SELECT matterCode FROM mortals_sys_site_matter WHERE siteId = #{condition.siteId} ) AS b ON a.matterNo = b.matterCode
         <trim suffixOverrides="where" suffix="">
-            where b.matterCode IS NULL
+            where b.matterCode IS NULL and
             <trim prefixOverrides="and" prefix="">
-                <include refid="_condition_"/>
+                <if test="condition.areaCode!=null and condition.areaCode!=''">
+                    and a.areaCode = #{condition.areaCode,jdbcType=VARCHAR}
+                </if>
+                <if test="condition.deptCode!=null and condition.deptCode!=''">
+                    and a.deptCode = #{condition.deptCode,jdbcType=VARCHAR}
+                </if>
+                <if test="condition.matterName != null and condition.matterName != ''">
+                     a.matterName like #{condition.matterName}
+                </if>
             </trim>
         </trim>
     </select>

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

@@ -30,8 +30,7 @@ POST {{baseUrl}}/matter/sublist
 Content-Type: application/json
 
 {
-  "areaCode": "513426000000",
-  "siteId": 35,
+  "siteId": 5,
   "page": 1,
   "size": 10
 }

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

@@ -36,7 +36,7 @@ client.global.set("SkinBase_id", JSON.parse(response.body).data.id);
 %}
 
 ###系统基础皮肤查看
-GET {{baseUrl}}/skin/base/view?id=28
+GET {{baseUrl}}/skin/base/view?id=37
 Authorization: {{authToken}}
 Accept: application/json
 

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

@@ -32,7 +32,7 @@ spring:
           - DedupeResponseHeader=Vary Access-Control-Allow-Origin Access-Control-Allow-Credentials, RETAIN_FIRST
       httpclient:
         connect-timeout: 10000
-        response-timeout: 5s
+        response-timeout: 30s
       # 打印请求日志(自定义)
       requestLog: true
       discovery:
@@ -75,6 +75,9 @@ spring:
           uri: lb://sample-form-manager
           predicates:
             - Path=/sampleform/**
+          metadata:
+            response-timeout: 200000
+            connect-timeout: 200000
     nacos:
       # Nacos 作为注册中心的配置项，对应 NacosDiscoveryProperties 配置类
       discovery: