用户完成

sys-api-feign/src/main/java/com/xy/feign/UserInfoFeign.java

@@ -0,0 +1,10 @@
+package com.xy.feign;
+
+import com.xy.FeignInterceptor;
+import com.xy.consts.ServiceConsts;
+import com.xy.service.UserInfoService;
+import org.springframework.cloud.openfeign.FeignClient;
+
+@FeignClient(value = ServiceConsts.SERVICE_NAME, configuration = FeignInterceptor.class)
+public interface UserInfoFeign extends UserInfoService {
+}

sys-api-feign/src/main/java/com/xy/impl/SysRegionServiceImpl.java

@@ -1,26 +0,0 @@
-package com.xy.impl;
-
-import com.xy.dto.SysRegionDto;
-import com.xy.feign.SysRegionFeign;
-import com.xy.utils.R;
-import lombok.AllArgsConstructor;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-@AllArgsConstructor
-public class SysRegionServiceImpl implements SysRegionFeign {
-
-    private SysRegionFeign sysRegionFeign;
-
-    @Override
-    public R<SysRegionDto.Vo> object(SysRegionDto.Vo vo) {
-        return sysRegionFeign.object(vo);
-    }
-
-    @Override
-    public R<List<SysRegionDto.Vo>> list(SysRegionDto.SelectList selectList) {
-        return sysRegionFeign.list(selectList);
-    }
-}

sys-api-service/src/main/java/com/xy/service/UserInfoServiceImpl.java

@@ -16,7 +16,6 @@ import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
@@ -43,9 +42,9 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
 
     private SysWorkUserService sysWorkUserService;
 
-    @PostMapping("obj")
+    @Override
     @ApiOperation("对象查询")
-    public R<UserInfoDto.Vo> obj(@RequestBody UserInfoDto.Vo vo) {
+    public R<UserInfoDto.Vo> obj(UserInfoDto.Vo vo) {
         LambdaQueryWrapper<UserInfo> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(vo, UserInfo.class)
                 .like(UserInfo::getSysIds, vo.getSysIds())
                 .build();
@@ -58,7 +57,7 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
 
     @PostMapping("page")
     @ApiOperation("分页查询")
-    private R<PageBean<UserInfoDto.Vo>> page(@RequestBody UserInfoDto.Page page) {
+    public R<PageBean<UserInfoDto.Vo>> page(@RequestBody UserInfoDto.Page page) {
         PageBean pageBean = page.getPage();
         LambdaQueryWrapper<UserInfo> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(page, UserInfo.class)
                 .like(UserInfo::getTel, page.getTel())
@@ -73,10 +72,10 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
         return R.ok(toPageBean(UserInfoDto.Vo.class, iPage));
     }
 
-    @PostMapping("save")
+    @Override
     @ApiOperation("添加")
     @Lock(value = "save.tel", prefix = "user_save_")
-    public R save(@RequestBody @Validated UserInfoDto.Save save) {
+    public R<UserInfoDto.Vo> save(UserInfoDto.Save save) {
         //校验
         UserInfo userInfo = getOne(new LambdaQueryWrapper<UserInfo>()
                 .eq(UserInfo::getTel, save.getTel())
@@ -88,7 +87,7 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
                 .eq(UserInfo::getAuthorizeUserId, save.getAuthorizeUserId())
         );
         if (userInfo != null) {
-            return R.ok(userInfo);
+            return R.fail(R.Enum.USER_EXIST.getCode(), R.Enum.USER_EXIST.getMsg(), copy(UserInfoDto.Vo.class, userInfo));
         }
         //添加权限用户
         AddDto addDto = copy(AddDto.class, save)
@@ -105,13 +104,13 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
                 .setAuthorizeUserId(authorizeUserId)
                 .createUserTime(AuthorizeUtils.getLoginId(Long.class));
         save(saveInfo);
-        return R.ok();
+        return R.ok(copy(UserInfoDto.Vo.class, saveInfo));
     }
 
-    @PostMapping("update")
+    @Override
     @ApiOperation("修改")
     @Lock(value = "update.userId", prefix = "user_update_")
-    public R update(@RequestBody @Validated UserInfoDto.Update update) {
+    public R update(UserInfoDto.Update update) {
         UserInfo byId = getById(update.getUserId());
         if (!StringUtils.isEmpty(update.getTel())) {
             if (!byId.getTel().equals(update.getTel())) {

sys-api/src/main/java/com/xy/service/UserInfoService.java

@@ -1,6 +1,11 @@
 package com.xy.service;
 
 import com.xy.annotate.RestMappingController;
+import com.xy.dto.UserInfoDto;
+import com.xy.utils.R;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * <p>
@@ -13,4 +18,30 @@ import com.xy.annotate.RestMappingController;
 @RestMappingController("/user-info")
 public interface UserInfoService {
 
+    /**
+     * 对象查询
+     *
+     * @param vo
+     * @return
+     */
+    @PostMapping("obj")
+    R<UserInfoDto.Vo> obj(@RequestBody UserInfoDto.Vo vo);
+
+    /**
+     * 添加
+     *
+     * @param save
+     * @return
+     */
+    @PostMapping("save")
+    R<UserInfoDto.Vo> save(@RequestBody @Validated UserInfoDto.Save save);
+
+    /**
+     * 修改
+     *
+     * @param update
+     * @return
+     */
+    @PostMapping("update")
+    R update(@RequestBody @Validated UserInfoDto.Update update);
 }