成员查询接口

pmapi/src/main/java/com/ningdatech/pmapi/ding/task/EmployeeBatchGetTask.java

@@ -66,7 +66,6 @@ public class EmployeeBatchGetTask {
                 }
 
 
-
             }
 
 //            zwddClient.pageOrganizationEmployeePositions(query);

pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/DingOrganizationController.java

@@ -1,6 +1,8 @@
 package com.ningdatech.pmapi.organization.controller;
 
 
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
@@ -17,4 +19,12 @@ import org.springframework.stereotype.Controller;
 @RequestMapping("/api/v1/organization")
 public class DingOrganizationController {
 
+    @ApiModelProperty("单位成员配置")
+    @PostMapping("/member/config")
+    public void organizationManage() {
+
+    }
+
+
+
 }

pmapi/src/main/java/com/ningdatech/pmapi/user/controller/UserInfoController.java

@@ -1,9 +1,21 @@
 package com.ningdatech.pmapi.user.controller;
 
 
+import com.ningdatech.basic.model.PageVo;
+import com.ningdatech.pmapi.user.manage.UserInfoManage;
+import com.ningdatech.pmapi.user.model.po.ReqUserDisablePO;
+import com.ningdatech.pmapi.user.model.po.ReqUserInfoListPO;
+import com.ningdatech.pmapi.user.model.vo.ResUserInfoListVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import javax.validation.Valid;
+
 /**
  * <p>
  * 用户信息表 前端控制器
@@ -13,7 +25,23 @@ import org.springframework.web.bind.annotation.RequestMapping;
  * @since 2023-01-04
  */
 @Controller
-@RequestMapping("/pmapi.user/user-info")
+@RequestMapping("/api/v1/user-info")
+@RequiredArgsConstructor
+@Api(value = "UserInfoController", tags = "用户管理")
 public class UserInfoController {
 
+    private final UserInfoManage userInfoManage;
+
+    @ApiOperation(value = "用户列表搜索", notes = "用户列表搜索")
+    @PostMapping("/list")
+    public PageVo<ResUserInfoListVO> userInfoList(@Valid @RequestBody ReqUserInfoListPO reqUserInfoListPO) {
+        return userInfoManage.list(reqUserInfoListPO);
+    }
+
+    @ApiOperation(value = "用户禁用", notes = "用户禁用")
+    @PostMapping("/disable")
+    public void disable(@Valid @RequestBody ReqUserDisablePO reqUserDisablePO){
+        userInfoManage.disable(reqUserDisablePO);
+    }
+
 }

pmapi/src/main/java/com/ningdatech/pmapi/user/manage/UserInfoManage.java

@@ -0,0 +1,29 @@
+package com.ningdatech.pmapi.user.manage;
+
+import com.ningdatech.basic.model.PageVo;
+import com.ningdatech.pmapi.user.mapper.UserInfoMapper;
+import com.ningdatech.pmapi.user.model.po.ReqUserDisablePO;
+import com.ningdatech.pmapi.user.model.po.ReqUserInfoListPO;
+import com.ningdatech.pmapi.user.model.vo.ResUserInfoListVO;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author liuxinxin
+ * @date 2023/2/13 上午9:09
+ */
+@Component
+@RequiredArgsConstructor
+public class UserInfoManage {
+    private final UserInfoMapper userInfoMapper;
+
+
+    public PageVo<ResUserInfoListVO> list(ReqUserInfoListPO reqUserInfoListPO) {
+
+        return null;
+    }
+
+    public void disable(ReqUserDisablePO reqUserDisablePO) {
+
+    }
+}

pmapi/src/main/java/com/ningdatech/pmapi/user/model/po/ReqUserDisablePO.java

@@ -0,0 +1,22 @@
+package com.ningdatech.pmapi.user.model.po;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @author liuxinxin
+ * @date 2023/2/13 上午9:31
+ */
+
+@Data
+@ApiModel("用户禁用PO")
+public class ReqUserDisablePO {
+
+    @NotBlank(message = "用户ID不能为空")
+    @ApiModelProperty("用户id")
+    private Long userId;
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/user/model/po/ReqUserInfoListPO.java

@@ -0,0 +1,37 @@
+package com.ningdatech.pmapi.user.model.po;
+
+import com.ningdatech.basic.model.PagePo;
+import com.ningdatech.pmapi.sys.model.entity.Role;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author liuxinxin
+ * @date 2023/2/13 上午9:10
+ */
+@Data
+@ApiModel("用户管理查询 请求入参")
+public class ReqUserInfoListPO extends PagePo {
+
+    @ApiModelProperty("姓名")
+    private String name;
+
+    @ApiModelProperty("手机号码")
+    private String phoneNo;
+
+    @ApiModelProperty("所在单位（主职）")
+    private String orgName;
+
+    @ApiModelProperty("所属区域")
+    private Long regionId;
+
+    @ApiModelProperty("用户角色")
+    private List<Role> userRoleList;
+
+    @ApiModelProperty("状态")
+    private String status;
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/user/model/vo/ResUserInfoListVO.java

@@ -0,0 +1,47 @@
+package com.ningdatech.pmapi.user.model.vo;
+
+import com.ningdatech.pmapi.sys.model.entity.Role;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * @author liuxinxin
+ * @date 2023/2/13 上午9:10
+ */
+@Data
+@ApiModel("用户管理查询 请求response")
+public class ResUserInfoListVO {
+
+    @ApiModelProperty("用户id")
+    private Long userId;
+
+    @ApiModelProperty("姓名")
+    private String name;
+
+    @ApiModelProperty("手机号码")
+    private String phoneNo;
+
+    @ApiModelProperty("所在单位（主职）")
+    private String orgName;
+
+    @ApiModelProperty("所在单位（主职）id")
+    private Long orgId;
+
+    @ApiModelProperty("所属区域")
+    private Long regionId;
+
+    @ApiModelProperty("用户角色")
+    private List<Role> userRoleList;
+
+    @ApiModelProperty("状态")
+    private String status;
+
+    @ApiModelProperty("更新时间")
+    private LocalDateTime updateTime;
+
+
+}