20220805

doc/部署文档/测试环境/测试环境部署文档.md

@@ -2,7 +2,10 @@
 
 bin 部署位置 192.168.50.3:/data1/acl/
 
+```sh
+#  放开端口访问
 sudo iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 12128 -j ACCEPT
+```
 
 ## 测试环境接口测试
 
@@ -21,34 +24,6 @@ Content-Type: application/json
 }
 ```
 
-20220805 v1.9版本
-
-```json
-HTTP/1.1 200 
-Content-Type: application/json
-Transfer-Encoding: chunked
-Date: Fri, 05 Aug 2022 08:27:22 GMT
-Connection: close
-
-{
-  "success": true,
-  "code": 1,
-  "message": "成功",
-  "data": {
-    "loginName": "test_hebei",
-    "userName": "测试用户_全省",
-    "province": "河北省",
-    "belongCity": "河北省",
-    "city": "河北省",
-    "roles": [
-      "黑点库管理",
-      "黑点库查询"
-    ]
-  }
-}
-
-```
-
 - 流程
 
 ```http
@@ -62,26 +37,6 @@ Content-Type: application/json
 }
 ```
 
-```json
-HTTP/1.1 200 
-Content-Type: application/json
-Transfer-Encoding: chunked
-Date: Fri, 05 Aug 2022 08:34:07 GMT
-Connection: close
-
-{
-  "success": true,
-  "code": 1,
-  "message": "成功",
-  "data": {
-    "account": "test_abc",
-    "userId": 4,
-    "userName": "测试用户_李四喜"
-  }
-}
-
-```
-
 - 大屏
 
 ```http
@@ -95,27 +50,6 @@ Content-Type: application/json
 }
 ```
 
-```json
-HTTP/1.1 200 
-Content-Type: application/json
-Transfer-Encoding: chunked
-Date: Fri, 05 Aug 2022 08:35:25 GMT
-Connection: close
-
-{
-  "success": true,
-  "code": 1,
-  "message": "成功",
-  "data": {
-    "userId": 4,
-    "userName": "测试用户_李四喜",
-    "province": "河北省",
-    "city": "唐山市"
-  }
-}
-
-```
-
 - 投诉分析
 
 ```http
@@ -129,28 +63,6 @@ Content-Type: application/json
 }
 ```
 
-```json
-HTTP/1.1 200 
-Content-Type: application/json
-Transfer-Encoding: chunked
-Date: Fri, 05 Aug 2022 08:51:35 GMT
-Connection: close
-
-{
-  "success": true,
-  "code": 1,
-  "message": "成功",
-  "data": {
-    "id": 4,
-    "account": "test_abc",
-    "name": "测试用户_李四喜",
-    "status": 1,
-    "city": "唐山市"
-  }
-}
-
-```
-
 - 投诉预测
 
 ```http
@@ -164,27 +76,6 @@ Content-Type: application/json
 }
 ```
 
-```json
-HTTP/1.1 200 
-Content-Type: application/json
-Transfer-Encoding: chunked
-Date: Fri, 05 Aug 2022 08:52:24 GMT
-Connection: close
-
-{
-  "success": true,
-  "code": 1,
-  "message": "成功",
-  "data": {
-    "userId": 4,
-    "userName": "测试用户_李四喜",
-    "province": "河北省",
-    "city": 130200
-  }
-}
-
-```
-
 ### 提供给流程系统的接口
 
 - 角色列表接口
@@ -199,55 +90,6 @@ Content-Type: application/json
 }
 ```
 
-```json
-HTTP/1.1 200 
-Content-Type: application/json
-Transfer-Encoding: chunked
-Date: Fri, 05 Aug 2022 08:58:32 GMT
-Connection: close
-
-{
-  "success": true,
-  "code": 1,
-  "message": "成功",
-  "data": [
-    {
-      "roleId": 3,
-      "roleName": "工单查询"
-    },
-    {
-      "roleId": 4,
-      "roleName": "工单处理(投诉分析)"
-    },
-    {
-      "roleId": 6,
-      "roleName": "工单处理(维护处理)"
-    },
-    {
-      "roleId": 7,
-      "roleName": "工单处理(建设处理)"
-    },
-    {
-      "roleId": 8,
-      "roleName": "工单处理(归档审核)"
-    },
-    {
-      "roleId": 13,
-      "roleName": "工单处理(处理核查)"
-    },
-    {
-      "roleId": 5,
-      "roleName": "工单处理(优化处理)"
-    },
-    {
-      "roleId": 12,
-      "roleName": "工单答复"
-    }
-  ]
-}
-
-```
-
 - 用户列表接口
 
 ```http
@@ -271,33 +113,6 @@ Content-Type: application/json
 }
 ```
 
-```json
-HTTP/1.1 200 
-Content-Type: application/json
-Transfer-Encoding: chunked
-Date: Fri, 05 Aug 2022 09:01:27 GMT
-Connection: close
-
-{
-  "success": true,
-  "code": 1,
-  "message": "成功",
-  "data": {
-    "userId": 21,
-    "loginId": "test_handan",
-    "userName": "测试用户_邯郸市",
-    "mobile": "13231899751",
-    "email": "",
-    "org": {
-      "orgId": 130400,
-      "orgName": "邯郸市"
-    },
-    "area": null
-  }
-}
-
-```
-
 - 根据用户ID获取用户接口
 
 ```http
@@ -310,33 +125,6 @@ Content-Type: application/json
 }
 ```
 
-```json
-HTTP/1.1 200 
-Content-Type: application/json
-Transfer-Encoding: chunked
-Date: Fri, 05 Aug 2022 09:02:11 GMT
-Connection: close
-
-{
-  "success": true,
-  "code": 1,
-  "message": "成功",
-  "data": {
-    "userId": 4,
-    "loginId": "test_abc",
-    "userName": "测试用户_李四喜",
-    "mobile": "13444444444",
-    "email": "@163.com",
-    "org": {
-      "orgId": 130200,
-      "orgName": "唐山市"
-    },
-    "area": null
-  }
-}
-
-```
-
 - 根据用户id获取角色id列表
 
 ```http
@@ -349,31 +137,6 @@ Content-Type: application/json
 }
 ```
 
-```json
-HTTP/1.1 200 
-Content-Type: application/json
-Transfer-Encoding: chunked
-Date: Fri, 05 Aug 2022 09:07:08 GMT
-Connection: close
-
-{
-  "success": true,
-  "code": 1,
-  "message": "成功",
-  "data": [
-    12,
-    5,
-    7,
-    13,
-    6,
-    3,
-    4,
-    8
-  ]
-}
-
-```
-
 - 根据角色id获取用户id列表
 
 ```http

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

@@ -11,10 +11,8 @@ import com.nokia.dao.UserRoleCityDao;
 import com.nokia.pojo.Area;
 import com.nokia.pojo.Role;
 import com.nokia.pojo.User;
+import com.nokia.pojo.UserRoleCity;
 
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
 @Service
 public class UserService extends ServiceImpl<UserDao, User> {
 
@@ -27,27 +25,8 @@ public class UserService extends ServiceImpl<UserDao, User> {
         this.userRoleCityDao = userRoleCityDao;
     }
 
-    /**
-     * 添加用户，不考虑权限
-     * 
-     * @param user
-     * @return
-     */
-    public boolean addUser(User user) {
-        // 检查是否已存在同名用户
-        if (hasLoginName(user.getLoginName())) {
-            log.debug("", user.getLoginName());
-            return false;
-        }
-        userDao.insert(user);
-        return true;
-    }
-
     /**
      * 指定的登陆名是否已存在
-     * 
-     * @param loginName
-     * @return
      */
     public boolean hasLoginName(String loginName) {
         return null != userDao.hasLoginName(loginName);
@@ -55,11 +34,6 @@ public class UserService extends ServiceImpl<UserDao, User> {
 
     /**
      * 用户是否存在某个权限
-     * 
-     * @param user
-     * @param role
-     * @param city
-     * @return
      */
     public boolean hasRoleCity(User user, Role role, Area city) {
         return null != userRoleCityDao.hasRoleCity(user.getUserId(), role.getRoleId(), city.getAreaId());
@@ -67,9 +41,6 @@ public class UserService extends ServiceImpl<UserDao, User> {
 
     /**
      * 添加用户
-     * 
-     * @param user
-     * @return
      */
     @Transactional
     public String add(User user) {
@@ -85,11 +56,15 @@ public class UserService extends ServiceImpl<UserDao, User> {
         return "ok";
     }
 
+    /*
+     * 添加权限
+     */
+    public void addUserRoleCity(UserRoleCity userRoleCity) {
+        userRoleCityDao.insert(userRoleCity);
+    }
+
     /**
      * 通过用户的登录名获取用户完整信息
-     * 
-     * @param loginName 用户登录名
-     * @return UserEntity
      */
     public User getByLoginName(String loginName) {
         return userDao.getByLoginName(loginName);

src/test/java/com/nokia/service/UserServiceTest.java

@@ -1,10 +1,15 @@
 package com.nokia.service;
 
+import java.io.BufferedReader;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
 import com.nokia.pojo.User;
+import com.nokia.pojo.UserRoleCity;
 
 @SpringBootTest
 public class UserServiceTest {
@@ -12,18 +17,6 @@ public class UserServiceTest {
     @Autowired
     private UserService userService;
 
-    @Test
-    void testAdd() {
-        User userEntity = new User();
-        userEntity.setLoginName("lizh231");
-        userEntity.setUserName("李志辉");
-    }
-
-    @Test
-    void testDelete() {
-
-    }
-
     @Test
     void testGetByLoginName() {
         User user = userService.getByLoginName("test_abc");
@@ -31,19 +24,19 @@ public class UserServiceTest {
     }
 
     @Test
-    void testAddRole() {
-        // User user = userService.getByLoginName("test_123");
-        // Role role = roleService.getByRoleName("工单处理(建设处理)");
-
+    void testAddUserRoleCity() throws FileNotFoundException, IOException {
+        try (BufferedReader reader = new BufferedReader(
+                new FileReader("D:\\code\\acl_tousu_all\\acl_tousu\\ignored\\abc.txt"))) {
+            String line = null;
+            while ((line = reader.readLine()) != null) {
+                String[] strs = line.split("\t");
+                UserRoleCity userRoleCity = new UserRoleCity();
+                userRoleCity.setUserId(Integer.parseInt(strs[0]));
+                userRoleCity.setRoleId(Integer.parseInt(strs[1]));
+                userRoleCity.setCityId(Integer.parseInt(strs[2]));
+                userService.addUserRoleCity(userRoleCity);
+            }
+        }
     }
 
-    @Test
-    void testSelect() {
-
-    }
-
-    @Test
-    void testUpdate() {
-
-    }
 }