From 89c76ecea2888e80eb04e4c34a4ace3fcc31bbc3 Mon Sep 17 00:00:00 2001
From: hanshaofeng <hanshaofeng@lymsh.com>
Date: Thu, 24 Nov 2016 17:40:03 +0800
Subject: [PATCH] permission2

---
 .../permission/service/OrganizationService.java    |  2 ++
 .../service/impl/OrganizationServiceImpl.java      | 12 ++++++-
 .../main/resources/mainOrm/master/MasterRoles.xml  |  2 +-
 .../operate/web/controller/TestController.java     | 14 ++++++--
 .../operate/web/controller/UsersController.java    | 39 ++++++++++++++++++++++
 5 files changed, 65 insertions(+), 4 deletions(-)

diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/OrganizationService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/OrganizationService.java
index 1e19a1a..af92f7d 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/OrganizationService.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/OrganizationService.java
@@ -27,4 +27,6 @@ public interface OrganizationService {
      * 维护用户机构权限为最新状态，机构新增、修改、删除时执行；用户新增、修改、删除时执行
      */
     public void rebuildDataPermissions(Integer userId);
+
+    public void rebuildDefaultRoles();
 }
\ No newline at end of file
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java
index 625acc5..53a9fa2 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java
@@ -61,6 +61,16 @@ public class OrganizationServiceImpl extends DataAccessLayerService implements O
         return obj.getId();
     }
 
+    @Override
+    public void rebuildDefaultRoles() {
+        OrganizationQuery query = new OrganizationQuery();
+        query.setYn(1);
+        List<Organization> list = masterOrganizationMapper.queryOrganization(query);
+        for (Organization obj:list) {
+            addDefaultRoles(obj);
+        }
+    }
+
     private void addDefaultRoles(Organization obj) {
         List<Roles> rolesList = new ArrayList<>();
         rolesList.add(rolesService.getRoles(87));
@@ -80,7 +90,7 @@ public class OrganizationServiceImpl extends DataAccessLayerService implements O
             roles.setOrgId(obj.getId());
             roles.setModified(new Date());
             roles.setCreated(roles.getModified());
-            roles.setRemarks(obj.getName());
+            roles.setRemarks(obj.getName()+"_"+mapsQuery.getRoleId());
             rolesService.addRoles(roles);
             for (RolePermissionMaps maps:mapsList) {
                 maps.setId(null);
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MasterRoles.xml b/platform-biz-service/src/main/resources/mainOrm/master/MasterRoles.xml
index bae48ff..d6ea985 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/MasterRoles.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterRoles.xml
@@ -145,7 +145,7 @@ select id,type,name,publish_id,publish_name,yn,enable,modified,created,remarks,s
 
 
     <select id="queryRoles" resultMap="RolesResultMap" parameterType="com.lyms.platform.permission.model.RolesQuery">
-        select id,type,name,publish_id,publish_name,yn,enable,modified,created,remarks,shortCode,permissiontype
+        select id,type,name,publish_id,publish_name,yn,enable,modified,created,remarks,shortCode,permissiontype,orgid
         from roles
         <include refid="RolesCondition"/>
         <include refid="orderAndLimit"/>
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
index 85dd40a..171c45f 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
@@ -9,6 +9,7 @@ import com.lyms.platform.common.enums.YnEnums;
 import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.common.utils.JsonUtil;
 import com.lyms.platform.operate.web.service.SyncDataTaskService;
+import com.lyms.platform.permission.service.OrganizationService;
 import com.lyms.platform.pojo.AssayConfig;
 import com.lyms.platform.pojo.Patients;
 import com.lyms.platform.query.PatientsQuery;
@@ -47,8 +48,10 @@ public class TestController {
     @Autowired
     private SyncDataTaskService syncDataTaskService;
     @Autowired
-    private SieveService sieveService
-            ;
+    private SieveService sieveService;
+
+    @Autowired
+    private OrganizationService organizationService;
 
     /**
      * 获取科室
@@ -277,4 +280,11 @@ public class TestController {
         return "update  finish";
     }
 
+    @RequestMapping(value = "/rebuildDefaultRoles", method = RequestMethod.GET)
+    @ResponseBody
+    public String rebuildDefaultRoles() {
+        organizationService.rebuildDefaultRoles();
+        return "sieveOrder finish";
+    }
+
 }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java
index 5483d42..3c62d30 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java
@@ -76,6 +76,45 @@ public class UsersController extends BaseController {
     private static final  String replacePwd = "[$#&/]-+";
 
 
+    public String rebuildUserRoles(@RequestParam(value = "hospitalId")Integer hospitalId) {
+        StringBuffer sb = new StringBuffer();
+        Organization organization = organizationService.getOrganization(hospitalId);
+        if (organization != null) {
+            RolesQuery rolesQuery = new RolesQuery();
+            rolesQuery.setYn(YnEnums.YES.getId());
+            List<Integer> orgids = new ArrayList<>();
+            orgids.add(hospitalId);
+            rolesQuery.setOrgIds(orgids);
+            List<Roles> rolesList = rolesService.queryRoles(rolesQuery);
+            if (rolesList == null || rolesList.size() == 0) {
+                sb.append("机构下权限不存在："+hospitalId);
+            } else {
+                Map<Integer,Roles> rolesMap = new HashMap<>();
+                for (Roles r:rolesList) {
+                    rolesMap.put(Integer.valueOf(r.getRemarks().split("_")[1 ]), r);
+                }
+                UsersQuery usersQuery = new UsersQuery();
+                usersQuery.setOrgId(hospitalId);
+                List<Users> list = usersService.queryUsers(usersQuery);
+                UserRoleMapsQuery mapsQuery = new UserRoleMapsQuery();
+                mapsQuery.setYn(YnEnums.YES.getId());
+                for (Users users : list) {
+                    mapsQuery.setUserId(users.getId());
+                    List<UserRoleMaps> mapsList = userRoleMapsService.queryUserRoleMaps(mapsQuery);
+                    for (UserRoleMaps maps : mapsList) {
+
+                    }
+                }
+            }
+
+
+
+        } else {
+            sb.append("机构不存在："+hospitalId);
+        }
+        return sb.toString();
+    }
+
     /**
      * 获取管理员列表
      */
-- 
1.8.3.1