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

base-manager/src/main/java/com/mortals/xhx/module/site/service/SiteService.java

@@ -43,24 +43,10 @@ public interface SiteService extends ICRUDCacheService<SiteEntity, Long> {
      */
     List<SiteTreeSelect> getSiteTree(Context context);
 
-    /**
-     * 根据区域code获取子站点
-     *
-     * @param context
-     * @return
-     */
     List<SiteEntity> getFlatSitesByAreaCode(String areaCode,Context context);
 
-
-    /**
-     * 根据Site获取子站点
-     *
-     * @param context
-     * @return
-     */
     List<SiteEntity> getFlatSitesBySiteId(Long siteId,Context context);
 
-
     void setSiteTree(List<SiteTreeSelect> list, Context context);
 
     void removeSiteTree(List<SiteTreeSelect> list, Context context);
@@ -69,10 +55,8 @@ public interface SiteService extends ICRUDCacheService<SiteEntity, Long> {
 
     void changeUrlPath(SiteEntity siteEntity);
 
-
     Rest<List<MatterEntity>> getMatterAllListByGOV(Map<String,String> params,Integer pageNum, Context context);
 
-
     Rest<String> syncMatterBySiteId(SiteEntity siteEntity, Context context);
 
     void deleteBysiteIdAndSource(Long siteId,Integer source, Context context);

base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java

@@ -271,7 +271,7 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
         if (!ObjectUtils.isEmpty(siteTreeSelects)) {
             return siteTreeSelects;
         } else {
-            return siteTreeMap.get(0);
+            return siteTreeMap.get(1);
         }
     }
 

base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteController.java

@@ -11,6 +11,7 @@ import com.mortals.framework.service.ICacheService;
 import com.mortals.framework.util.ThreadPool;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.base.system.user.model.UserEntity;
 import com.mortals.xhx.common.keys.RedisCacheKeys;
 import com.mortals.xhx.common.utils.SyncDeptThread;
 import com.mortals.xhx.common.utils.SyncGovMatterDetailThread;
@@ -113,6 +114,35 @@ public class SiteController extends BaseCRUDJsonBodyMappingController<SiteServic
     }
 
 
+
+    /**
+     * 获取全站点树
+     */
+    @GetMapping(value = "getAllSiteTree")
+    @UnAuth
+    public String getAllSiteTree() {
+        JSONObject jsonObject = new JSONObject();
+        Map<String, Object> model = new HashMap<>();
+        String busiDesc = this.getModuleDesc() + "构建站点树";
+        try {
+            Context context = new Context();
+            UserEntity userEntity = new UserEntity();
+            userEntity.setId(1L);
+            context.setUser(userEntity);
+            List<SiteTreeSelect> siteTree = this.service.getSiteTree(context);
+            model.put("siteTree", siteTree);
+            this.init(model, getContext());
+            recordSysLog(request, busiDesc + " 【成功】");
+            jsonObject.put(KEY_RESULT_DATA, model);
+            jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
+        } catch (Exception e) {
+            log.error("构建全站点树异常", e);
+            jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
+            jsonObject.put(KEY_RESULT_MSG, super.convertException(e));
+        }
+        return jsonObject.toJSONString();
+    }
+
     /**
      * 根据区域编码查询站点列表
      */

base-manager/src/main/resources/baseinfo.setting

@@ -43,7 +43,7 @@
 事项版本 = matterEdition
 没收违法所得 = 
 联办机构 = jointInfoShow
-办件类型 = 
+办件类型 = appoveTimeLimitShow
 机动车检验合格标志 = 
 四川省老年人优待证 = 
 公租房租金缴纳发票 = 
@@ -150,4 +150,15 @@
 其他行政处罚 = 
 行政许可批准决定书 = 
 办理地点 = operateSite
-机动车驾驶证 = 
+机动车驾驶证 =
+是否网办 = isOnline
+是否支持自助终端办理 = terminalHandle
+是否支持上门收取申请材料 = isDoorTakeShow
+是否支持全省就近办理 = isApplyProvinceShow
+网上办理深度 = onlineOperatDeep
+是否支持全省就近取件 = isProvinceAcquisitionShow
+是否支持网上支付 = isOnlinePayShow
+是否支持物流快递 = isExpressTakeOnlineShow
+网办类型 = onlineType
+
+

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

@@ -31,7 +31,8 @@ Content-Type: application/json
 
 {
 
-  "siteId": 5,
+  "siteId": 54,
+  "matterName": "",
   "page": 1,
   "size": 10
 }

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

@@ -70,6 +70,11 @@ Authorization: eyJhbGciOiJIUzI1NiJ9.eyJsb2dpbl91c2VyX2tleSI6IjM1OmVjZTkyMWQ1MzY2
 Accept: application/json
 
 
+###构建站点树
+GET {{baseUrl}}/site/getAllSiteTree
+Accept: application/json
+
+
 ###站点列表
 POST {{baseUrl}}/site/getFlatSitesByAreaCode
 Authorization: {{authToken}}