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

base-manager/src/main/java/com/mortals/xhx/base/framework/interceptor/AuthTokenServiceImpl.java

@@ -70,8 +70,6 @@ public class AuthTokenServiceImpl implements IAuthTokenService {
 
     @Autowired
     private ICacheService cacheService;
-    @Autowired
-    private IUserFeign userFeign;
 
     /**
      * 获取信息

base-manager/src/main/java/com/mortals/xhx/base/system/user/model/UserEntity.java

@@ -81,6 +81,8 @@ public class UserEntity extends UserEntityExt implements IUser {
     */
     private Long siteId;
 
+    private String siteIds;
+
     /**
     * 用户状态，0：停用，1：正常，2：冻结，3：销户，4：离职，默认1
     */
@@ -129,6 +131,8 @@ public class UserEntity extends UserEntityExt implements IUser {
     public UserEntity(){
 
     }
+
+
     /**
     * 获取 登录名
     * @return loginName
@@ -328,7 +332,11 @@ public class UserEntity extends UserEntityExt implements IUser {
 
     @Override
     public String getSiteIds() {
-        return "";
+        return this.siteIds;
+    }
+
+    public void setSiteIds(String siteIds) {
+        this.siteIds = siteIds;
     }
 
     /**

base-manager/src/main/java/com/mortals/xhx/base/system/user/model/UserEntityExt.java

@@ -39,4 +39,6 @@ public class UserEntityExt extends BaseEntityLong {
     private List<ModelEntity> modleList;
 
 
+
+
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/DemoStartedService.java

@@ -2,17 +2,22 @@ package com.mortals.xhx.daemon.applicationservice;
 
 import com.mortals.framework.model.Context;
 import com.mortals.framework.service.ICacheService;
+import com.mortals.framework.service.IUser;
 import com.mortals.framework.springcloud.config.web.BaseWebMvcConfigurer;
 import com.mortals.framework.util.ThreadPool;
 import com.mortals.xhx.base.system.user.model.UserEntity;
 import com.mortals.xhx.base.system.user.model.UserQuery;
 import com.mortals.xhx.base.system.user.service.UserService;
+import com.mortals.xhx.common.pdu.user.UserPdu;
+import com.mortals.xhx.common.utils.BeanUtil;
 import com.mortals.xhx.common.utils.SyncTreeSiteThread;
+import com.mortals.xhx.feign.user.IUserFeign;
 import com.mortals.xhx.module.site.model.SiteTreeSelect;
 import com.mortals.xhx.module.site.service.SiteService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Component;
@@ -41,6 +46,8 @@ public class DemoStartedService implements IApplicationStartedService {
 
     @Autowired
     private UserService userService;
+    @Autowired
+    private IUserFeign userFeign;
 
     @Override
     public void start() {
@@ -52,9 +59,113 @@ public class DemoStartedService implements IApplicationStartedService {
         contextTemp.setUser(userEntity);
         SyncTreeSiteThread syncTreeSiteThread = new SyncTreeSiteThread(siteService, contextTemp);
         ThreadPool.getInstance().execute(syncTreeSiteThread);
-        userService.find(new UserQuery()).stream().forEach(user->{
+
+        userFeign.list(new UserPdu()).getData().getData().stream().forEach(userPdu->{
             Context context = new Context();
-            context.setUser(user);
+
+
+
+         /*   IUser user = new IUser() {
+                @Override
+                public Long getId() {
+                    return userPdu.getId();
+                }
+
+                @Override
+                public Long getDeptId() {
+                    return null;
+                }
+
+                @Override
+                public String getDeptName() {
+                    return null;
+                }
+
+                @Override
+                public Long getCustomerId() {
+                    return null;
+                }
+
+                @Override
+                public Long getSiteId() {
+                    return null;
+                }
+
+                @Override
+                public String getSiteIds() {
+                    return userPdu.getSiteIds();
+                }
+
+                @Override
+                public Long getCustomerJoinId() {
+                    return null;
+                }
+
+                @Override
+                public String getCustomerNum() {
+                    return null;
+                }
+
+                @Override
+                public String getLoginName() {
+                    return userPdu.getLoginName();
+                }
+
+                @Override
+                public String getRealName() {
+                    return userPdu.getRealName();
+                }
+
+                @Override
+                public boolean isAdmin() {
+                    return userPdu.getId()==1L;
+                }
+
+                @Override
+                public boolean isSystemUser() {
+                    return false;
+                }
+
+                @Override
+                public boolean isManager() {
+                    return false;
+                }
+
+                @Override
+                public Integer getUserType() {
+                    return null;
+                }
+
+                @Override
+                public String getToken() {
+                    return null;
+                }
+
+                @Override
+                public Long getLoginTime() {
+                    return null;
+                }
+
+                @Override
+                public Long getExpireTime() {
+                    return null;
+                }
+
+                @Override
+                public void setExpireTime(Long expireTime) {
+
+                }
+
+                @Override
+                public String getMenuUrl() {
+                    return null;
+                }
+            };*/
+            UserEntity entity = new UserEntity();
+            entity.initAttrValue();
+            BeanUtils.copyProperties(userPdu, entity, BeanUtil.getNullPropertyNames(userPdu));
+
+            context.setUser(entity);
             ThreadPool.getInstance().execute(new SyncTreeSiteThread(siteService,context));
         });
     }

base-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserTaskImpl.java

@@ -6,6 +6,7 @@ import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.service.ITask;
 import com.mortals.framework.service.ITaskExcuteService;
+import com.mortals.framework.service.IUser;
 import com.mortals.xhx.base.system.user.model.UserEntity;
 import com.mortals.xhx.base.system.user.model.UserQuery;
 import com.mortals.xhx.base.system.user.service.UserService;
@@ -72,7 +73,104 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
                 BeanUtils.copyProperties(user, entity, BeanUtil.getNullPropertyNames(user));
                 userService.save(entity);
                 Context context = new Context();
-                context.setUser(userEntity);
+
+              /*  IUser iUser = new IUser() {
+                    @Override
+                    public Long getId() {
+                        return userPdu.getId();
+                    }
+
+                    @Override
+                    public Long getDeptId() {
+                        return null;
+                    }
+
+                    @Override
+                    public String getDeptName() {
+                        return null;
+                    }
+
+                    @Override
+                    public Long getCustomerId() {
+                        return null;
+                    }
+
+                    @Override
+                    public Long getSiteId() {
+                        return null;
+                    }
+
+                    @Override
+                    public String getSiteIds() {
+                        return userPdu.getSiteIds();
+                    }
+
+                    @Override
+                    public Long getCustomerJoinId() {
+                        return null;
+                    }
+
+                    @Override
+                    public String getCustomerNum() {
+                        return null;
+                    }
+
+                    @Override
+                    public String getLoginName() {
+                        return userPdu.getLoginName();
+                    }
+
+                    @Override
+                    public String getRealName() {
+                        return userPdu.getRealName();
+                    }
+
+                    @Override
+                    public boolean isAdmin() {
+                        return userPdu.getId()==1L;
+                    }
+
+                    @Override
+                    public boolean isSystemUser() {
+                        return false;
+                    }
+
+                    @Override
+                    public boolean isManager() {
+                        return false;
+                    }
+
+                    @Override
+                    public Integer getUserType() {
+                        return null;
+                    }
+
+                    @Override
+                    public String getToken() {
+                        return null;
+                    }
+
+                    @Override
+                    public Long getLoginTime() {
+                        return null;
+                    }
+
+                    @Override
+                    public Long getExpireTime() {
+                        return null;
+                    }
+
+                    @Override
+                    public void setExpireTime(Long expireTime) {
+
+                    }
+
+                    @Override
+                    public String getMenuUrl() {
+                        return null;
+                    }
+                };*/
+                context.setUser(entity);
                 new Thread(new SyncTreeSiteThread(siteService, context)).start();
             }
         });

base-manager/src/main/java/com/mortals/xhx/module/business/service/impl/BusinessServiceImpl.java

@@ -6,6 +6,8 @@ import com.mortals.framework.model.Result;
 import com.mortals.framework.service.impl.AbstractCRUDCacheServiceImpl;
 import com.mortals.xhx.common.code.IsBusinessEnum;
 import com.mortals.xhx.common.utils.BeanUtil;
+import com.mortals.xhx.module.business.model.*;
+import com.mortals.xhx.module.business.service.BusinessMatterService;
 import com.mortals.xhx.module.site.model.SiteBusinessEntity;
 import com.mortals.xhx.module.site.model.SiteBusinessQuery;
 import com.mortals.xhx.module.site.model.SiteEntity;
@@ -19,10 +21,7 @@ import com.mortals.framework.model.Context;
 import com.mortals.xhx.common.code.SatusEnum;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.xhx.module.business.dao.BusinessDao;
-import com.mortals.xhx.module.business.model.BusinessEntity;
-import com.mortals.xhx.module.business.model.BusinessQuery;
 import com.mortals.xhx.module.business.service.BusinessService;
-import com.mortals.xhx.module.business.model.BusinessTreeSelect;
 import org.springframework.util.ObjectUtils;
 
 import java.util.*;
@@ -81,6 +80,15 @@ public class BusinessServiceImpl extends AbstractCRUDCacheServiceImpl<BusinessDa
                 }).collect(Collectors.toList());
         siteBusinessService.update(collect, context);
 
+        //更新事项业务表中字段
+        List<SiteBusinessEntity> siteBusinessEntities = siteBusinessService.find(new SiteBusinessQuery().businessId(entity.getId()))
+                .stream()
+                .filter(item -> !item.getBusinessName().equals(entity.getName()))
+                .peek(item -> item.setBusinessName(entity.getName()))
+                .collect(Collectors.toList());
+        if(!ObjectUtils.isEmpty(siteBusinessEntities)){
+            siteBusinessService.update(siteBusinessEntities,context);
+        }
         super.updateAfter(entity, context);
     }
 

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

@@ -5,7 +5,10 @@ import com.mortals.framework.model.Result;
 import com.mortals.framework.service.impl.AbstractCRUDCacheServiceImpl;
 import com.mortals.xhx.common.code.IsBusinessEnum;
 import com.mortals.xhx.module.business.model.BusinessEntity;
+import com.mortals.xhx.module.business.model.BusinessMatterEntity;
+import com.mortals.xhx.module.business.model.BusinessMatterQuery;
 import com.mortals.xhx.module.business.model.BusinessQuery;
+import com.mortals.xhx.module.business.service.BusinessMatterService;
 import com.mortals.xhx.module.business.service.BusinessService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,6 +40,9 @@ public class SiteBusinessServiceImpl extends AbstractCRUDCacheServiceImpl<SiteBu
     @Autowired
     private BusinessService businessService;
 
+    @Autowired
+    private BusinessMatterService businessMatterService;
+
     @Override
     protected void findAfter(SiteBusinessEntity params, PageInfo pageInfo, Context context, List<SiteBusinessEntity> list) throws AppException {
         list.stream().peek(item -> {
@@ -86,6 +92,18 @@ public class SiteBusinessServiceImpl extends AbstractCRUDCacheServiceImpl<SiteBu
     @Override
     protected void updateAfter(SiteBusinessEntity entity, Context context) throws AppException {
 
+        //更新事项业务表中字段
+        List<BusinessMatterEntity> businessMatterEntities = businessMatterService.find(new BusinessMatterQuery().siteBusinessId(entity.getId()))
+                .stream()
+                .filter(item -> !item.getSiteBusinessName().equals(entity.getBusinessName()))
+                .peek(item -> item.setSiteBusinessName(entity.getBusinessName()))
+                .collect(Collectors.toList());
+        if(!ObjectUtils.isEmpty(businessMatterEntities)){
+            businessMatterService.update(businessMatterEntities,context);
+        }
+
+
+
         super.updateAfter(entity, context);
     }
 

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

@@ -3,6 +3,7 @@ package com.mortals.xhx.module.site.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.URLUtil;
+import com.alibaba.fastjson.JSON;
 import com.mortals.framework.ap.GlobalSysInfo;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
@@ -83,13 +84,19 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
         Map<String, AreaEntity> areaMap = new HashMap<>();
         SiteQuery siteQuery = new SiteQuery();
         Set<String> siteSet = Arrays.stream(context.getUser().getSiteIds().split(",")).filter(f -> !f.equals("")).collect(Collectors.toSet());
+
+       log.info("initSiteIds==>{}", JSON.toJSONString(siteSet));
+
         if (!ObjectUtils.isEmpty(siteSet)) {
             List<Long> siteIdList = siteSet.stream().map(Long::parseLong).collect(Collectors.toList());
             if (!ObjectUtils.isEmpty(siteIdList)) {
                 siteQuery.idList(siteIdList);
             }
         }
+        //查詢指定的站點ids
+        log.info("siteQuery==>{}", JSON.toJSONString(siteQuery));
         List<SiteEntity> siteList = this.find(siteQuery);
+        //turn to sitemap
         Map<String, SiteEntity> siteMap = siteList.parallelStream().collect(Collectors.toMap(x -> x.getSiteCode(), y -> y, (o, n) -> n));
         //遍历过滤站点树
         for (SiteEntity siteEntity : siteList) {
@@ -103,6 +110,7 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
                 recursionFn(areaMap, areaEntity);
             }
         }
+        log.info("rebuildAreaMap==>{}", JSON.toJSONString(areaMap));
         //areaMap 为当前站点相关区域树结构 已经剔除不必要的分支结构
         return buildSiteTreeSelect(areaMap, siteMap);
     }

base-manager/src/main/java/com/mortals/xhx/module/skin/model/vo/SkinFieldVo.java

@@ -14,4 +14,9 @@ import java.util.List;
 @Data
 public class SkinFieldVo extends BaseEntityLong {
 
+    /** 开始 皮肤id */
+    private Long skinIdStart;
+
+    /** 结束 皮肤id */
+    private Long skinIdEnd;
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/skin/service/impl/SkinTemplateServiceImpl.java

@@ -55,12 +55,15 @@ public class SkinTemplateServiceImpl extends AbstractCRUDServiceImpl<SkinTemplat
     }
 
     private void saveSkinFields(SkinTemplateEntity entity, Context context) {
-        Long[] ids = skinFieldService.find(new SkinFieldQuery().skinId(entity.getId())).stream().map(item -> item.getId()).toArray(Long[]::new);
+
+        //查找模板id,与皮肤肯定
+        Long[] ids = skinFieldService.find(new SkinFieldQuery().skinId(0L).templateId(entity.getId())).stream().map(item -> item.getId()).toArray(Long[]::new);
         if (!ObjectUtils.isEmpty(ids)) {
             skinFieldService.remove(ids, context);
         }
         if (!ObjectUtils.isEmpty(entity.getSkinFieldList())) {
             entity.getSkinFieldList().stream().forEach(item->{
+                item.setSkinId(0L);
                 item.setTemplateId(entity.getId());
             });
             skinFieldService.save(entity.getSkinFieldList(), context);