修改用户数据

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

@@ -23,6 +23,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 同步用户
@@ -46,8 +47,19 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
         userPdu.setPage(1);
         userPdu.setSize(-1);
         Rest<RespData<List<UserPdu>>> list = userFeign.list(userPdu);
-        //更新本地用户信息，并且更新用户树
-        list.getData().getData().forEach(user -> {
+
+        List<UserPdu> firstList = list.getData().getData();
+
+        List<UserEntity> secondList = userService.find(new UserQuery());
+        //交叉对比后，多的新增 少的删除
+        List<UserEntity> diffList = secondList.parallelStream()
+                .filter(item -> !firstList.parallelStream().map(e -> e.getId()).collect(Collectors.toList()).contains(item.getId()))
+                .collect(Collectors.toList());
+
+        log.info("diffList:{}",JSON.toJSONString(diffList));
+
+        //更新本地用户信息，并且更新用户站点树
+        firstList.forEach(user -> {
             //查询用户是否存在，
             //UserEntity userEntity = userService.get(user.getId());
 

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

@@ -60,6 +60,8 @@ public interface SiteService extends ICRUDCacheService<SiteEntity, Long> {
 
     void setSiteTree(List<SiteTreeSelect> list, Context context);
 
+    void removeSiteTree(List<SiteTreeSelect> list, Context context);
+
     List<SiteEntity> getListAllInfoByQuery(SiteQuery query,Context context) throws AppException;
 
 

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

@@ -255,7 +255,7 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
             return true;
         } else {
             AreaEntity areaTemp = areaService.getExtCache(areaCode);
-            if (!ObjectUtils.isEmpty(areaTemp)&&!ObjectUtils.isEmpty(areaTemp.getPid())) {
+            if (!ObjectUtils.isEmpty(areaTemp) && !ObjectUtils.isEmpty(areaTemp.getPid())) {
                 AreaEntity areaEntity = areaService.selectOne(new AreaQuery().iid(areaTemp.getPid()));
                 if (!ObjectUtils.isEmpty(areaEntity)) {
                     return getSite(rootAreaCode, areaEntity.getAreaCode(), siteList, siteEntity);
@@ -270,15 +270,20 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
         siteTreeMap.put(context.getUser().getId(), list);
     }
 
+    @Override
+    public void removeSiteTree(List<SiteTreeSelect> list, Context context) {
+        siteTreeMap.remove(context.getUser().getId());
+    }
+
     @Override
     public List<SiteEntity> getListAllInfoByQuery(SiteQuery query, Context context) throws AppException {
-        List<SiteEntity> list = this.find(query,context);
-        if(CollectionUtils.isNotEmpty(list)){
-            list.stream().forEach(item->{
+        List<SiteEntity> list = this.find(query, context);
+        if (CollectionUtils.isNotEmpty(list)) {
+            list.stream().forEach(item -> {
                 ModelQuery modelQuery = new ModelQuery();
                 List<String> modelIds = StringUtils.converStr2List(item.getModelIds());
-                List<Long> ids = modelIds.stream().map(s -> DataUtil.converStr2Long(s.trim(),0)).collect(Collectors.toList());
-                if(ids.isEmpty()){
+                List<Long> ids = modelIds.stream().map(s -> DataUtil.converStr2Long(s.trim(), 0)).collect(Collectors.toList());
+                if (ids.isEmpty()) {
                     ids.add(0l);
                 }
                 modelQuery.setIdList(ids);

base-manager/src/main/resources/sqlmap/base/system/user.xml

@@ -105,11 +105,11 @@
         </trim>
     </sql>
     <!-- 新增 -->
-        <insert id="insert" parameterType="UserEntity" useGeneratedKeys="true" keyProperty="id">
+        <insert id="insert" parameterType="UserEntity"  keyProperty="id">
             insert into mortals_xhx_user
-            (loginName,loginPwd,loginPwd1,loginPwd2,loginPwd3,loginLimitAddress,realName,mobile,phone,email,qq,userType,siteId,status,customerId,createTime,createUserId,createUserName,lastLoginTime,lastLoginAddress,lastModPwdTime,lastModPwdAddr)
+            (id,loginName,loginPwd,loginPwd1,loginPwd2,loginPwd3,loginLimitAddress,realName,mobile,phone,email,qq,userType,siteId,status,customerId,createTime,createUserId,createUserName,lastLoginTime,lastLoginAddress,lastModPwdTime,lastModPwdAddr)
             VALUES
-            (#{loginName},#{loginPwd},#{loginPwd1},#{loginPwd2},#{loginPwd3},#{loginLimitAddress},#{realName},#{mobile},#{phone},#{email},#{qq},#{userType},#{siteId},#{status},#{customerId},#{createTime},#{createUserId},#{createUserName},#{lastLoginTime},#{lastLoginAddress},#{lastModPwdTime},#{lastModPwdAddr})
+            (#{id},#{loginName},#{loginPwd},#{loginPwd1},#{loginPwd2},#{loginPwd3},#{loginLimitAddress},#{realName},#{mobile},#{phone},#{email},#{qq},#{userType},#{siteId},#{status},#{customerId},#{createTime},#{createUserId},#{createUserName},#{lastLoginTime},#{lastLoginAddress},#{lastModPwdTime},#{lastModPwdAddr})
         </insert>
 
         <!-- 批量新增 -->

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

 
 ###系统基础皮肤列表
 POST {{baseUrl}}/skin/base/list
-Authorization: {{authToken}}
 Content-Type: application/json
 
 {
     "page":1,
-    "size":10,
-    "id": 7
+    "size":10
 }
 
 

base-manager/src/test/java/com/mortals/httpclient/sms/SmsSetController.http

@@ -2,13 +2,9 @@
 ###短信设置列表
 POST {{baseUrl}}/sms/set/list
 Content-Type: application/json
-Authorization: Bearer  {{authToken}}
 
 {
-    "sign":"b0t82r" ,
-    "username":"xshgou" ,
-    "messageoff":7796 ,
-    "siteId":5291 ,
+    "siteId":5291,
     "page":1,
     "size":10
 }