feat: app接口添加排序，添加查询所有用户接口

doc/开发测试文档/开发环境建设/开发环境建设.md

@@ -62,6 +62,7 @@ CREATE TABLE sqmdb_rpt.acl_function (
 	"name" varchar NOT NULL, -- 功能名称
 	url varchar NOT NULL, -- 功能链接
 	client int4 NOT NULL, -- 展示的客户端
+	"system" varchar NOT NULL,
 	CONSTRAINT acl_app_function_pk PRIMARY KEY (id)
 );
 COMMENT ON TABLE sqmdb_rpt.acl_function IS '功能';
@@ -72,23 +73,23 @@ COMMENT ON COLUMN sqmdb_rpt.acl_function.id IS '主键';
 COMMENT ON COLUMN sqmdb_rpt.acl_function."name" IS '功能名称';
 COMMENT ON COLUMN sqmdb_rpt.acl_function.url IS '功能链接';
 COMMENT ON COLUMN sqmdb_rpt.acl_function.client IS '展示的客户端';
--- sqmdb_rpt.acl__user_function definition
+-- sqmdb_rpt.acl_user_function definition
 
 -- Drop table
 
--- DROP TABLE sqmdb_rpt.acl__user_function;
+-- DROP TABLE sqmdb_rpt.acl_user_function;
 
-CREATE TABLE sqmdb_rpt.acl__user_function (
+CREATE TABLE sqmdb_rpt.acl_user_function (
 	user_id int4 NOT NULL, -- 用户id
 	function_id int4 NOT NULL, -- 功能id
 	CONSTRAINT acl_app_user_function_pk PRIMARY KEY (user_id, function_id)
 );
-COMMENT ON TABLE sqmdb_rpt.acl__user_function IS '用户功能关联';
+COMMENT ON TABLE sqmdb_rpt.acl_user_function IS '用户功能关联';
 
 -- Column comments
 
-COMMENT ON COLUMN sqmdb_rpt.acl__user_function.user_id IS '用户id';
-COMMENT ON COLUMN sqmdb_rpt.acl__user_function.function_id IS '功能id';
+COMMENT ON COLUMN sqmdb_rpt.acl_user_function.user_id IS '用户id';
+COMMENT ON COLUMN sqmdb_rpt.acl_user_function.function_id IS '功能id';
     
 -- sqmdb_rpt.acl_verification_log definition
 

src/main/java/com/nokia/controller/UserController.java

@@ -3,7 +3,7 @@ package com.nokia.controller;
 import com.nokia.common.R;
 import com.nokia.pojo.User;
 import com.nokia.service.UserService;
-
+import com.nokia.vo.UserVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -39,4 +39,11 @@ public class UserController {
             return R.error().message(msg);
         }
     }
+
+    @PostMapping("baselist")
+    @ResponseBody
+    public R baseList() {
+        List<UserVo> list = userServiceImpl.baseList();
+        return R.ok().data(list);
+    }
 }

src/main/java/com/nokia/dao/UserDao.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.nokia.pojo.Role;
 import com.nokia.pojo.User;
 import com.nokia.vo.AppVerificationVO;
+import com.nokia.vo.UserVo;
 import com.nokia.vo.flow.FlowRoleVo;
 import com.nokia.vo.flow.FlowUserVo;
 
@@ -107,6 +108,9 @@ public interface UserDao extends BaseMapper<User> {
                         + " VALUES(#{loginName}, #{userName}, #{phone}, #{email}, #{cityId}, #{areaId}, #{provinceId}, #{org})")
         int insert(User user);
 
-        @Select("select af.id, af.name, af.url from sqmdb_rpt.acl_function af inner join sqmdb_rpt.acl_user_function auf on af.id = auf.function_id where auf.user_id = #{userId} and (af.client = 0 or af.client = #{client})")
+        @Select("select af.id, af.name, af.url from sqmdb_rpt.acl_function af inner join sqmdb_rpt.acl_user_function auf on af.id = auf.function_id where auf.user_id = #{userId} and (af.client = 0 or af.client = #{client}) order by af.id")
         List<AppVerificationVO> listUserFunctions(Integer userId, Integer client);
+
+        @Select("select * from sqmdb_rpt.acl_user order by user_id")
+        List<UserVo> baseList();
 }

src/main/java/com/nokia/dao/VerificationLogDao.java

@@ -6,5 +6,4 @@ import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface VerificationLogDao extends BaseMapper<VerificationLog> {
-    int insert(VerificationLog verificationLog);
 }

src/main/java/com/nokia/service/UserService.java

@@ -1,5 +1,6 @@
 package com.nokia.service;
 
+import com.nokia.vo.UserVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -13,6 +14,8 @@ import com.nokia.pojo.Role;
 import com.nokia.pojo.User;
 import com.nokia.pojo.UserRoleCity;
 
+import java.util.List;
+
 @Service
 public class UserService extends ServiceImpl<UserDao, User> {
 
@@ -70,4 +73,8 @@ public class UserService extends ServiceImpl<UserDao, User> {
         return userDao.getByLoginName(loginName);
     }
 
+    public List<UserVo> baseList() {
+        return userDao.baseList();
+    }
+
 }

src/main/java/com/nokia/vo/UserVo.java

@@ -4,7 +4,13 @@ import lombok.Data;
 
 @Data
 public class UserVo {
-    private  String  account;
     private Integer userId;
+    private String loginName;
     private String userName;
+    private String phone;
+    private String email;
+    private String org;
+    private Integer provinceId;
+    private Integer cityId;
+    private Integer areaId;
 }