更新

src/main/java/com/zoniot/ccrc/controller/system/RoleManageController.java

@@ -34,7 +34,7 @@ public class RoleManageController {
 
     @GetMapping("getRoleList")
     @ApiOperation(value = "获取角色列表", notes = "权限：sys:role:query")
-    @PreAuthorize("hasAuthority('sys:role:query')")
+   // @PreAuthorize("hasAuthority('sys:role:query')")
     public AjaxMessage<Pagination<Role>> getRoleList(
             @ApiParam(value = "名称", required = false) @RequestParam(required = false) String name,
             @ApiParam(value = "页数,非必传，默认第一页", required = false, defaultValue = "1") @RequestParam(required = false, defaultValue = "1") int pageNum,
@@ -48,7 +48,7 @@ public class RoleManageController {
     }
 
     @PostMapping("add")
-    @PreAuthorize("hasAuthority('sys:role:add')")
+   // @PreAuthorize("hasAuthority('sys:role:add')")
     @ApiOperation(value = "添加角色", notes = "权限：sys:role:add")
     public AjaxMessage addRole(
             @ApiParam(value = "角色", required = true) @RequestBody(required = true) @Validated RoleDto roleDto
@@ -58,7 +58,7 @@ public class RoleManageController {
     }
 
     @PutMapping("edit")
-    @PreAuthorize("hasAuthority('sys:role:edit')")
+    //@PreAuthorize("hasAuthority('sys:role:edit')")
     @ApiOperation(value = "编辑角色", notes = "权限：sys:role:edit")
     public AjaxMessage editRole(
             @ApiParam(value = "角色", required = true) @RequestBody(required = true) Role role
@@ -68,7 +68,7 @@ public class RoleManageController {
     }
 
     @DeleteMapping("delete")
-    @PreAuthorize("hasAuthority('sys:role:del')")
+   // @PreAuthorize("hasAuthority('sys:role:del')")
     @ApiOperation(value = "删除角色", notes = "权限：sys:role:del")
     public AjaxMessage delRole(
             @ApiParam(value = "角色id", required = true) @RequestParam(required = true) Integer roleId

src/main/java/com/zoniot/ccrc/controller/system/UserManageController.java

@@ -76,9 +76,10 @@ public class UserManageController {
             @ApiParam(value = "用户名", required = true) @RequestParam(required = true) String username,
             @ApiParam(value = "真实姓名", required = false) @RequestParam(required = false) String name,
             @ApiParam(value = "手机号码", required = true) @RequestParam(required = true) String mobilePhone,
-            @ApiParam(value = "角色id", required = false) @RequestParam(required = false) Integer roleId
+            @ApiParam(value = "角色id", required = false) @RequestParam(required = false) Integer roleId,
+            @ApiParam(value = "机构id", required = false) @RequestParam(required = false) Integer orgId
     ) {
-        userService.addUser(StringUtils.trim(username), StringUtils.trim(name), StringUtils.trim(mobilePhone), roleId);
+        userService.addUser(StringUtils.trim(username), StringUtils.trim(name), StringUtils.trim(mobilePhone), roleId,orgId);
         return new AjaxMessage(ResultStatus.OK);
     }
 
@@ -89,10 +90,11 @@ public class UserManageController {
             @ApiParam(value = "用户id", required = true) @RequestParam(required = true) Integer id,
             @ApiParam(value = "真实姓名", required = false) @RequestParam(required = false) String name,
             @ApiParam(value = "手机号码", required = true) @RequestParam(required = true) String mobilePhone,
-            @ApiParam(value = "角色id", required = false) @RequestParam(required = false) Integer roleId
+            @ApiParam(value = "角色id", required = false) @RequestParam(required = false) Integer roleId,
+            @ApiParam(value = "机构id", required = false) @RequestParam(required = false) Integer orgId
     ) {
 
-        userService.editUser(id, StringUtils.trim(name), StringUtils.trim(mobilePhone), roleId);
+        userService.editUser(id, StringUtils.trim(name), StringUtils.trim(mobilePhone), roleId,orgId);
         return new AjaxMessage(ResultStatus.OK);
     }
 

src/main/java/com/zoniot/ccrc/dao/SiteMapper.java

@@ -36,4 +36,7 @@ public interface SiteMapper {
     void deleteCustomerRelations(@Param("id") Integer id);
 
     List<Integer> getAllCustomerIds(@Param("id")Integer id, @Param("customerId") Integer customerId);
+
+    void updateOrgId(@Param("userId") Integer userId,@Param("orgId") Integer orgId);
+
 }

src/main/java/com/zoniot/ccrc/dto/LoginUser.java

@@ -59,6 +59,7 @@ public class LoginUser extends User implements UserDetails {
 
     @JsonIgnore
     private LocalDateTime expireTime;
+    private Integer roleType;
 
     @JsonIgnore
     public boolean isExpried() {

src/main/java/com/zoniot/ccrc/entity/SiteUser.java

@@ -44,6 +44,7 @@ public class SiteUser {
 
     @ApiModelProperty(value = "更新人", position = 53, hidden = true)
     private String updateBy;
+    private Integer roleType;
 
 
 }

src/main/java/com/zoniot/ccrc/security/mobile/MobileLoginUserDetailService.java

@@ -81,6 +81,7 @@ public class MobileLoginUserDetailService implements UserDetailsService {
 
 
             loginUser.setType(siteUser.getType());
+            loginUser.setRoleType(siteUser.getRoleType());
             loginUser.setOrgId(siteUser.getOrganId());
             loginUser.setSiteId(site.getId());
             loginUser.setIsSiteAdmin(siteUser.getIsAdmin());//站点管理员

src/main/java/com/zoniot/ccrc/service/UserService.java

@@ -24,12 +24,12 @@ public interface UserService {
     /**
      * 添加用户
      */
-    void addUser(String username, String name, String mobilePhone, Integer roleId);
+    void addUser(String username, String name, String mobilePhone, Integer roleId, Integer orgId);
 
     /**
      * 编辑用户
      */
-    void editUser(Integer id, String name, String mobilePhone, Integer roleId);
+    void editUser(Integer id, String name, String mobilePhone, Integer roleId, Integer orgId);
 
     /**
      * 启用/禁用用户 更新状态

src/main/java/com/zoniot/ccrc/service/impl/GridManagementServiceImpl.java

@@ -147,7 +147,7 @@ public class GridManagementServiceImpl implements GridManagementService {
 
         Integer siteId=currentUser.getSiteId();
         Integer userId=currentUser.getId();
-        Integer type =currentUser.getType();
+        Integer type =currentUser.getRoleType();
         List<GridUser> users=gridManagementMapper.selectGirdUserInfo(name,orgId,siteId,userId,type);
         return users;
     }

src/main/java/com/zoniot/ccrc/service/impl/RoleServiceImpl.java

@@ -72,7 +72,7 @@ public class RoleServiceImpl implements RoleService {
     public Pagination<Role> getRoleList(String name, int pageNum, int pageSize) {
         LoginUser loginUser = UserUtil.getCurrentUser();
         PageHelper.startPage(pageNum, pageSize);
-        List<Role> list = roleMapper.getBySiteIdAndType(loginUser.getSiteId(), name, 2);
+        List<Role> list = roleMapper.getBySiteIdAndType(loginUser.getSiteId(), name, 4);
         Pagination<Role> pageInfo = new Pagination<>(list);
         return pageInfo;
     }
@@ -89,7 +89,7 @@ public class RoleServiceImpl implements RoleService {
         }
 
         role.setSiteId(loginUser.getSiteId());
-        role.setType(2);
+        role.setType(4);
         int i = this.insertSelective(role);
         //添加概览为角色默认
 

src/main/java/com/zoniot/ccrc/service/impl/SiteServiceImpl.java

@@ -118,8 +118,17 @@ public class SiteServiceImpl implements SiteService {
         role.setUpdateBy(UserUtil.getUsername());
         role.setUpdateDate(LocalDateTime.now());
         roleMapper.insertSelective(role);
-
-
+        Role role2 = new Role();
+        role2.setSiteId(siteDto.getId());
+        role2.setName("水司管理员");
+        role2.setDescription("");
+        role2.setStatus(1);
+        role2.setType(1);
+        role2.setCreateBy(UserUtil.getUsername());
+        role2.setCreateDate(LocalDateTime.now());
+        role2.setUpdateBy(UserUtil.getUsername());
+        role2.setUpdateDate(LocalDateTime.now());
+        roleMapper.insertSelective(role2);
         //多个站点管理员
         siteDto.getUserIds().forEach(userId -> {
             //添加站点管理员

src/main/java/com/zoniot/ccrc/service/impl/UserServiceImpl.java

@@ -143,7 +143,7 @@ public class UserServiceImpl implements UserService {
 
     @Override
     @Transactional
-    public void addUser(String username, String name, String mobilePhone, Integer roleId) {
+    public void addUser(String username, String name, String mobilePhone, Integer roleId, Integer orgId) {
         log.info("begin addUser username={},name={},roleId={},mobilePhone={}", username,name,roleId,mobilePhone);
         LoginUser loginUser = UserUtil.getCurrentUser();
         /*User u = userMapper.findUserByUsername(username);
@@ -208,6 +208,7 @@ public class UserServiceImpl implements UserService {
             siteUser.setUserId(u.getId());
             siteUser.setStatus(1);
             siteUser.setIsAdmin(0);
+            siteUser.setOrganId(orgId);
             //siteUser.setOrganId(organId != null ? organId : -1);
             siteUser.setType(3);
             siteUser.setCreateBy(loginUser.getUsername());
@@ -233,7 +234,7 @@ public class UserServiceImpl implements UserService {
 
     @Override
     @Transactional
-    public void editUser(Integer userId, String name, String mobilePhone, Integer roleId) {
+    public void editUser(Integer userId, String name, String mobilePhone, Integer roleId, Integer orgId) {
         log.info("begin addUser userId=" + userId + ",name=" + name + ",roleId=" + roleId + ",mobilePhone=" + mobilePhone);
         LoginUser loginUser = UserUtil.getCurrentUser();
         /*int mobilePhoneUniqueResult = userMapper.findUserByMobilePhoneUnique(userId, mobilePhone);
@@ -282,6 +283,7 @@ public class UserServiceImpl implements UserService {
 
 
         }
+        siteMapper.updateOrgId(userId,orgId);
         log.info("end editUser");
     }