20220720

acl提供给流程的接口.md

@@ -292,4 +292,41 @@ Connection: close
   ]
 }
 
-```
+```
+
+## 根据用户查找角色+城市信息
+
+```http
+POST http://127.0.0.1:12128/rest/flow/api
+Content-Type: application/json
+
+{
+  "callType": "getRoleCityByUserId",
+  "userId": "3"
+}
+```
+
+```json
+{
+  "success": true,
+  "code": 1,
+  "message": "成功",
+  "data": [
+    {
+        "roleId": "2",
+        "roleName": "工单查询",
+        "city": ["石家庄市", "邯郸市"]
+      },
+      {
+        "roleId": "3",
+        "roleName": "工单回复",
+        "city": ["石家庄市", "邯郸市"]
+      }
+      {
+        "roleId": "3",
+        "roleName": "工单回复",
+        "city": [-1]
+      }
+  ]
+}
+```

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

@@ -1,7 +1,8 @@
 package com.nokia.controller;
 import com.nokia.common.R;
-import com.nokia.pojo.CityEntity;
-import com.nokia.service.CityI.CityServiceImpl;
+import com.nokia.pojo.City;
+import com.nokia.service.CityService;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -13,17 +14,17 @@ import java.util.List;
 @RequestMapping("rest/api/city")
 public class CityController {
 
-    private final CityServiceImpl cityServiceimpl;
+    private final CityService cityServiceimpl;
 
     @Autowired
-    public CityController(CityServiceImpl cityServiceimpl) {
+    public CityController(CityService cityServiceimpl) {
         this.cityServiceimpl = cityServiceimpl;
     }
 
     @PostMapping("list")
     @ResponseBody
     public R list() {
-        List<CityEntity> cities = cityServiceimpl.list();
+        List<City> cities = cityServiceimpl.list();
         return R.ok().data(cities);
     }
 }

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

@@ -2,7 +2,8 @@ package com.nokia.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.nokia.common.R;
-import com.nokia.service.Flow.FlowServiceImpl;
+import com.nokia.pojo.User;
+import com.nokia.service.FlowService;
 import com.nokia.vo.FlowRoleVo;
 import com.nokia.vo.FlowUserVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,11 +18,11 @@ import java.util.List;
 @RequestMapping("rest")
 public class FlowApiController {
 
-    private final FlowServiceImpl flowServiceImpl;
+    private final FlowService flowService;
 
     @Autowired
-    public FlowApiController(FlowServiceImpl flowServiceImpl) {
-        this.flowServiceImpl = flowServiceImpl;
+    public FlowApiController(FlowService flowService) {
+        this.flowService = flowService;
     }
 
     @PostMapping("flow/api")
@@ -46,22 +47,33 @@ public class FlowApiController {
                 return findUserIdByRoleId(jsonObject);
             case "findAuthorizedUser":
                 return findAuthorizedUser(jsonObject);
+            case "getRoleCityByUserId":
+                return getRoleCityByUserId(jsonObject);
             default:
                 return R.error().message("callType类型错误");
         }
     }
 
+    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());
+    }
+
     public R findRoleList(JSONObject jsonObject) {
         String username = jsonObject.getString("userName");
         if (username == null || username.equals("")) {
-            return R.ok().data(flowServiceImpl.findRoleList());
+            return R.ok().data(flowService.findRoleList());
         }
-        List<FlowRoleVo> roleList = flowServiceImpl.findRoleList(username);
+        List<FlowRoleVo> roleList = flowService.findRoleList(username);
         return R.ok().data(roleList);
     }
 
     public R findToPage() {
-        return R.ok().data(flowServiceImpl.findToPage());
+        return R.ok().data(flowService.findToPage());
     }
 
     public R getByLoginId(JSONObject jsonObject) {
@@ -69,7 +81,7 @@ public class FlowApiController {
         if (loginId == null || loginId.equals("")) {
             return R.error().message("输入必须包含loginId");
         }
-        FlowUserVo flowUserVo = flowServiceImpl.getByLoginId(loginId);
+        FlowUserVo flowUserVo = flowService.getByLoginId(loginId);
         return R.ok().data(flowUserVo);
     }
 
@@ -83,7 +95,7 @@ public class FlowApiController {
         if (userId == null) {
             return R.error().message("输入必须包含userId");
         }
-        FlowUserVo flowUserVo = flowServiceImpl.getByUserId(userId);
+        FlowUserVo flowUserVo = flowService.getByUserId(userId);
         return R.ok().data(flowUserVo);
     }
 
@@ -97,7 +109,7 @@ public class FlowApiController {
         if (userId == null) {
             return R.error().message("输入必须包含userId");
         }
-        List<Integer> roleIdList = flowServiceImpl.findRoleIdByUserId(userId);
+        List<Integer> roleIdList = flowService.findRoleIdByUserId(userId);
         return R.ok().data(roleIdList);
     }
 
@@ -111,7 +123,7 @@ public class FlowApiController {
         if (roleId == null) {
             return R.error().message("输入必须包含roleId");
         }
-        List<Integer> userIdList = flowServiceImpl.findUserIdByRoleId(roleId);
+        List<Integer> userIdList = flowService.findUserIdByRoleId(roleId);
         return R.ok().data(userIdList);
     }
 
@@ -125,7 +137,7 @@ public class FlowApiController {
         }
         String userName = jsonObject.getString("userName");
         userName = userName == null || userName.equals("") ? null : userName.trim();
-        List<FlowUserVo> flowUserVos = flowServiceImpl.findAuthorizedUser(loginId, roleId, userName);
+        List<FlowUserVo> flowUserVos = flowService.findAuthorizedUser(loginId, roleId, userName);
         return R.ok().data(flowUserVos);
     }
 }

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

@@ -3,7 +3,7 @@ package com.nokia.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.nokia.common.R;
 import com.nokia.dao.RoleDao;
-import com.nokia.pojo.RoleEntity;
+import com.nokia.pojo.Role;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -24,13 +24,13 @@ public class RoleController {
     }
 
     @PostMapping("/add")
-    public R RoleAdd(@RequestBody RoleEntity roleEntity){
+    public R RoleAdd(@RequestBody Role roleEntity){
         if (roleEntity==null){
             return R.error().message("空");
         }
-        QueryWrapper<RoleEntity> queryWrapper = new QueryWrapper<>();
+        QueryWrapper<Role> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("role_name",roleEntity.getRoleName());
-        RoleEntity roleEntity1 = roleDao.selectOne(queryWrapper);
+        Role roleEntity1 = roleDao.selectOne(queryWrapper);
         if (roleEntity1!=null){
             return R.error().message("角色已经存在");
         }
@@ -56,11 +56,11 @@ public class RoleController {
     }
 
     @PostMapping("/update/id/{roleId}")
-    public R RoleUpdate(@PathVariable Integer roleId, @RequestBody RoleEntity roleEntity){
+    public R RoleUpdate(@PathVariable Integer roleId, @RequestBody Role roleEntity){
         if (roleEntity==null){
             return R.error().message("roleEntity 为空");
         }
-        RoleEntity roleEntity1 = roleDao.selectById(roleId);
+        Role roleEntity1 = roleDao.selectById(roleId);
         roleEntity1.setRoleName(roleEntity.getRoleName());
         int i = roleDao.updateById(roleEntity1);
         if (i>0){
@@ -75,7 +75,7 @@ public class RoleController {
         if (roleId==null){
             return R.error().message("roleId 为空");
         }
-        RoleEntity roleEntity = roleDao.selectById(roleId);
+        Role roleEntity = roleDao.selectById(roleId);
         return  roleEntity==null ? R.error().message("role不存在") :R.ok().data(roleEntity);
     }
 }

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

@@ -1,7 +1,7 @@
 package com.nokia.controller;
 
 import com.nokia.common.R;
-import com.nokia.pojo.UserEntity;
+import com.nokia.pojo.User;
 import com.nokia.service.UserService;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,13 +23,13 @@ public class UserController {
     @PostMapping("list")
     @ResponseBody
     public R list() {
-        List<UserEntity> userEntities = userServiceImpl.list();
+        List<User> userEntities = userServiceImpl.list();
         return R.ok().data(userEntities);
     }
 
     @PostMapping("add")
     @ResponseBody
-    public R add(@RequestBody UserEntity user) {
+    public R add(@RequestBody User user) {
         if (user.getLoginName() == null || user.getLoginName().equals("")) {
             return R.error().message("LoginName不能为空");
         }
@@ -55,16 +55,16 @@ public class UserController {
     }
 
     @PostMapping("/update/id/{userId}")
-    public R update(@PathVariable Integer userId, @RequestBody UserEntity userEntity) {
+    public R update(@PathVariable Integer userId, @RequestBody User userEntity) {
         if (null == userEntity) {
             return R.error().message("userEntity 为空");
         }
         userEntity.setUserId(userId);
-        String update = userServiceImpl.update(userEntity);
-        if (update.equals("ok")) {
+        boolean update = userServiceImpl.update(userEntity);
+        if (update) {
             return R.ok().message("修改成功");
         } else {
-            return R.error().message(update);
+            return R.error().message("修改失败");
         }
     }
 

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

@@ -1,12 +1,12 @@
 package com.nokia.controller;
 
 import com.nokia.common.R;
-import com.nokia.pojo.TokenEntity;
-import com.nokia.pojo.UserEntity;
+import com.nokia.pojo.User;
 import com.nokia.service.AclService;
 import com.nokia.vo.DapingUserVo;
 import com.nokia.vo.FenxiUserVo;
 import com.nokia.vo.LiuchengUserVo;
+import com.nokia.vo.TokenVo;
 import com.nokia.vo.YuceUserVo;
 import com.nokia.vo.HeidiankuUserVo;
 
@@ -35,9 +35,9 @@ public class VerificationController {
     private String topRedirectUrl;
 
     @PostMapping("/verification")
-    public R verifySystem(@RequestBody TokenEntity tokenEntity) {
+    public R verifySystem(@RequestBody TokenVo tokenEntity) {
         log.debug("输入参数: {}", tokenEntity);
-        UserEntity userEntity = aclService.verifySystem(tokenEntity.getToken(), tokenEntity.getFromSystem());
+        User userEntity = aclService.verifySystem(tokenEntity.getToken(), tokenEntity.getFromSystem());
         log.debug("输出用户信息: {}", userEntity);
         if (userEntity == null) {
             Map<String, String> map = new HashMap<>();

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

@@ -1,15 +1,15 @@
 package com.nokia.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.nokia.pojo.CityEntity;
+import com.nokia.pojo.City;
 import com.nokia.vo.FlowOrgVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 
 @Mapper
-public interface CityDao extends BaseMapper<CityEntity> {
+public interface CityDao extends BaseMapper<City> {
     @Select("select * from sqmdb_rpt.acl_city where city_id = #{cityId}")
-    CityEntity findByCityId(Integer cityId);
+    City findByCityId(Integer cityId);
 
     @Select("select city_id as org_id, city_name_zh as org_name from sqmdb_rpt.acl_city where city_id = #{cityId}")
     FlowOrgVo findOrgByCityId(Integer cityId);

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

@@ -1,7 +1,7 @@
 package com.nokia.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.nokia.pojo.RoleEntity;
+import com.nokia.pojo.Role;
 
 import java.util.List;
 
@@ -9,8 +9,11 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 
 @Mapper
-public interface RoleDao extends BaseMapper<RoleEntity> {
+public interface RoleDao extends BaseMapper<Role> {
 
     @Select("select r.role_id, r.role_name, r.system from sqmdb_rpt.acl_role r, sqmdb_rpt.acl_user_role ur where r.role_id = ur.role_id and ur.user_id = #{userId}")
-    List<RoleEntity> findByUserId(Integer userId);
+    List<Role> findByUserId(Integer userId);
+
+    @Select("select * from sqmdb_rpt.acl_role where role_name like concat('%',#{roleName},'%')")
+    List<Role> findRoleNameLike(String roleName);
 }

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

@@ -1,14 +1,15 @@
 package com.nokia.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.nokia.pojo.UserEntity;
+import com.nokia.pojo.Role;
+import com.nokia.pojo.User;
 import com.nokia.vo.FlowRoleVo;
 import com.nokia.vo.FlowUserVo;
 import org.apache.ibatis.annotations.*;
 import java.util.List;
 
 @Mapper
-public interface UserDao extends BaseMapper<UserEntity> {
+public interface UserDao extends BaseMapper<User> {
 
         /**
          * 支持username模糊查询
@@ -99,5 +100,9 @@ public interface UserDao extends BaseMapper<UserEntity> {
                         @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} ")
-        UserEntity getByLoinName(String loginName);
+        User getByLoinName(String loginName);
+
+        List<Role> getRoleCityByUserId(Integer userId);
+
+        User getByLoginName2(String loginName);
 }

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

@@ -1,10 +1,13 @@
 package com.nokia.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.nokia.pojo.UserRoleEntity;
+import com.nokia.pojo.UserRole;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 @Mapper
-public interface UserRoleDao extends BaseMapper<UserRoleEntity> {
+public interface UserRoleDao extends BaseMapper<UserRole> {
 
+    @Select("select role_id from sqmdb_rpt.acl_user_role where user_id = #{userId} and role_id= #{role_id}")
+    Integer hasRole(Integer userId, Integer role_id);
 }

src/main/java/com/nokia/pojo/CityEntity.java → src/main/java/com/nokia/pojo/City.java

@@ -7,13 +7,12 @@ import lombok.Data;
 
 import java.io.Serializable;
 
-
 /**
  * 城市
  */
 @Data
 @TableName("sqmdb_rpt.acl_city")
-public class CityEntity implements Serializable {
+public class City implements Serializable {
     @TableId(type = IdType.AUTO)
     private Integer cityId;
     // 城市中文名
@@ -22,4 +21,6 @@ public class CityEntity implements Serializable {
     private String cityNameEn;
     // 排序
     private Integer ord;
+    // 归属省中文名
+    private String province;
 }

src/main/java/com/nokia/pojo/DistrictEntity.java → src/main/java/com/nokia/pojo/District.java

@@ -6,7 +6,7 @@ import lombok.Data;
 
 @Data
 @TableName("sqmdb_rpt.acl_district")
-public class DistrictEntity {
+public class District {
     private Integer cityId;
     private String cityName;
     private Integer districtId;

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

@@ -1,20 +0,0 @@
-package com.nokia.pojo;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-import java.util.Date;
-/**
- * 部门
- */
-@Data
-@TableName("acl_org")
-public class OrgEntity {
-    @TableId(type = IdType.AUTO)
-    private Integer orgId;
-    private String orgName;
-    // private String parentId;
-    @TableField(fill = FieldFill.INSERT)
-    private Date createTime;
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private Date updateTime;
-}

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

@@ -1,6 +1,7 @@
 package com.nokia.pojo;
 
 import java.io.Serializable;
+import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
@@ -10,9 +11,11 @@ import lombok.Data;
  */
 @Data
 @TableName("sqmdb_rpt.acl_role")
-public class RoleEntity implements Serializable {
+public class Role implements Serializable {
     @TableId(type = IdType.AUTO)
     private Integer roleId;
     private String roleName;
     private String system;
+    @TableField(exist = false)
+    private List<Integer> cities;
 }

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

@@ -0,0 +1,27 @@
+package com.nokia.pojo;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Set;
+
+@Data
+@TableName("sqmdb_rpt.acl_user")
+public class User implements Serializable {
+
+    @TableId(type = IdType.AUTO)
+    private Integer userId;
+    private String loginName;
+    private String userName;
+    private String phone;
+    private String email;
+    private Integer cityId;
+    // 需要从city表中对应
+    @TableField(exist = false)
+    private City city;
+    // 所属区县 为空表示不归属区县 归属于地市
+    private String district;
+    @TableField(exist = false)
+    private Set<Role> roles;
+}

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

@@ -1,42 +0,0 @@
-package com.nokia.pojo;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.Set;
-
-@Data
-@TableName("sqmdb_rpt.acl_user")
-public class UserEntity implements Serializable {
-
-    @TableId(type = IdType.AUTO)
-    private Integer userId;
-    private String loginName;
-    private String userName;
-    private String phone;
-    private String email;
-    private String province;
-    // 需要从city表中对应
-    @TableField(exist = false)
-    private CityEntity city;
-    private Integer cityId;
-    // 所属区县 为空表示不归属区县 归属于地市
-    private String district;
-    private String county;
-    // 投诉分析权限 1表示有
-    private Integer tsfxPer;
-    // 投诉预测权限 1表示有
-    private Integer tsysPer;
-    // 投诉大屏权限 1表示有
-    private Integer tsdpPer;
-    // 投诉流程权限 1表示有
-    private Integer tsgdlzPer;
-    @TableField(fill = FieldFill.INSERT)
-    private Date createTime;
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private Date updateTime;
-    @TableField(exist = false)
-    private Set<RoleEntity> roles;
-}

src/main/java/com/nokia/pojo/UserRoleEntity.java → src/main/java/com/nokia/pojo/UserRole.java

@@ -1,4 +1,5 @@
 package com.nokia.pojo;
+
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 
@@ -6,7 +7,7 @@ import java.util.Date;
 
 @Data
 @TableName("sqmdb_rpt.acl_user_role")
-public class UserRoleEntity {
+public class UserRole {
     @TableId(type = IdType.AUTO)
     private Integer id;
     private Integer userId;
@@ -16,7 +17,7 @@ public class UserRoleEntity {
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date updateTime;
     @TableField(exist = false)
-    private RoleEntity roleEntity;
+    private Role roleEntity;
     @TableField(exist = false)
-    private UserEntity userEntity;
+    private User userEntity;
 }

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

@@ -1,5 +1,12 @@
 package com.nokia.pojo;
 
+import lombok.Data;
+
+@Data
 public class UserRoleCity {
-    
+
+    private Integer id;
+    private Integer userId;
+    private Integer roleId;
+    private Integer cityId;
 }

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

@@ -1,7 +1,7 @@
 package com.nokia.service;
 
 import com.nokia.dao.UserDao;
-import com.nokia.pojo.UserEntity;
+import com.nokia.pojo.User;
 import com.nokia.vo.TokenFlagVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,10 +33,10 @@ public class AclService {
         this.redisTemplate = redisTemplate;
     }
 
-    public UserEntity verifySystem(String token, String fromSystem) {
-        UserEntity userEntity = null;
+    public User verifySystem(String token, String fromSystem) {
+        User userEntity = null;
         // 从redis中查询
-        userEntity = (UserEntity) redisTemplate.opsForValue().get(token);
+        userEntity = (User) redisTemplate.opsForValue().get(token);
         if (userEntity != null) {
             log.debug("redis查询成功: {}", userEntity);
             // 2.1 可以查到用户信息，重置redis中的用户信息，刷新到期时间

src/main/java/com/nokia/service/CityI/CityService.java

@@ -1,6 +0,0 @@
-package com.nokia.service.CityI;
-
-
-public interface CityService {
-
-}

src/main/java/com/nokia/service/CityI/CityServiceImpl.java

@@ -1,11 +0,0 @@
-package com.nokia.service.CityI;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.nokia.dao.CityDao;
-import com.nokia.pojo.CityEntity;
-import org.springframework.stereotype.Service;
-
-@Service
-public class CityServiceImpl extends ServiceImpl<CityDao, CityEntity> implements CityService {
-
-}

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

@@ -0,0 +1,11 @@
+package com.nokia.service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.nokia.dao.CityDao;
+import com.nokia.pojo.City;
+import org.springframework.stereotype.Service;
+
+@Service
+public class CityService extends ServiceImpl<CityDao, City> {
+
+}

src/main/java/com/nokia/service/Flow/FlowService.java

@@ -1,16 +0,0 @@
-package com.nokia.service.Flow;
-
-import com.nokia.vo.FlowRoleVo;
-import com.nokia.vo.FlowUserVo;
-
-import java.util.List;
-
-public interface FlowService {
-    List<FlowRoleVo> findRoleList(String username);
-    List<FlowUserVo> findToPage();
-    FlowUserVo getByLoginId(String loginId);
-    FlowUserVo getByUserId(Integer userId);
-    List<Integer> findRoleIdByUserId(Integer userId);
-    List<Integer> findUserIdByRoleId(Integer roleId);
-    List<FlowUserVo> findAuthorizedUser(String loginId, Integer roleId, String username);
-}

src/main/java/com/nokia/service/Flow/FlowServiceImpl.java → src/main/java/com/nokia/service/FlowService.java

@@ -1,7 +1,7 @@
-package com.nokia.service.Flow;
-
+package com.nokia.service;
 
 import com.nokia.dao.UserDao;
+import com.nokia.pojo.Role;
 import com.nokia.vo.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -9,12 +9,12 @@ import org.springframework.stereotype.Service;
 import java.util.List;
 
 @Service
-public class FlowServiceImpl implements FlowService {
+public class FlowService {
 
     private final UserDao userDao;
 
     @Autowired
-    public FlowServiceImpl(UserDao userDao) {
+    public FlowService(UserDao userDao) {
         this.userDao = userDao;
     }
 
@@ -49,4 +49,8 @@ public class FlowServiceImpl implements FlowService {
     public List<FlowUserVo> findAuthorizedUser(String loginId, Integer roleId, String userName) {
         return userDao.findAuthorizedUser(loginId, roleId, userName);
     }
+
+    public List<Role> getRoleCityByUserId(Integer userId) {
+        return userDao.getRoleCityByUserId(userId);
+    }
 }

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

@@ -1,12 +1,30 @@
 package com.nokia.service;
 
+import java.util.List;
+
 import org.springframework.stereotype.Service;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.nokia.dao.RoleDao;
-import com.nokia.pojo.RoleEntity;
+import com.nokia.pojo.Role;
 
 @Service
-public class RoleService extends ServiceImpl<RoleDao, RoleEntity> {
-    
+public class RoleService extends ServiceImpl<RoleDao, Role> {
+
+    private final RoleDao roleDao;
+
+    public RoleService(RoleDao roleDao) {
+        this.roleDao = roleDao;
+    }
+
+    public Role getByRoleName(String roleName) {
+        Role roleEntity = new Role();
+        roleEntity.setRoleName(roleName);
+        return getOne(Wrappers.query(roleEntity));
+    }
+
+    public List<Role> getRoleNameLike(String roleName) {
+        return roleDao.findRoleNameLike(roleName);
+    }
 }

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

@@ -6,10 +6,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.nokia.dao.CityDao;
 import com.nokia.dao.UserDao;
 import com.nokia.dao.UserRoleDao;
-import com.nokia.pojo.CityEntity;
-import com.nokia.pojo.RoleEntity;
-import com.nokia.pojo.UserEntity;
-import com.nokia.pojo.UserRoleEntity;
+import com.nokia.pojo.City;
+import com.nokia.pojo.Role;
+import com.nokia.pojo.User;
+import com.nokia.pojo.UserRole;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -20,7 +20,7 @@ import java.util.Map;
 import java.util.Set;
 
 @Service
-public class UserService extends ServiceImpl<UserDao, UserEntity> {
+public class UserService extends ServiceImpl<UserDao, User> {
 
     private final UserDao userDao;
     private final UserRoleDao userRoleDao;
@@ -34,18 +34,18 @@ public class UserService extends ServiceImpl<UserDao, UserEntity> {
     }
 
     @Transactional
-    public String add(UserEntity table2User) {
-        UserEntity query = new UserEntity();
+    public String add(User table2User) {
+        User query = new User();
         query.setLoginName(table2User.getLoginName());
-        UserEntity one = baseMapper.selectOne(Wrappers.query(query));
+        User one = baseMapper.selectOne(Wrappers.query(query));
         if (one != null) {
             return "loginName: " + table2User.getLoginName() + " 已存在";
         } else {
             table2User.setCityId(table2User.getCityId());
             baseMapper.insert(table2User);
-            Set<RoleEntity> roleEntityList1 = table2User.getRoles();
-            UserRoleEntity userRoleEntity = new UserRoleEntity();
-            for (RoleEntity role : roleEntityList1) {
+            Set<Role> roleEntityList1 = table2User.getRoles();
+            UserRole userRoleEntity = new UserRole();
+            for (Role role : roleEntityList1) {
                 userRoleEntity.setUserId(table2User.getUserId());
                 userRoleEntity.setRoleId(role.getRoleId());
                 userRoleDao.insert(userRoleEntity);
@@ -58,10 +58,10 @@ public class UserService extends ServiceImpl<UserDao, UserEntity> {
     public String delete(Integer userId) {
         // UserEntity userEntity = baseMapper.selectById(userId);
         /* cityDao.deleteById(userEntity.getCityId()); */
-        QueryWrapper<UserRoleEntity> objectQueryWrapper = new QueryWrapper<>();
+        QueryWrapper<UserRole> objectQueryWrapper = new QueryWrapper<>();
         objectQueryWrapper.eq("user_id", userId);
-        List<UserRoleEntity> userRoleEntities = userRoleDao.selectList(objectQueryWrapper);
-        for (UserRoleEntity userRoleEntity : userRoleEntities) {
+        List<UserRole> userRoleEntities = userRoleDao.selectList(objectQueryWrapper);
+        for (UserRole userRoleEntity : userRoleEntities) {
             Integer id = userRoleEntity.getId();
             userRoleDao.deleteById(id);
         }
@@ -69,50 +69,91 @@ public class UserService extends ServiceImpl<UserDao, UserEntity> {
         return "ok";
     }
 
+    /**
+     * 更新用户
+     * 
+     * @param user
+     * @return
+     */
     @Transactional
-    public String update(UserEntity user) {
+    public boolean update(User user) {
         // 更新user表
         baseMapper.updateById(user);
         // 更新user_role 分为2步
         Integer userId = user.getUserId();
-        QueryWrapper<UserRoleEntity> queryWrapper = new QueryWrapper<>();
+        QueryWrapper<UserRole> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("user_id", userId);
         // 1. 删除原user_role
         userRoleDao.delete(queryWrapper);
         // 2. 添加新的user_role
-        for (RoleEntity role : user.getRoles()) {
-            UserRoleEntity userRoleEntity = new UserRoleEntity();
+        for (Role role : user.getRoles()) {
+            UserRole userRoleEntity = new UserRole();
             userRoleEntity.setUserId(user.getUserId());
             userRoleEntity.setRoleId(role.getRoleId());
             userRoleDao.insert(userRoleEntity);
         }
+        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";
     }
 
-    public UserEntity getByLoginName(String loginName) {
+    /**
+     * 通过用户的登录名获取用户完整信息
+     * 
+     * @param loginName 用户登录名
+     * @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()));
+    }
+
     public Map<String, Object> select(Integer userId) {
         Map<String, Object> hashMap = new HashMap<>();
         if (userId == null) {
             hashMap.put("userId", "为空");
             return hashMap;
         }
-        UserEntity userEntity = baseMapper.selectById(userId);
-        QueryWrapper<UserEntity> userEntityQueryWrapper = new QueryWrapper<>();
+        User userEntity = baseMapper.selectById(userId);
+        QueryWrapper<User> userEntityQueryWrapper = new QueryWrapper<>();
         userEntityQueryWrapper.eq("user_id", userId);
-        UserEntity one = baseMapper.selectOne(userEntityQueryWrapper);
+        User one = baseMapper.selectOne(userEntityQueryWrapper);
         if (one == null) {
             hashMap.put("userId", "不正确");
             return hashMap;
         }
         Integer cityId = userEntity.getCityId();
-        CityEntity cityEntity = cityDao.selectById(cityId);
+        City cityEntity = cityDao.selectById(cityId);
         // 他有两个角色 对 我知道 用for遍历来查 不需要for遍历查
-        QueryWrapper<UserRoleEntity> objectQueryWrapper = new QueryWrapper<>();
+        QueryWrapper<UserRole> objectQueryWrapper = new QueryWrapper<>();
         objectQueryWrapper.eq("user_id", userId);
-        List<UserRoleEntity> userRoleEntities = userRoleDao.selectList(objectQueryWrapper);
+        List<UserRole> userRoleEntities = userRoleDao.selectList(objectQueryWrapper);
         hashMap.put("userEntity", userEntity);
         hashMap.put("cityEntity", cityEntity);
         hashMap.put("userRoleEntities", userRoleEntities);

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

@@ -1,6 +1,6 @@
 package com.nokia.vo;
 
-import com.nokia.pojo.UserEntity;
+import com.nokia.pojo.User;
 import lombok.Data;
 
 /**
@@ -17,10 +17,10 @@ public class DapingUserVo {
     private String province;
     private String city;
 
-    public DapingUserVo(UserEntity userEntity) {
+    public DapingUserVo(User userEntity) {
         this.userId = userEntity.getUserId();
         this.userName = userEntity.getUserName();
-        this.province = userEntity.getProvince();
+        this.province = userEntity.getCity().getProvince();
         this.city = userEntity.getCity().getCityNameZh();
     }
 }

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

@@ -1,6 +1,6 @@
 package com.nokia.vo;
 
-import com.nokia.pojo.UserEntity;
+import com.nokia.pojo.User;
 import lombok.Data;
 
 @Data
@@ -13,11 +13,11 @@ public class FenxiUserVo {
     // city为城市id
     private String city;
 
-    public FenxiUserVo(UserEntity userEntity) {
+    public FenxiUserVo(User userEntity) {
         this.id = userEntity.getUserId();
         this.account = userEntity.getLoginName();
         this.name = userEntity.getUserName();
-        this.status = userEntity.getTsfxPer();
+        this.status = 1;
         this.city = userEntity.getCity().getCityNameZh();
     }
 }

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

@@ -3,7 +3,7 @@ package com.nokia.vo;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.nokia.pojo.UserEntity;
+import com.nokia.pojo.User;
 
 import lombok.Data;
 
@@ -18,10 +18,10 @@ public class HeidiankuUserVo {
     private String city;
     private List<String> roles;
 
-    public HeidiankuUserVo(UserEntity userEntity) {
+    public HeidiankuUserVo(User userEntity) {
         this.loginName = userEntity.getLoginName();
         this.userName = userEntity.getUserName();
-        this.province = userEntity.getProvince();
+        this.province = userEntity.getCity().getProvince();
         this.city = userEntity.getCity().getCityNameZh();
         List<String> roles = new ArrayList<>();
         userEntity.getRoles().forEach(role -> {

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

@@ -1,6 +1,6 @@
 package com.nokia.vo;
 
-import com.nokia.pojo.UserEntity;
+import com.nokia.pojo.User;
 import lombok.Data;
 
 /**
@@ -17,7 +17,7 @@ public class LiuchengUserVo {
     private Integer userId;
     private String userName;
 
-    public LiuchengUserVo(UserEntity userEntity) {
+    public LiuchengUserVo(User userEntity) {
         this.account = userEntity.getLoginName();
         this.userId = userEntity.getUserId();
         this.userName = userEntity.getUserName();

src/main/java/com/nokia/pojo/TokenEntity.java → src/main/java/com/nokia/vo/TokenVo.java

@@ -1,4 +1,4 @@
-package com.nokia.pojo;
+package com.nokia.vo;
 
 import lombok.Data;
 
@@ -8,7 +8,7 @@ import java.io.Serializable;
  * 无用实体类
  */
 @Data
-public class TokenEntity implements Serializable {
+public class TokenVo implements Serializable {
     private String token;
     private String system;
     private String fromSystem;

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

@@ -1,6 +1,6 @@
 package com.nokia.vo;
 
-import com.nokia.pojo.UserEntity;
+import com.nokia.pojo.User;
 import lombok.Data;
 
 @Data
@@ -10,10 +10,10 @@ public class YuceUserVo {
     private String province;
     private Integer city;
 
-    public YuceUserVo(UserEntity userEntity) {
+    public YuceUserVo(User userEntity) {
         this.userId = userEntity.getUserId();
         this.userName = userEntity.getUserName();
-        this.province = userEntity.getProvince();
+        this.province = userEntity.getCity().getProvince();
         this.city = userEntity.getCity().getCityId();
     }
 }

src/main/resources/application.properties

@@ -35,3 +35,5 @@ top.api.fromSystem=dh
 dop.api.fromSystem=dh
 top.redirect.url=https://133.96.90.208/login
 dop.redirect.url=http://133.96.90.210:8089/login
+
+mybatis.mapper-locations=classpath*:mapper/**/**Mapper.xml

src/main/resources/mapper/UserMapper.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.nokia.dao.UserDao">
+    <resultMap id="UserResultMap" type="com.nokia.pojo.User">
+        <id column="user_id" property="userId"></id>
+        <result column="login_name" property="loginName" />
+        <result column="user_name" property="userName" />
+        <result column="phone" property="phone" />
+        <result column="email" property="email" />
+        <result column="city_id" property="cityId" />
+        <result column="district" property="district" />
+        <association property="city" column="city_id">
+            <id column="city_id" property="cityId"></id>
+            <result column="city_name_zh" property="cityNameZh" />
+            <result column="city_name_en" property="cityNameEn" />
+            <result column="ord" property="ord" />
+            <result column="province" property="province" />
+        </association>
+        <collection property="roles" resultMap="RoleResultMap" />
+    </resultMap>
+
+    <resultMap id="RoleResultMap" type="com.nokia.pojo.Role">
+        <id column="role_id" property="roleId"></id>
+        <result column="role_name" property="roleName" />
+        <result column="system" property="system" />
+        <collection property="cities" ofType="int">
+            <result column="role_city_id" property="cityId" />
+        </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>
+
+    <select id="getByLoginName2" 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}
+    </select>
+</mapper>

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

@@ -5,9 +5,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 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.pojo.RoleEntity;
-import com.nokia.pojo.UserEntity;
+import com.nokia.pojo.Role;
+import com.nokia.pojo.User;
 import com.nokia.service.RoleService;
 import com.nokia.service.UserService;
 
@@ -36,15 +38,24 @@ public class UserModifyTest {
     // 修改用户--增加黑点库权限
     @Test
     void test1() {
-        UserEntity user = userService.getByLoginName("test_shijiazhuang");
+        User user = userService.getByLoginName("test_shijiazhuang");
         // RoleEntity role = new RoleEntity();
         // role.setRoleName("黑点库管理");
         // role = roleService.getOne(Wrappers.query(role));
         // user.getRoles().add(role);
-        RoleEntity role2 = new RoleEntity();
+        Role role2 = new Role();
         role2.setRoleName("黑点库查询");
         role2 = roleService.getOne(Wrappers.query(role2));
         user.getRoles().add(role2);
         userService.update(user);
     }
+
+    @Test
+    void test2() {
+        String str = "{\"no\": \"aaa\"}";
+        JSONObject jsonObject = JSON.parseObject(str);
+        System.out.println(jsonObject);
+        Integer integer = jsonObject.getInteger("no");
+        System.out.println(integer);
+    }
 }

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

@@ -1,7 +1,7 @@
 package com.nokia.dao;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.nokia.pojo.CityEntity;
+import com.nokia.pojo.City;
 import com.nokia.vo.FlowOrgVo;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,7 +17,7 @@ public class CityDaoTest {
 
     @Test
     public void test() {
-        List<CityEntity> cities = cityDao.selectList(Wrappers.query());
+        List<City> cities = cityDao.selectList(Wrappers.query());
         System.out.println(cities);
     }
 

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

@@ -6,7 +6,7 @@ import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
-import com.nokia.pojo.RoleEntity;
+import com.nokia.pojo.Role;
 
 @SpringBootTest
 public class RoleDaoTest {
@@ -16,7 +16,13 @@ public class RoleDaoTest {
 
     @Test
     void testFindByUserId() {
-        List<RoleEntity> roles = roleDao.findByUserId(10);
+        List<Role> roles = roleDao.findByUserId(10);
+        System.out.println(roles);
+    }
+
+    @Test
+    void testFindRoleNameLike() {
+        List<Role> roles = roleDao.findRoleNameLike("工单");
         System.out.println(roles);
     }
 }

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

@@ -1,7 +1,7 @@
 package com.nokia.dao;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.nokia.pojo.RoleEntity;
+import com.nokia.pojo.Role;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -15,10 +15,10 @@ public class RoleEntityDaoTest {
 
     @Test
     public void test() {
-        RoleEntity roleEntity = new RoleEntity();
+        Role roleEntity = new Role();
         roleEntity.setRoleName("管理员");
         roleDao.insert(roleEntity);
-        List<RoleEntity> roleEntities = roleDao.selectList(Wrappers.query());
+        List<Role> roleEntities = roleDao.selectList(Wrappers.query());
         System.out.println(roleEntities);
     }
 }

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

@@ -1,6 +1,7 @@
 package com.nokia.dao;
 
-import com.nokia.pojo.UserEntity;
+import com.nokia.pojo.Role;
+import com.nokia.pojo.User;
 import com.nokia.vo.FlowRoleVo;
 import com.nokia.vo.FlowUserVo;
 
@@ -18,7 +19,7 @@ public class UserDaoTest {
 
     @Test
     void testGetByLoinName() {
-        UserEntity usr = userDao.getByLoinName("test_hebei");
+        User usr = userDao.getByLoinName("test_hebei");
         System.out.println(usr);
     }
 
@@ -69,4 +70,16 @@ public class UserDaoTest {
         List<FlowUserVo> flowUserVos = userDao.findAuthorizedUser(null, null, null);
         System.out.println(flowUserVos);
     }
+
+    @Test
+    void testGetByLoginName2() {
+        User user = userDao.getByLoginName2("test_hengshui");
+        System.out.println(user);
+    }
+
+    @Test
+    void testGetRoleCityByUserId() {
+        List<Role> roles = userDao.getRoleCityByUserId(20);
+        System.out.println(roles);
+    }
 }

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

@@ -1,11 +1,9 @@
 package com.nokia.dao;
 
-import com.nokia.pojo.UserRoleEntity;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
-
 @SpringBootTest
 public class UserRoleDaoTest {
 
@@ -13,28 +11,9 @@ public class UserRoleDaoTest {
     private UserRoleDao userRoleDao;
 
     @Test
-    public void insertUserRole() {
-        UserRoleEntity userRoleEntity = new UserRoleEntity();
-        userRoleEntity.setRoleId(4);
-        userRoleEntity.setUserId(3);
-        userRoleDao.insert(userRoleEntity);
-        userRoleEntity.setRoleId(3);
-        userRoleEntity.setUserId(3);
-        userRoleDao.insert(userRoleEntity);
-        userRoleEntity.setRoleId(3);
-        userRoleEntity.setUserId(4);
-        userRoleDao.insert(userRoleEntity);
-        userRoleEntity.setRoleId(3);
-        userRoleEntity.setUserId(1);
-        userRoleDao.insert(userRoleEntity);
-        userRoleEntity.setRoleId(4);
-        userRoleEntity.setUserId(1);
-        userRoleDao.insert(userRoleEntity);
-        userRoleEntity.setRoleId(5);
-        userRoleEntity.setUserId(4);
-        userRoleDao.insert(userRoleEntity);
-        userRoleEntity.setRoleId(6);
-        userRoleEntity.setUserId(2);
-        userRoleDao.insert(userRoleEntity);
+    public void testHasRole() {
+        Integer role_id = userRoleDao.hasRole(2, 4);
+        System.out.println(role_id);
     }
+
 }

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

@@ -0,0 +1,28 @@
+package com.nokia.service;
+
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import com.nokia.pojo.Role;
+
+@SpringBootTest
+public class RoleServiceTest {
+
+    @Autowired
+    private RoleService roleService;
+
+    @Test
+    void testGetByRoleName() {
+        Role role = roleService.getByRoleName("工单答复");
+        System.out.println(role);
+    }
+
+    @Test
+    void testGetRoleNameLike() {
+        List<Role> roles = roleService.getRoleNameLike("工单");
+        System.out.println(roles);
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.nokia.service;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import com.nokia.pojo.Role;
+import com.nokia.pojo.User;
+
+@SpringBootTest
+public class UserServiceTest {
+
+    @Autowired
+    private UserService userService;
+
+    @Autowired
+    private RoleService roleService;
+
+    @Test
+    void testAdd() {
+        User userEntity = new User();
+        userEntity.setLoginName("lizh231");
+        userEntity.setUserName("李志辉");
+    }
+
+    @Test
+    void testDelete() {
+
+    }
+
+    @Test
+    void testGetByLoginName() {
+        User user = userService.getByLoginName("test_abc");
+        System.out.println(user);
+    }
+
+    @Test
+    void testHasRole() {
+        User user = userService.getByLoginName("test_123");
+        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("工单处理(建设处理)");
+        
+    }
+
+    @Test
+    void testSelect() {
+
+    }
+
+    @Test
+    void testUpdate() {
+
+    }
+}