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

base-manager/src/main/java/com/mortals/xhx/base/system/user/service/impl/UserServiceImpl.java

@@ -297,6 +297,8 @@ public class UserServiceImpl extends AbstractCRUDServiceImpl<UserDao, UserEntity
     @Override
     public void updateUserList(List<UserPdu> list) {
         //更新本地用户信息，并且更新用户站点树
+
+        //如果用户未有所属站点 则不更新
         for (UserPdu user : list) {
             UserEntity tempUser = this.selectOne(new UserQuery().loginName(user.getLoginName()));
             if (ObjectUtils.isEmpty(tempUser)) {
@@ -305,18 +307,22 @@ public class UserServiceImpl extends AbstractCRUDServiceImpl<UserDao, UserEntity
                 entity.initAttrValue();
                 BeanUtils.copyProperties(user, entity, BeanUtil.getNullPropertyNames(user));
                 this.save(entity);
-                Context context = new Context();
-                context.setUser(entity);
-                ThreadPool.getInstance().execute(new SyncTreeSiteThread(context));
+                if (!ObjectUtils.isEmpty(entity.getSiteIds())) {
+                    Context context = new Context();
+                    context.setUser(entity);
+                    ThreadPool.getInstance().execute(new SyncTreeSiteThread(context));
+                }
             } else {
                 //更新
                 UserEntity userEntity = new UserEntity();
-                BeanUtils.copyProperties(user, userEntity, new String[]{"loginPwd","loginName", "userType", "status", "lastLoginTime", "lastLoginAddress"});
+                BeanUtils.copyProperties(user, userEntity, new String[]{"loginPwd", "loginName", "userType", "status", "lastLoginTime", "lastLoginAddress"});
                 userEntity.setId(tempUser.getId());
                 this.updateWidthDao(userEntity);
-                Context context = new Context();
-                context.setUser(userEntity);
-                ThreadPool.getInstance().execute(new SyncTreeSiteThread( context));
+                if (!ObjectUtils.isEmpty(userEntity.getSiteIds())) {
+                    Context context = new Context();
+                    context.setUser(userEntity);
+                    ThreadPool.getInstance().execute(new SyncTreeSiteThread(context));
+                }
             }
         }
     }

base-manager/src/main/java/com/mortals/xhx/module/app/web/AppController.java

@@ -2,7 +2,6 @@ package com.mortals.xhx.module.app.web;
 
 import cn.hutool.core.net.url.UrlBuilder;
 import cn.hutool.core.util.ZipUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.ap.GlobalSysInfo;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
@@ -31,10 +30,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.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import static com.mortals.xhx.common.key.Constant.CUSTAPP_ROOT_PATH;
@@ -66,7 +62,7 @@ public class AppController extends BaseCRUDJsonBodyMappingController<AppService,
     protected void init(Map<String, Object> model, Context context) {
         this.addDict(model, "type", AppTypeEnum.getEnumMap());
         this.addDict(model, "shelves", paramService.getParamBySecondOrganize("App", "shelves"));
-        this.addDict(model, "appThemeName", paramService.getParamBySecondOrganize("App", "appThemeName"));
+        //this.addDict(model, "appThemeName", paramService.getParamBySecondOrganize("App", "appThemeName"));
         this.addDict(model, "distribute", YesNoEnum.getEnumMap());
         this.addDict(model, "dateUpdate", YesNoEnum.getEnumMap());
         super.init(model, context);
@@ -106,6 +102,11 @@ public class AppController extends BaseCRUDJsonBodyMappingController<AppService,
             List<AppCategoryEntity> appCategoryEntities = appCategoryService.find(appCategoryQuery);
             if (!ObjectUtils.isEmpty(appCategoryEntities)) {
                 model.put("appCategory", appCategoryEntities);
+                Map<String,Object> appThemeName = new HashMap<>();
+                for (AppCategoryEntity appCategory:appCategoryEntities){
+                    appThemeName.put(appCategory.getId().toString(),appCategory.getCategoryName());
+                }
+                this.addDict(model, "appThemeName", appThemeName);
             }
         }
         return super.doListAfter(query, model, context);

base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteTreeSelect.java

@@ -37,6 +37,11 @@ public class SiteTreeSelect implements Serializable {
      */
     private String siteCode;
 
+    /**
+     * 站点详细地址
+     */
+    private String detailAddress;
+
     /**
      * 节点名称
      */
@@ -45,6 +50,12 @@ public class SiteTreeSelect implements Serializable {
      * 区域编码
      */
     private String areaCode;
+
+    /**
+     * 为区域时 层级
+     */
+    private Integer level;
+
     /**
      * 是否叶子节点
      */
@@ -79,7 +90,6 @@ public class SiteTreeSelect implements Serializable {
 
     public SiteTreeSelect(AreaEntity entity) {
         //如果是站点，则替换名称和id
-
         this.id = entity.getIid();
         this.label = entity.getName();
         if ("False".equalsIgnoreCase(entity.getHaveSonArea())) {
@@ -103,14 +113,18 @@ public class SiteTreeSelect implements Serializable {
             this.siteCode = collect.stream().map(item -> item.getSiteCode()).collect(Collectors.joining(","));
             this.type = "site";
             this.icon = "el-icon-wind-power";
-            this.longitude = collect.stream().findFirst().map(item -> item.getLongitude()).orElseGet(() -> "");
-            this.latitude = collect.stream().findFirst().map(item -> item.getLatitude()).orElseGet(() -> "");
+            this.detailAddress=collect.stream().map(item -> item.getDetailAddress()).collect(Collectors.joining(","));
+            this.areaCode=collect.stream().map(item -> item.getAreaCode()).collect(Collectors.joining(","));
+            this.longitude = collect.stream().map(item -> item.getLongitude()).collect(Collectors.joining(","));
+            this.latitude = collect.stream().map(item -> item.getLatitude()).collect(Collectors.joining(","));
         } else {
             this.id = entity.getIid();
             this.label = entity.getName();
             this.type = "area";
             this.icon = "el-icon-place";
+            this.areaCode=entity.getAreaCode();
         }
+        this.level=entity.getAreaLevel();
         if ("False".equalsIgnoreCase(entity.getHaveSonArea())) {
             this.isLeaf = true;
             //this.children = new ArrayList();
@@ -120,7 +134,6 @@ public class SiteTreeSelect implements Serializable {
         }
         this.areaCode = entity.getAreaCode();
 
-
     }
 
     // 反序列化器
@@ -132,7 +145,7 @@ public class SiteTreeSelect implements Serializable {
             node.setId(jsonObject.getString("id"));
             node.setSiteCode(jsonObject.getString("siteCode"));
             node.setLabel(jsonObject.getString("label"));
-            node.setAreaCode(jsonObject.getString("areacode"));
+            node.setAreaCode(jsonObject.getString("areaCode"));
             node.setIsLeaf(jsonObject.getBoolean("isLeaf"));
             node.setLongitude(jsonObject.getString("longitude"));
             node.setLatitude(jsonObject.getString("latitude"));
@@ -140,9 +153,11 @@ public class SiteTreeSelect implements Serializable {
             node.setIcon(jsonObject.getString("icon"));
             JSONArray jsonArray = jsonObject.getJSONArray("children");
             List<SiteTreeSelect> children = new ArrayList<>();
-            for (int i = 0; i < jsonArray.size(); i++) {
-                SiteTreeSelect child = JSON.parseObject(jsonArray.getJSONObject(i).toJSONString(), SiteTreeSelect.class);
-                children.add(child);
+            if(!ObjectUtils.isEmpty(jsonArray)){
+                for (int i = 0; i < jsonArray.size(); i++) {
+                    SiteTreeSelect child = JSON.parseObject(jsonArray.getJSONObject(i).toJSONString(), SiteTreeSelect.class);
+                    children.add(child);
+                }
             }
             node.setChildren(children);
             return node;

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

@@ -44,25 +44,27 @@ public interface SiteService extends ICRUDCacheService<SiteEntity, Long> {
      */
     List<SiteTreeSelect> getSiteTree(Context context);
 
-    List<SiteEntity> getFlatSitesByAreaCode(String areaCode,Context context);
+    List<SiteEntity> getFlatSitesByAreaCode(String areaCode, Context context);
 
-    List<SiteEntity> getFlatSitesBySiteId(Long siteId,Context context);
+    List<SiteEntity> getFlatSitesBySiteId(Long siteId, Context context);
 
-    Rest< List<SiteAreaVo>> getAreaSitesBySite(SiteQuery query, Context context);
+    Integer countSitesByArea(SiteQuery query, Context context);
 
-    Rest< List<SiteEntity>> getAreaSitesByAreaLevel(SiteQuery query, Context context);
+    Rest<List<SiteAreaVo>> getAreaSitesBySite(SiteQuery query, Context context);
+
+    Rest<List<SiteEntity>> getAreaSitesByAreaLevel(SiteQuery query, Context context);
 
     void setSiteTree(List<SiteTreeSelect> list, Context context);
 
     void removeSiteTree(List<SiteTreeSelect> list, Context context);
 
-    List<SiteEntity> getListAllInfoByQuery(SiteQuery query,Context context) throws AppException;
+    List<SiteEntity> getListAllInfoByQuery(SiteQuery query, Context context) throws AppException;
 
     void changeUrlPath(SiteEntity siteEntity);
 
-    Rest<List<MatterEntity>> getMatterAllListByGOV(Map<String,String> params,Integer pageNum, Context context);
+    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);
+    void deleteBysiteIdAndSource(Long siteId, Integer source, Context context);
 }
\ No newline at end of file

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

@@ -185,7 +185,6 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
 
     @Override
     protected void saveAfter(SiteEntity entity, Context context) throws AppException {
-        log.info("站点更新1");
         //刷新站点树
         //ThreadPool.getInstance().execute(new SyncTreeSiteThread(this,context));
         Rest<String> rest = userFeign.synchSiteAuth();
@@ -364,7 +363,7 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
 
     @Override
     public List<SiteTreeSelect> getSiteTree(Context context) {
-        List<SiteTreeSelect> siteTreeSelects = siteTreeMap.get(context.getUser().getId());
+        // List<SiteTreeSelect> siteTreeSelects = siteTreeMap.get(context.getUser().getId());
         List<SiteTreeSelect> collect = getSiteTreeSelects(context.getUser().getId().toString());
         log.info("siteTree:{}", JSON.toJSONString(collect));
         if (!ObjectUtils.isEmpty(collect)) {
@@ -389,7 +388,6 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
         if (ObjectUtils.isEmpty(siteTreeSelectStr)) {
             return new ArrayList<>();
         }
-
         JSONArray jsonArray = JSON.parseArray(siteTreeSelectStr);
         if (ObjectUtils.isEmpty(jsonArray)) {
             return new ArrayList<>();
@@ -450,12 +448,37 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
         return siteList;
     }
 
+    /**
+     * @param query
+     * @param context
+     * @return
+     */
+    @Override
+    public Integer countSitesByArea(SiteQuery query, Context context) {
+        List<SiteEntity> siteList = new ArrayList<>();
+
+        if (ObjectUtils.isEmpty(query.getAreaCode())) {
+            throw new AppException("区域编码不能为空！");
+        }
+        AreaEntity areaEntity = areaService.getExtCache(query.getAreaCode());
+        if (ObjectUtils.isEmpty(areaEntity)) {
+            throw new AppException(String.format("区域不存在！区域编码：%s", query.getAreaCode()));
+        }
+        String matchCode = query.getAreaCode().replaceAll("(0)+$", "");
+        SiteQuery siteQuery = new SiteQuery();
+        siteQuery.setAreaCode(matchCode + "%");
+        List<SiteEntity> siteEntities = this.find(siteQuery);
+
+        if (!ObjectUtils.isEmpty(siteEntities)) {
+            siteList.addAll(siteEntities);
+        }
+        return siteList.size();
+    }
+
     @Override
     public Rest<List<SiteAreaVo>> getAreaSitesBySite(SiteQuery query, Context context) {
         List<SiteAreaVo> list = new ArrayList<>();
         SiteAreaVo siteAreaVo = new SiteAreaVo();
-
-
         //获取当前节点的第一层子节点
         if (ObjectUtils.isEmpty(query.getAreaName())) {
             throw new AppException("区域名称查询参数不能为空！");
@@ -553,7 +576,7 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
 
     @Override
     public void setSiteTree(List<SiteTreeSelect> list, Context context) {
-        siteTreeMap.put(context.getUser().getId(), list);
+        // siteTreeMap.put(context.getUser().getId(), list);
         //存放到redis中去
         cacheService.hset(USER_SITE_TREE, context.getUser().getId().toString(), JSON.toJSONString(list));
     }

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

@@ -255,6 +255,24 @@ public class SiteController extends BaseCRUDJsonBodyMappingController<SiteServic
         return jsonObject.toJSONString();
     }
 
+
+    /**
+     * 根据区域获取子站点数量
+     */
+    @PostMapping(value = "countSitesByArea")
+    @UnAuth
+    public Rest<Integer> countSitesByArea(@RequestBody SiteQuery site) {
+        String busiDesc = "根据站点id查询站点列表子集" + this.getModuleDesc();
+        try {
+            Integer count = this.service.countSitesByArea(site, getContext());
+            recordSysLog(request, busiDesc + " 【成功】");
+            return Rest.ok(count);
+        } catch (Exception e) {
+            log.error("获取异常", e);
+            return Rest.fail(e.getMessage());
+        }
+    }
+
     /**
      * 根据站点id查询站点列表子集，包含当前站点,二层结构
      * {rootname:}