ソースを参照

update:修改人员同步

liujunchi 3 年 前
コミット
bcdd41587d

+ 4 - 0
cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/client/SysUserFeignService.java

@@ -59,4 +59,8 @@ public interface SysUserFeignService {
 	@ApiOperation(value = "退出登录")
 	public HttpResponseResult<String> remoteExit();
 
+
+	@PostMapping(value = "user/list")
+	HttpResponseResult<List<SysUser>> page(@RequestBody SysUserQueryInfo queryInfo);
+
 }

+ 6 - 0
cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/client/fallback/SysUserFeignServiceFallback.java

@@ -76,4 +76,10 @@ public class SysUserFeignServiceFallback implements SysUserFeignService {
 		return HttpResponseResult.failed("请求失败");
 	}
 
+
+	@Override
+	public HttpResponseResult<List<SysUser>> page(SysUserQueryInfo queryInfo) {
+		return HttpResponseResult.failed("请求失败");
+	}
+
 }

+ 5 - 1
cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/dal/dao/SysUserDao.java

@@ -3,6 +3,7 @@ package com.yonge.cooleshow.auth.dal.dao;
 import java.util.List;
 
 import com.yonge.cooleshow.auth.api.dto.RealnameAuthReq;
+import com.yonge.cooleshow.auth.api.dto.SysUserQueryInfo;
 import com.yonge.cooleshow.auth.api.dto.UserSetReq;
 import com.yonge.cooleshow.auth.api.vo.UserSetVo;
 import com.yonge.toolset.utils.idcard.IdcardInfoExtractor;
@@ -136,11 +137,14 @@ public interface SysUserDao extends BaseDAO<Long, SysUser> {
      * @updateTime 2022/3/22 11:06
      */
     void updatetSetDetail(@Param("param") UserSetReq setReq, @Param("id") Long id);
+
     /***
      * 创建用户账户
      * @author liweifan
      * @param: id
      * @updateTime 2022/4/14 17:07
      */
-    void createUserAccount(@Param("userId")Long id);
+    void createUserAccount(@Param("userId") Long id);
+
+    List<SysUser> queryEmployeeList(SysUserQueryInfo queryInfo);
 }

+ 11 - 0
cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/SysUserService.java

@@ -2,6 +2,7 @@ package com.yonge.cooleshow.auth.service;
 
 import com.yonge.cooleshow.auth.api.dto.RealnameAuthReq;
 import com.yonge.cooleshow.auth.api.dto.SysUserInfo;
+import com.yonge.cooleshow.auth.api.dto.SysUserQueryInfo;
 import com.yonge.cooleshow.auth.api.dto.UserSetReq;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.auth.api.vo.UserSetVo;
@@ -9,6 +10,8 @@ import com.yonge.cooleshow.common.entity.ImUserModel;
 import com.yonge.cooleshow.common.service.BaseService;
 import com.yonge.toolset.utils.idcard.IdcardInfoExtractor;
 
+import java.util.List;
+
 public interface SysUserService extends BaseService<Long, SysUser> {
 
     /**
@@ -170,4 +173,12 @@ public interface SysUserService extends BaseService<Long, SysUser> {
      * @updateTime 2022/3/22 11:04
      */
     void submitSetDetail(UserSetReq setReq, Long id);
+
+    /**
+     *  商城同步管理用户
+     *
+     * @param queryInfo
+     * @return
+     */
+    List<SysUser> queryEmployeeList(SysUserQueryInfo queryInfo);
 }

+ 7 - 0
cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/impl/SysUserServiceImpl.java

@@ -4,6 +4,7 @@ import java.util.Date;
 import java.util.List;
 
 import com.yonge.cooleshow.auth.api.dto.RealnameAuthReq;
+import com.yonge.cooleshow.auth.api.dto.SysUserQueryInfo;
 import com.yonge.cooleshow.auth.api.dto.UserSetReq;
 import com.yonge.cooleshow.auth.api.vo.UserSetVo;
 import com.yonge.cooleshow.auth.service.SysConfigService;
@@ -203,4 +204,10 @@ public class SysUserServiceImpl extends BaseServiceImpl<Long, SysUser> implement
         sysUserDao.updatetSetDetail(setReq, id);
     }
 
+    @Override
+    public List<SysUser> queryEmployeeList(SysUserQueryInfo queryInfo) {
+
+        return sysUserDao.queryEmployeeList(queryInfo);
+    }
+
 }

+ 7 - 9
cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/web/controller/UserController.java

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.auth.web.controller;
 
+import com.alibaba.druid.sql.PagerUtils;
 import com.yonge.cooleshow.auth.api.dto.RealnameAuthReq;
 import com.yonge.cooleshow.auth.api.dto.UpdatePasswordDto;
 import com.yonge.cooleshow.auth.api.dto.UserSetReq;
@@ -77,15 +78,6 @@ public class UserController extends BaseController {
         return succeed(sysUserService.queryPage(queryInfo));
     }
 
-    @ApiOperation(value = "分页查询用户信息")
-    @ApiImplicitParams({@ApiImplicitParam(name = "userType", value = "用户类型", required = false, dataType = "String"),
-                        @ApiImplicitParam(name = "createStartDate", value = "开始注册时间", required = true, dataType = "String"),
-                        @ApiImplicitParam(name = "createEndDate", value = "结束注册时间", required = true, dataType = "String")})
-    @PostMapping(value = "/page")
-    @ResponseBody
-    public HttpResponseResult<PageInfo<SysUser>> page(@RequestBody SysUserQueryInfo queryInfo) {
-        return succeed(sysUserService.queryPage(queryInfo));
-    }
 
     @ApiOperation(value = "查询用户信息接口")
     @GetMapping("/query")
@@ -552,4 +544,10 @@ public class UserController extends BaseController {
         sysUserService.update(user);
         return HttpResponseResult.succeed(true);
     }
+
+    @ApiOperation(value = "查询平台用户信息")
+    @PostMapping(value = "/list")
+    public HttpResponseResult<List<SysUser>> page(@RequestBody SysUserQueryInfo queryInfo) {
+        return succeed(sysUserService.queryEmployeeList(queryInfo));
+    }
 }

+ 14 - 0
cooleshow-auth/auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -253,4 +253,18 @@
         </set>
         WHERE id_ = #{id}
     </update>
+
+    <select id="queryEmployeeList" resultMap="SysUser">
+        select  su.*
+        from employee e
+        left join sys_user su on su.id_ = e.user_id_
+        <where>
+            <if test="createStartDate != null and createStartDate != ''">
+                and #{createStartDate} &lt;= e.create_time_
+            </if>
+            <if test="createEndDate != null and createEndDate != ''">
+                and #{createEndDate} &gt; e.create_time_
+            </if>
+        </where>
+    </select>
 </mapper>

+ 1 - 0
cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/controller/UmsAdminController.java

@@ -68,6 +68,7 @@ public class UmsAdminController {
 
     @ApiOperation(value = "获取当前登录用户信息")
     @RequestMapping(value = "/info", method = RequestMethod.GET)
+    @ResponseBody
     public CommonResult getAdminInfo() {
 
         SysUser sysUser = sysUserFeignService.queryUserInfo();

+ 6 - 6
cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/impl/UmsAdminServiceImpl.java

@@ -202,6 +202,10 @@ public class UmsAdminServiceImpl implements UmsAdminService {
 
     @Override
     public boolean addRootAdmin(List<UmsAdmin> adminList) {
+
+        if (CollUtil.isEmpty(adminList)) {
+            return true;
+        }
         adminMapper.saveRootAdminList(adminList);
         return addAdminRootRole(adminList);
     }
@@ -212,15 +216,11 @@ public class UmsAdminServiceImpl implements UmsAdminService {
         SysUserQueryInfo sysUserQueryInfo = new SysUserQueryInfo();
         String now = LocalDateTimeUtil.format(LocalDateTime.now(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
         String syncTime = configMapper.getConfig(SysConfig.SYNC_TIME);
-        sysUserQueryInfo.setUserType("SYSTEM");
         sysUserQueryInfo.setCreateEndDate(now);
         sysUserQueryInfo.setCreateStartDate(syncTime);
-        sysUserQueryInfo.setPage(1);
-        sysUserQueryInfo.setRows(9999);
-        HttpResponseResult<PageInfo<SysUser>> result = sysUserFeignService.page(sysUserQueryInfo);
-
+        HttpResponseResult<List<SysUser>> result = sysUserFeignService.page(sysUserQueryInfo);
         if (result.getStatus()) {
-            List<SysUser> rows = result.getData().getRows();
+            List<SysUser> rows = result.getData();
             List<UmsAdmin> adminList = new ArrayList<>();
             for (SysUser row : rows) {
                 UmsAdmin admin = new UmsAdmin();