20220722 v1.8

acl提供给投诉分析的接口.md

@@ -16,7 +16,7 @@ POST http://127.0.0.1:12128/api/verification
 Content-Type: application/json
 
 {
-  "token": "test_token_hebei",
+  "token": "test_token_abc",
   "fromSystem": "test",
   "system": "fenxi"
 }
@@ -35,7 +35,7 @@ Connection: close
   "message": "成功",
   "data": {
     "id": 10,
-    "account": "test_hebei",
+    "account": "test_abc",
     "name": "测试用户_全省",
     "status": null,
     "city": "河北省"

acl提供给投诉大屏的接口.md

@@ -16,7 +16,7 @@ POST http://127.0.0.1:12128/api/verification
 Content-Type: application/json
 
 {
-  "token": "test_token_hebei",
+  "token": "test_token_abc",
   "fromSystem": "test",
   "system": "daping"
 }

acl提供给投诉预测的接口.md

@@ -15,7 +15,7 @@ POST http://127.0.0.1:12128/api/verification
 Content-Type: application/json
 
 {
-"token": "test_token_hebei",
+"token": "test_token_abc",
 "fromSystem": "test",
 "system": "yuce"
 }

acl提供给流程的接口.md

@@ -10,7 +10,7 @@ POST http://127.0.0.1:12128/api/verification
 Content-Type: application/json
 
 {
-  "token": "test_token_123",
+  "token": "test_token_abc",
   "fromSystem": "test",
   "system": "liucheng"
 }
@@ -65,7 +65,8 @@ Connection: close
   "data": [
     {
       "roleId": 4,
-      "roleName": "分析组"
+      "roleName": "分析组",
+      "cities": []
     },
     {
       "roleId": 3,
@@ -302,31 +303,79 @@ Content-Type: application/json
 
 {
   "callType": "getRoleCityByUserId",
-  "userId": "3"
+  "userId": "4"
 }
 ```
 
 ```json
+HTTP/1.1 200 
+Content-Type: application/json
+Transfer-Encoding: chunked
+Date: Fri, 22 Jul 2022 09:02:33 GMT
+Connection: close
+
 {
   "success": true,
   "code": 1,
   "message": "成功",
   "data": [
     {
-        "roleId": "2",
-        "roleName": "工单查询",
-        "city": ["石家庄市", "邯郸市"]
-      },
-      {
-        "roleId": "3",
-        "roleName": "工单回复",
-        "city": ["石家庄市", "邯郸市"]
-      }
-      {
-        "roleId": "3",
-        "roleName": "工单回复",
-        "city": [-1]
-      }
+      "roleId": 5,
+      "roleName": "工单处理(优化处理)",
+      "cities": [
+        130200
+      ]
+    },
+    {
+      "roleId": 12,
+      "roleName": "工单答复",
+      "cities": [
+        130200
+      ]
+    },
+    {
+      "roleId": 6,
+      "roleName": "工单处理(维护处理)",
+      "cities": [
+        130200
+      ]
+    },
+    {
+      "roleId": 13,
+      "roleName": "工单处理(处理审核)",
+      "cities": [
+        130200
+      ]
+    },
+    {
+      "roleId": 4,
+      "roleName": "工单处理(投诉分析)",
+      "cities": [
+        130200
+      ]
+    },
+    {
+      "roleId": 3,
+      "roleName": "工单查询",
+      "cities": [
+        130200
+      ]
+    },
+    {
+      "roleId": 7,
+      "roleName": "工单处理(建设处理)",
+      "cities": [
+        130200
+      ]
+    },
+    {
+      "roleId": 8,
+      "roleName": "工单处理(工单审核)",
+      "cities": [
+        130200
+      ]
+    }
   ]
 }
+
 ```

acl提供给黑点库的接口.md

@@ -14,7 +14,7 @@ POST http://127.0.0.1:12128/api/verification
 Content-Type: application/json
 
 {
-  "token": "test_token_handan",
+  "token": "test_token_abc",
   "fromSystem": "test",
   "system": "heidianku"
 }

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.nokia</groupId>
     <artifactId>acl_tousu</artifactId>
-    <version>1.7</version>
+    <version>1.8</version>
 
     <parent>
         <groupId>com.nokia</groupId>

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

@@ -2,13 +2,15 @@ package com.nokia.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.nokia.common.R;
-import com.nokia.pojo.User;
+import com.nokia.pojo.Role;
 import com.nokia.service.FlowService;
+import com.nokia.vo.FlowRoleCityVo;
 import com.nokia.vo.FlowRoleVo;
 import com.nokia.vo.FlowUserVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -54,13 +56,23 @@ public class FlowApiController {
         }
     }
 
+    /**
+     * 
+     * @param jsonObject
+     * @return
+     */
     private R getRoleCityByUserId(JSONObject jsonObject) {
         Integer userId = jsonObject.getInteger("userId");
         if (null == userId) {
             return R.error().message("输入必须包含userId");
         }
-        User user = new User();
-        return R.ok().data(user.getRoles());
+        List<FlowRoleCityVo> flowRoleCityVos = new ArrayList<>();
+        for (Role role : flowService.getRoleCityByUserId(userId)) {
+            if ("flow".equals(role.getSystem())) {
+                flowRoleCityVos.add(new FlowRoleCityVo(role));
+            }
+        }
+        return R.ok().data(flowRoleCityVos);
     }
 
     public R findRoleList(JSONObject jsonObject) {

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

@@ -14,7 +14,7 @@ public interface UserDao extends BaseMapper<User> {
         /**
          * 支持username模糊查询
          */
-        @Select("select distinct r.role_id, r.role_name from sqmdb_rpt.acl_user u, sqmdb_rpt.acl_role r, sqmdb_rpt.acl_user_role ur"
+        @Select("select distinct r.role_id, r.role_name from sqmdb_rpt.acl_user u, sqmdb_rpt.acl_role r, sqmdb_rpt.acl_user_role_city ur"
                         + " where u.user_id = ur.user_id and r.role_id = ur.role_id and r.system='flow' and u.user_name like concat('%',#{username},'%')")
         List<FlowRoleVo> findRoleList(String username);
 
@@ -63,10 +63,10 @@ public interface UserDao extends BaseMapper<User> {
                         + " where a.city_id = c.city_id and user_id=#{userId}")
         FlowUserVo getFlowUserVoByUserId(Integer userId);
 
-        @Select("select r.role_id from  sqmdb_rpt.acl_role r,  sqmdb_rpt.acl_user_role ur where r.role_id = ur.role_id and r.system='flow' and ur.user_id=#{userId}")
+        @Select("select r.role_id from  sqmdb_rpt.acl_role r,  sqmdb_rpt.acl_user_role_city ur where r.role_id = ur.role_id and r.system='flow' and ur.user_id=#{userId}")
         List<Integer> findRoleIdByUserId(Integer userId);
 
-        @Select("select u.user_id from sqmdb_rpt.acl_user u,  sqmdb_rpt.acl_user_role ur where u.user_id = ur.user_id and ur.role_id=#{roleId}")
+        @Select("select u.user_id from sqmdb_rpt.acl_user u,  sqmdb_rpt.acl_user_role_city ur where u.user_id = ur.user_id and ur.role_id=#{roleId}")
         List<Integer> findUserIdByRoleId(Integer roleId);
 
         /**
@@ -79,7 +79,7 @@ public interface UserDao extends BaseMapper<User> {
         @Select("<script>"
                         + "select a.user_id as user_id, a.login_name as login_id, a.user_name as user_name, a.phone as mobile, a.email as email,"
                         + " a.city_id as org_id, c.city_name_zh as org_name, a.district as area"
-                        + " from sqmdb_rpt.acl_user a, sqmdb_rpt.acl_city c, sqmdb_rpt.acl_user_role ur "
+                        + " from sqmdb_rpt.acl_user a, sqmdb_rpt.acl_city c, sqmdb_rpt.acl_user_role_city ur "
                         + " where a.user_id = ur.user_id and a.city_id = c.city_id"
                         + "<if test=\"loginId != null and loginId !=''\">"
                         + " and a.login_name=#{loginId} "
@@ -93,16 +93,10 @@ public interface UserDao extends BaseMapper<User> {
                         + "</script>")
         List<FlowUserVo> findAuthorizedUser(String loginId, Integer roleId, String userName);
 
-        @Results({
-                        @Result(column = "city_id", property = "cityId"),
-                        @Result(column = "user_id", property = "userId"),
-                        @Result(column = "city_id", property = "city", one = @One(select = "com.nokia.dao.CityDao.findByCityId")),
-                        @Result(column = "user_id", property = "roles", many = @Many(select = "com.nokia.dao.RoleDao.findByUserId"))
-        })
-        @Select("select * from sqmdb_rpt.acl_user where login_name=#{loginName} ")
-        User getByLoinName(String loginName);
-
         List<Role> getRoleCityByUserId(Integer userId);
 
-        User getByLoginName2(String loginName);
+        User getByLoginName(String loginName);
+
+        @Select("select user_id from sqmdb_rpt.acl_user au where au.login_name = #{loginName}")
+        Integer hasLoginName(String loginName);
 }

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

@@ -0,0 +1,14 @@
+package com.nokia.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.nokia.pojo.UserRoleCity;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+@Mapper
+public interface UserRoleCityDao extends BaseMapper<UserRoleCity> {
+
+    @Select("select role_id from sqmdb_rpt.acl_user_role_city where user_id = #{userId} and role_id= #{roleId} and city_id = #{cityId}")
+    Integer hasRoleCity(Integer userId, Integer roleId, Integer cityId);
+}

src/main/java/com/nokia/pojo/Role.java

@@ -17,5 +17,5 @@ public class Role implements Serializable {
     private String roleName;
     private String system;
     @TableField(exist = false)
-    private List<Integer> cities;
+    private List<City> cities;
 }

src/main/java/com/nokia/pojo/UserRoleCity.java

@@ -1,10 +1,16 @@
 package com.nokia.pojo;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
 import lombok.Data;
 
 @Data
+@TableName("sqmdb_rpt.acl_user_role_city")
 public class UserRoleCity {
 
+    @TableId(type = IdType.AUTO)
     private Integer id;
     private Integer userId;
     private Integer roleId;

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

@@ -52,7 +52,7 @@ public class AclService {
                 // 这里存在一个问题，如果是在top已存在的用户，但是我们系统没有，此时返回的userEntity为null，会对后续处理产生影响，需要考虑应该怎么做
                 // 在前端处理，上面的问题仅影响初次点击入口的用户，不影响超时用户
                 // 前端需要对入口用户做特别的处理
-                userEntity = userDao.getByLoinName(tokenFlagVo.getLoginName());
+                userEntity = userDao.getByLoginName(tokenFlagVo.getLoginName());
                 if (userEntity != null) {
                     // 仅当用户信息不为空时,将用户信息存入redis
                     redisTemplate.opsForValue().set(token, userEntity, timeoutSeconds, TimeUnit.SECONDS);

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

@@ -5,11 +5,14 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.nokia.dao.CityDao;
 import com.nokia.dao.UserDao;
+import com.nokia.dao.UserRoleCityDao;
 import com.nokia.dao.UserRoleDao;
 import com.nokia.pojo.City;
 import com.nokia.pojo.Role;
 import com.nokia.pojo.User;
 import com.nokia.pojo.UserRole;
+import lombok.extern.slf4j.Slf4j;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -17,39 +20,118 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
+@Slf4j
 @Service
 public class UserService extends ServiceImpl<UserDao, User> {
 
     private final UserDao userDao;
     private final UserRoleDao userRoleDao;
+    private final UserRoleCityDao userRoleCityDao;
     private final CityDao cityDao;
 
     @Autowired
-    public UserService(UserDao userDao, UserRoleDao userRoleDao, CityDao cityDao) {
+    public UserService(UserDao userDao, UserRoleDao userRoleDao, CityDao cityDao, UserRoleCityDao userRoleCityDao) {
         this.userDao = userDao;
         this.userRoleDao = userRoleDao;
         this.cityDao = cityDao;
+        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);
+    }
+
+    /**
+     * 用户是否存在某个权限
+     * 
+     * @param user
+     * @param role
+     * @param city
+     * @return
+     */
+    public boolean hasRoleCity(User user, Role role, City city) {
+        return null != userRoleCityDao.hasRoleCity(user.getUserId(), role.getRoleId(), city.getCityId());
     }
 
+    /**
+     * 给用户添加权限
+     * 
+     * @param user
+     * @param role
+     * @return
+     */
+    public String addRole(User user, Role role, City city) {
+        if (!hasRole(user, role)) {
+            // 检查用户，确认当前无此权限
+            UserRole userRoleEntity = new UserRole();
+            userRoleEntity.setUserId(user.getUserId());
+            userRoleEntity.setRoleId(role.getRoleId());
+            userRoleDao.insert(userRoleEntity);
+        }
+        return "ok";
+    }
+
+    /**
+     * 判断用户是否有有某个角色
+     * 
+     * @param user
+     * @param role
+     * @return boolean
+     */
+    public boolean hasRole(User user, Role role) {
+        return null != userRoleDao.hasRole(user.getUserId(), role.getRoleId());
+    }
+
+    /**
+     * 添加用户
+     * 
+     * @param user
+     * @return
+     */
     @Transactional
-    public String add(User table2User) {
+    public String add(User user) {
         User query = new User();
-        query.setLoginName(table2User.getLoginName());
+        query.setLoginName(user.getLoginName());
         User one = baseMapper.selectOne(Wrappers.query(query));
         if (one != null) {
-            return "loginName: " + table2User.getLoginName() + " 已存在";
+            return "loginName: " + user.getLoginName() + " 已存在";
         } else {
-            table2User.setCityId(table2User.getCityId());
-            baseMapper.insert(table2User);
-            Set<Role> roleEntityList1 = table2User.getRoles();
-            UserRole userRoleEntity = new UserRole();
-            for (Role role : roleEntityList1) {
-                userRoleEntity.setUserId(table2User.getUserId());
-                userRoleEntity.setRoleId(role.getRoleId());
-                userRoleDao.insert(userRoleEntity);
-            }
+            user.setCityId(user.getCity().getCityId());
+            baseMapper.insert(user);
+            // Set<Role> roles = user.getRoles();
+            // UserRoleCity userRoleCity;
+            // for (Role role : roles) {
+            // for (Integer cityId : role.getCities()) {
+            // userRoleCity = new UserRoleCity();
+            // userRoleCity.setRoleId(role.getRoleId());
+            // userRoleCity.setUserId(user.getUserId());
+            // userRoleCity.setCityId(cityId);
+            // userRoleCityDao.insert(userRoleCity);
+            // }
+            // }
         }
         return "ok";
     }
@@ -95,24 +177,6 @@ public class UserService extends ServiceImpl<UserDao, User> {
         return true;
     }
 
-    /**
-     * 给用户添加权限
-     * 
-     * @param userEntity
-     * @param roleEntity
-     * @return
-     */
-    public String addRole(User userEntity, Role roleEntity) {
-        if (!hasRole(userEntity, roleEntity)) {
-            // 检查用户，确认当前无此权限
-            UserRole userRoleEntity = new UserRole();
-            userRoleEntity.setUserId(userEntity.getUserId());
-            userRoleEntity.setRoleId(roleEntity.getRoleId());
-            userRoleDao.insert(userRoleEntity);
-        }
-        return "ok";
-    }
-
     /**
      * 通过用户的登录名获取用户完整信息
      * 
@@ -120,18 +184,7 @@ public class UserService extends ServiceImpl<UserDao, User> {
      * @return UserEntity
      */
     public User getByLoginName(String loginName) {
-        return userDao.getByLoinName(loginName);
-    }
-
-    /**
-     * 判断用户是否有有某个角色
-     * 
-     * @param userEntity
-     * @param roleEntity
-     * @return boolean
-     */
-    public boolean hasRole(User userEntity, Role roleEntity) {
-        return !(null == userRoleDao.hasRole(userEntity.getUserId(), roleEntity.getRoleId()));
+        return userDao.getByLoginName(loginName);
     }
 
     public Map<String, Object> select(Integer userId) {

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

@@ -1,5 +1,6 @@
 package com.nokia.vo;
 
+import com.nokia.pojo.Role;
 import com.nokia.pojo.User;
 import lombok.Data;
 
@@ -9,18 +10,32 @@ import lombok.Data;
  * 归属省
  * 归属地市
  * 权限：省级/地市级
+ * 
+ * system daping
  */
 @Data
 public class DapingUserVo {
+    // 用户id
     private Integer userId;
+    // 用户姓名
     private String userName;
+    // 归属省份
     private String province;
+    // 归属地市
+    // private String belongCity;
+    // 权限地市
     private String city;
 
-    public DapingUserVo(User userEntity) {
-        this.userId = userEntity.getUserId();
-        this.userName = userEntity.getUserName();
-        this.province = userEntity.getCity().getProvince();
-        this.city = userEntity.getCity().getCityNameZh();
+    public DapingUserVo(User user) {
+        this.userId = user.getUserId();
+        this.userName = user.getUserName();
+        this.province = user.getCity().getProvince();
+        // this.belongCity = user.getCity().getCityNameZh();
+        // 根据权限进行city赋权
+        for (Role role : user.getRoles()) {
+            if ("daping".equals(role.getSystem())) {
+                this.city = role.getCities().get(0).getCityNameZh();
+            }
+        }
     }
 }

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

@@ -1,23 +1,39 @@
 package com.nokia.vo;
 
+import com.nokia.pojo.Role;
 import com.nokia.pojo.User;
 import lombok.Data;
 
+/**
+ * 投诉分析用户
+ */
 @Data
 public class FenxiUserVo {
+    // 用户id
     private Integer id;
+    // 用户登陆名
     private String account;
+    // 用户姓名
     private String name;
     // 1为可用，其他为不可用
     private Integer status;
+    // 归属地市
+    // private String belongCity;
     // city为城市id
     private String city;
 
-    public FenxiUserVo(User userEntity) {
-        this.id = userEntity.getUserId();
-        this.account = userEntity.getLoginName();
-        this.name = userEntity.getUserName();
+    public FenxiUserVo(User user) {
+        this.id = user.getUserId();
+        this.account = user.getLoginName();
+        this.name = user.getUserName();
+        // status永远为1
         this.status = 1;
-        this.city = userEntity.getCity().getCityNameZh();
+        // this.belongCity = user.getCity().getCityNameZh();
+        // 根据角色进行city赋权
+        for (Role role : user.getRoles()) {
+            if ("fenxi".equals(role.getSystem())) {
+                this.city = role.getCities().get(0).getCityNameZh();
+            }
+        }
     }
 }

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

@@ -0,0 +1,28 @@
+package com.nokia.vo;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.nokia.pojo.City;
+import com.nokia.pojo.Role;
+
+import lombok.Data;
+
+@Data
+public class FlowRoleCityVo {
+    // 角色id
+    private Integer roleId;
+    // 角色名
+    private String roleName;
+    // 赋权地市
+    private List<Integer> cities;
+
+    public FlowRoleCityVo(Role role) {
+        this.roleId = role.getRoleId();
+        this.roleName = role.getRoleName();
+        this.cities = new ArrayList<>();
+        for (City city : role.getCities()) {
+            this.cities.add(city.getCityId());
+        }
+    }
+}

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

@@ -1,9 +1,13 @@
 package com.nokia.vo;
 
+import java.util.List;
+
 import lombok.Data;
 
 @Data
 public class FlowRoleVo {
+    // 角色id
     private Integer roleId;
+    // 角色名
     private String roleName;
 }

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

@@ -12,21 +12,29 @@ import lombok.Data;
  */
 @Data
 public class HeidiankuUserVo {
+    // 登陆名
     private String loginName;
+    // 用户姓名
     private String userName;
+    // 省
     private String province;
+    // 归属地市
+    // private String belongCity;
+    // 赋权地市
     private String city;
+    // 赋权信息
     private List<String> roles;
 
     public HeidiankuUserVo(User userEntity) {
         this.loginName = userEntity.getLoginName();
         this.userName = userEntity.getUserName();
         this.province = userEntity.getCity().getProvince();
-        this.city = userEntity.getCity().getCityNameZh();
+        // this.belongCity = userEntity.getCity().getCityNameZh();
         List<String> roles = new ArrayList<>();
         userEntity.getRoles().forEach(role -> {
             if ("heidianku".equals(role.getSystem())) {
                 roles.add(role.getRoleName());
+                this.city = role.getCities().get(0).getCityNameZh();
             }
         });
         this.roles = roles;

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

@@ -1,19 +1,31 @@
 package com.nokia.vo;
 
+import com.nokia.pojo.Role;
 import com.nokia.pojo.User;
 import lombok.Data;
 
 @Data
 public class YuceUserVo {
+    // 用户id
     private Integer userId;
+    // 姓名
     private String userName;
+    // 省
     private String province;
+    // 归属地市
+    // private String belongCity;
+    // 权限地市
     private Integer city;
 
-    public YuceUserVo(User userEntity) {
-        this.userId = userEntity.getUserId();
-        this.userName = userEntity.getUserName();
-        this.province = userEntity.getCity().getProvince();
-        this.city = userEntity.getCity().getCityId();
+    public YuceUserVo(User user) {
+        this.userId = user.getUserId();
+        this.userName = user.getUserName();
+        this.province = user.getCity().getProvince();
+        // this.belongCity = user.getCity().getCityNameZh();
+        for (Role role : user.getRoles()) {
+            if ("yuce".equals(role.getSystem())) {
+                this.city = role.getCities().get(0).getCityId();
+            }
+        }
     }
 }

src/main/resources/application.properties

@@ -25,7 +25,7 @@ spring.datasource.password=sqmdb_1QAZ
 # 正式环境Redis配置
 spring.redis.host=192.168.70.125
 spring.redis.port=6379
-spring.redis.database=0
+spring.redis.database=1
 spring.redis.password=Richr00t
 redis.timeoutSeconds=600
 

src/main/resources/mapper/UserMapper.xml

@@ -23,21 +23,27 @@
         <id column="role_id" property="roleId"></id>
         <result column="role_name" property="roleName" />
         <result column="system" property="system" />
-        <collection property="cities" ofType="int">
+        <collection property="cities" ofType="com.nokia.pojo.City">
             <result column="role_city_id" property="cityId" />
+            <result column="role_city_name_zh" property="cityNameZh" />
+            <result column="role_city_name_en" property="cityNameEn" />
+            <result column="role_ord" property="ord" />
+            <result column="role_province" property="province" />
         </collection>
     </resultMap>
 
     <select id="getRoleCityByUserId" resultMap="RoleResultMap">
-        select ar.role_id, ar.role_name, ar."system", aurc.city_id as role_city_id
-          from sqmdb_rpt.acl_role ar, sqmdb_rpt.acl_user_role_city aurc
-          where ar.role_id = aurc.role_id and aurc.user_id = #{userId}
+        select ar.role_id, ar.role_name, ar."system", aurc.city_id as role_city_id, ac.city_name_zh as role_city_name_zh,
+          ac.city_name_en as role_city_name_en, ac.ord as role_ord, ac.province as role_province
+          from sqmdb_rpt.acl_role ar, sqmdb_rpt.acl_user_role_city aurc,  sqmdb_rpt.acl_city ac
+          where ar.role_id = aurc.role_id and aurc.city_id = ac.city_id  and aurc.user_id = #{userId}
     </select>
 
-    <select id="getByLoginName2" resultMap="UserResultMap">
+    <select id="getByLoginName" resultMap="UserResultMap">
         select au.user_id, au.login_name, au.user_name, au.phone, au.email, au.city_id, ac.city_name_zh, ac.city_name_en, ac.ord, ac.province,
-          au.district, ar.role_id, ar.role_name, ar."system", aurc.city_id as role_city_id
-          from sqmdb_rpt.acl_user au, sqmdb_rpt.acl_role ar, sqmdb_rpt.acl_user_role_city aurc, sqmdb_rpt.acl_city ac
-          where au.user_id = aurc.user_id and ar.role_id = aurc.role_id and au.city_id = ac.city_id and au.login_name = #{loginName}
+          au.district, ar.role_id, ar.role_name, ar."system", aurc.city_id as role_city_id, ac2.city_name_zh as role_city_name_zh,
+          ac2.city_name_en as role_city_name_en, ac2.ord as role_ord, ac2.province as role_province
+          from sqmdb_rpt.acl_user au, sqmdb_rpt.acl_role ar, sqmdb_rpt.acl_user_role_city aurc, sqmdb_rpt.acl_city ac,  sqmdb_rpt.acl_city ac2
+          where au.user_id = aurc.user_id and ar.role_id = aurc.role_id and au.city_id = ac.city_id and aurc.city_id = ac2.city_id and au.login_name = #{loginName}
     </select>
 </mapper>

src/test/java/com/nokia/UserModifyTest.java

@@ -8,8 +8,11 @@ import org.springframework.data.redis.core.RedisTemplate;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.nokia.dao.UserDao;
+import com.nokia.dao.UserRoleCityDao;
 import com.nokia.pojo.Role;
 import com.nokia.pojo.User;
+import com.nokia.pojo.UserRoleCity;
 import com.nokia.service.RoleService;
 import com.nokia.service.UserService;
 
@@ -28,6 +31,12 @@ public class UserModifyTest {
     @Autowired
     private RoleService roleService;
 
+    @Autowired
+    private UserDao userDao;
+
+    @Autowired
+    private UserRoleCityDao userRoleCityDao;
+
     // 清除redis
     @Test
     void test() {
@@ -58,4 +67,29 @@ public class UserModifyTest {
         Integer integer = jsonObject.getInteger("no");
         System.out.println(integer);
     }
+
+    // 给12个地市的主管加权限
+    @Test
+    void test3() {
+        // int[] ids = new int[] { 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36 };
+        // for (int id : ids) {
+        // User user = userDao.selectById(id);
+        // System.out.println(user);
+        // UserRoleCity userRoleCity = new UserRoleCity();
+        // userRoleCity.setUserId(id);
+        // userRoleCity.setRoleId(18);
+        // userRoleCity.setCityId(user.getCityId());
+        // userRoleCityDao.insert(userRoleCity);
+        // }
+
+        int[] roleIds = new int[] { 3, 4, 5, 6, 7, 8, 12, 13};
+        User user = userDao.selectById(24);
+        for (int roleId : roleIds) {
+            UserRoleCity userRoleCity = new UserRoleCity();
+            userRoleCity.setUserId(user.getUserId());
+            userRoleCity.setRoleId(roleId);
+            userRoleCity.setCityId(user.getCityId());
+            userRoleCityDao.insert(userRoleCity);
+        }
+    }
 }

src/test/java/com/nokia/dao/UserDaoTest.java

@@ -17,12 +17,6 @@ public class UserDaoTest {
     @Autowired
     UserDao userDao;
 
-    @Test
-    void testGetByLoinName() {
-        User usr = userDao.getByLoinName("test_hebei");
-        System.out.println(usr);
-    }
-
     @Test
     void testGetFlowUserVoByUserId() {
         FlowUserVo flowUserVo = userDao.getFlowUserVoByUserId(3);
@@ -73,13 +67,13 @@ public class UserDaoTest {
 
     @Test
     void testGetByLoginName2() {
-        User user = userDao.getByLoginName2("test_hengshui");
+        User user = userDao.getByLoginName("test_hengshui");
         System.out.println(user);
     }
 
     @Test
     void testGetRoleCityByUserId() {
-        List<Role> roles = userDao.getRoleCityByUserId(20);
+        List<Role> roles = userDao.getRoleCityByUserId(4);
         System.out.println(roles);
     }
 }

src/test/java/com/nokia/dao/UserRoleCityDaoTest.java

@@ -0,0 +1,45 @@
+package com.nokia.dao;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import com.nokia.pojo.UserRoleCity;
+
+@SpringBootTest
+public class UserRoleCityDaoTest {
+
+    @Autowired
+    private UserRoleCityDao userRoleCityDao;
+
+    @Test
+    void testHasRoleCity() {
+        Integer result = userRoleCityDao.hasRoleCity(4, 16, 130200);
+        System.out.println(result);
+    }
+
+    @Test
+    void test() {
+        UserRoleCity userRoleCity = new UserRoleCity();
+        // test_abc
+        userRoleCity.setUserId(4);
+        // 投诉分析
+        userRoleCity.setRoleId(16);
+        // 唐山
+        userRoleCity.setCityId(130200);
+        userRoleCityDao.insert(userRoleCity);
+    }
+
+    @Test
+    void test2() {
+        UserRoleCity userRoleCity = new UserRoleCity();
+        // test_abc
+        userRoleCity.setUserId(4);
+        // 投诉分析
+        userRoleCity.setRoleId(18);
+        // 唐山
+        userRoleCity.setCityId(130200);
+        userRoleCityDao.insert(userRoleCity);
+    }
+
+}

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

@@ -37,16 +37,16 @@ public class UserServiceTest {
     @Test
     void testHasRole() {
         User user = userService.getByLoginName("test_123");
-        Role role = roleService.getByRoleName("工单处理(建设处理)");
+        Role role = roleService.getByRoleName("投诉大屏");
         boolean hasRole = userService.hasRole(user, role);
         System.out.println(hasRole);
     }
 
     @Test
     void testAddRole() {
-        User user = userService.getByLoginName("test_123");
-        Role role = roleService.getByRoleName("工单处理(建设处理)");
-        
+        // User user = userService.getByLoginName("test_123");
+        // Role role = roleService.getByRoleName("工单处理(建设处理)");
+
     }
 
     @Test