添加用户查询列表

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

@@ -10,6 +10,7 @@ import com.mortals.xhx.base.system.user.service.UserService;
 import com.mortals.xhx.common.utils.SyncTreeSiteThread;
 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.factory.annotation.Autowired;
@@ -26,11 +27,9 @@ import java.util.List;
  * 应用场景：
  * 1、应用任务，应用启动后定时或间隔执行的任务
  * 2、Socket服务端
- *
- * @author GM
- * @date 2020年7月15日
  */
 @Component
+@Slf4j
 public class DemoStartedService implements IApplicationStartedService {
 
     private static Log logger = LogFactory.getLog(DemoStartedService.class);

common-lib/src/main/java/com/mortals/xhx/feign/user/IApiUserFeign.java

-package com.mortals.xhx.feign.user;
-
-import com.alibaba.fastjson.JSON;
-import com.mortals.xhx.common.code.ApiRespCodeEnum;
-import com.mortals.xhx.feign.IFeign;
-import com.mortals.xhx.feign.req.BaseUserQuery;
-import com.mortals.xhx.feign.req.BaseUserReq;
-import com.mortals.xhx.feign.rsp.ApiResp;
-import com.mortals.xhx.feign.rsp.UserRsp;
-import feign.hystrix.FallbackFactory;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * 用户服务
- *
- * @author: zxfei
- * @date: 2022/5/30 10:40
- */
-@FeignClient(name = "portal-manager", path = "/zwfw", fallback = UserFeignFallbackFactory.class)
-public interface IApiUserFeign extends IFeign {
-
-    /**
-     * 查询用户列表
-     *
-     * @param req
-     * @return
-     */
-    @PostMapping("/api/user/findAllUser")
-    ApiResp<UserRsp> findAllUser(@RequestBody BaseUserReq<BaseUserQuery> req);
-
-}
-
-
-@Slf4j
-@Component
-class UserFeignFallbackFactory implements FallbackFactory<IApiUserFeign> {
-    @Override
-    public IApiUserFeign create(Throwable t) {
-        return new IApiUserFeign() {
-            @Override
-            public ApiResp<UserRsp> findAllUser(BaseUserReq<BaseUserQuery> req) {
-                ApiResp<UserRsp> failResp = new ApiResp<>();
-                failResp.setCode(ApiRespCodeEnum.FAILED.getValue());
-                failResp.setMsg("暂时无法获取站点列表，请稍后再试!");
-                return failResp;
-            }
-        };
-    }
-}
\ No newline at end of file

common-lib/src/main/java/com/mortals/xhx/feign/user/IUserFeign.java

+package com.mortals.xhx.feign.user;
+
+import com.mortals.xhx.common.code.ApiRespCodeEnum;
+import com.mortals.xhx.common.pdu.user.UserPdu;
+import com.alibaba.fastjson.JSON;
+import com.mortals.framework.common.Rest;
+import com.mortals.xhx.feign.IFeign;
+import com.mortals.xhx.feign.req.BaseUserQuery;
+import com.mortals.xhx.feign.req.BaseUserReq;
+import com.mortals.xhx.feign.rsp.ApiResp;
+import com.mortals.xhx.feign.rsp.UserRsp;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 用户信息业务 Feign接口
+ * @author zxfei
+ * @date 2022-07-06
+ */
+@FeignClient(name = "portal-manager", path = "/zwfw", fallback = UserFeignFallbackFactory.class)
+public interface IUserFeign extends IFeign {
+
+
+    /**
+     * 查看用户信息业务列表
+     *
+     * @param userPdu
+     * @return
+     */
+    @PostMapping(value = "/user/list")
+    String list(@RequestBody UserPdu userPdu);
+
+
+    /**
+     * 查看用户信息业务
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping(value = "/user/info")
+    String info(@RequestParam(value = "id") Long id);
+
+    /**
+     * 删除用户信息业务
+     *
+     * @param ids
+     * @return
+     */
+    @GetMapping(value = "/user/delete")
+    String delete(Long[] ids,@RequestHeader("Authorization") String authorization);
+
+
+    /**
+     * 用户信息业务保存更新
+     *
+     * @param userPdu
+     * @return
+     */
+    @PostMapping(value = "/user/save")
+    String save(@RequestBody UserPdu userPdu,@RequestHeader("Authorization") String authorization);
+
+
+    /**
+     * 查询用户列表
+     *
+     * @param userPdu
+     * @return
+     */
+    @PostMapping("/api/user/findAllUser")
+    String findAllUser(@RequestBody UserPdu userPdu);
+
+}
+
+
+@Slf4j
+@Component
+class UserFeignFallbackFactory implements FallbackFactory<IUserFeign> {
+    @Override
+    public IUserFeign create(Throwable t) {
+        return new IUserFeign() {
+            @Override
+            public String list(UserPdu userPdu) {
+               return JSON.toJSONString(Rest.fail("暂时无法获取用户信息业务列表，请稍后再试!"));
+            }
+
+            @Override
+            public String info(Long id) {
+               return JSON.toJSONString(Rest.fail("暂时无法获取用户信息业务详细，请稍后再试!"));
+            }
+
+            @Override
+            public String delete(Long[] ids, String authorization) {
+                return JSON.toJSONString(Rest.fail("暂时无法删除用户信息业务，请稍后再试!"));
+            }
+
+            @Override
+            public String save(UserPdu userPdu, String authorization) {
+                return JSON.toJSONString(Rest.fail("暂时无法保存用户信息业务，请稍后再试!"));
+            }
+
+            @Override
+            public String findAllUser(UserPdu userPdu) {
+                return JSON.toJSONString(Rest.fail("暂时无法获取用户信息业务列表，请稍后再试!"));
+            }
+
+
+        };
+    }
+}
+
+
+
+
+
+
+
+

portal-manager/src/main/java/com/mortals/xhx/busiz/web/UserApiController.java

 package com.mortals.xhx.busiz.web;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.mortals.framework.common.Rest;
 import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.model.Result;
 import com.mortals.xhx.busiz.rsp.ApiResp;
 import com.mortals.xhx.common.code.ApiRespCodeEnum;
 import com.mortals.xhx.common.code.YesNoEnum;
@@ -10,6 +13,7 @@ import com.mortals.xhx.common.utils.BeanUtil;
 import com.mortals.xhx.feign.req.BaseUserQuery;
 import com.mortals.xhx.feign.req.BaseUserReq;
 import com.mortals.xhx.feign.rsp.UserRsp;
+import com.mortals.xhx.module.user.model.UserEntity;
 import com.mortals.xhx.module.user.model.UserQuery;
 import com.mortals.xhx.module.user.service.UserService;
 import lombok.extern.apachecommons.CommonsLog;
@@ -21,9 +25,13 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
+import static com.mortals.framework.ap.SysConstains.PAGEINFO_KEY;
+
 /**
  * 用户对外服务接口
  *
@@ -39,42 +47,32 @@ public class UserApiController {
 
     /**
      * 用户列表
-     * @param req
+     * @param userPdu
      * @return
      */
     @PostMapping("/findAllUser")
-    public ApiResp<UserRsp> findAllUser(@RequestBody BaseUserReq<BaseUserQuery> req) {
-        ApiResp<UserRsp> rsp = new ApiResp<>();
-        rsp.setMsg(ApiRespCodeEnum.SUCCESS.getLabel());
-        rsp.setCode(ApiRespCodeEnum.SUCCESS.getValue());
+    public String findAllUser(@RequestBody UserEntity userPdu) {
+        Rest<Object> rest = Rest.ok("获取列表成功");
         PageInfo page = new PageInfo();
         page.setPrePageResult(-1);
-        UserRsp userRsp = new UserRsp();
         try {
-            if (!ObjectUtils.isEmpty(req.getPage())) {
-                page.setPrePageResult(req.getPage().getPer() == 0 ? -1 : req.getPage().getPer());
-                page.setCurrPage(req.getPage().getSize() == 0 ? 1 : req.getPage().getSize());
+            if (!ObjectUtils.isEmpty(userPdu.getPage())) {
+                page.setPrePageResult(userPdu.getSize() );
+                page.setCurrPage(userPdu.getPage());
             }
+            Result<UserEntity> result = userService.find(userPdu, page, null);
+            Map<String, Object> model = new HashMap<>();
+            model.put("data", result.getList());
+            model.put(PAGEINFO_KEY, result.getPageInfo());
+            rest.setData(model);
 
-            UserQuery userQuery = new UserQuery();
-            BeanUtils.copyProperties(req.getQuery(), userQuery, BeanUtil.getNullPropertyNames(req.getQuery()));
-            List<UserPdu> collect = userService.find(userQuery, page, null).getList().stream().map(item -> {
-                UserPdu userPdu = new UserPdu();
-                BeanUtils.copyProperties(item, userPdu, BeanUtil.getNullPropertyNames(item));
-                return userPdu;
-
-            }).collect(Collectors.toList());
-            userRsp.setList(collect);
-            userRsp.setPage(req.getPage());
         } catch (Exception e) {
             log.error("获取用户列表异常", e);
-            rsp.setCode(YesNoEnum.NO.getValue());
-            rsp.setMsg(e.getMessage());
-            return rsp;
+            rest.setCode(YesNoEnum.NO.getValue());
+            rest.setMsg(e.getMessage());
         }
-        rsp.setData(userRsp);
-        log.info("响应【用户列表】【响应体】-->  " + JSONObject.toJSONString(rsp));
-        return rsp;
+        log.info("响应【用户列表】【响应体】-->  " + JSONObject.toJSONString(rest));
+        return JSON.toJSONString(rest);
     }
 
 }

portal-manager/src/main/java/com/mortals/xhx/module/user/web/UserController.java

@@ -96,6 +96,7 @@ public class UserController extends BaseCRUDJsonBodyMappingController<UserServic
     }
 
     @Override
+    @UnAuth
     public Rest<Object> list(UserEntity query) {
         Map<String, Object> model = new HashMap();
         Rest<Object> ret = new Rest<>();