gaodd 1 рік тому
батько
коміт
ed303ac954

+ 8 - 0
src/main/java/com/chinaitop/depot/system/controller/UserRoleController.java

@@ -56,5 +56,13 @@ public class UserRoleController {
56 56
 		
57 57
 		return userRoleService.getUserRoleFeign(userId);
58 58
 	}
59
+	
60
+	/**
61
+	 * 给 特定的账号 赋予 管理员的角色
62
+	 */
63
+	@RequestMapping(value="/addRoleToUser", method=RequestMethod.GET)
64
+	public void addRoleToUser() {
65
+		 userRoleService.addRoleToUser();
66
+	}
59 67
 
60 68
 }

+ 2 - 0
src/main/java/com/chinaitop/depot/system/service/UserRoleService.java

@@ -16,4 +16,6 @@ public interface UserRoleService {
16 16
 
17 17
 	List<Map<String, String>> getUserRoleFeign(Integer userId);
18 18
 
19
+	void addRoleToUser();
20
+
19 21
 }

+ 29 - 3
src/main/java/com/chinaitop/depot/system/service/impl/OrgInfoServiceImpl.java

@@ -9,7 +9,6 @@ import javax.annotation.Resource;
9 9
 
10 10
 import org.apache.commons.lang.StringUtils;
11 11
 import org.springframework.beans.factory.annotation.Value;
12
-import org.springframework.context.annotation.Bean;
13 12
 import org.springframework.stereotype.Service;
14 13
 import org.springframework.util.LinkedMultiValueMap;
15 14
 import org.springframework.util.MultiValueMap;
@@ -19,8 +18,6 @@ import com.chinaitop.depot.system.mapper.OrgInfoMapper;
19 18
 import com.chinaitop.depot.system.model.OrgInfo;
20 19
 import com.chinaitop.depot.system.model.OrgInfoExample;
21 20
 import com.chinaitop.depot.system.service.OrgInfoService;
22
-import com.fasterxml.jackson.core.JsonProcessingException;
23
-import com.fasterxml.jackson.databind.ObjectMapper;
24 21
 
25 22
 @Service
26 23
 public class OrgInfoServiceImpl implements OrgInfoService {
@@ -60,6 +57,8 @@ public class OrgInfoServiceImpl implements OrgInfoService {
60 57
 		
61 58
 		this.gjjjk(orgInfo.getOrgId(), orgInfo.getOrgId(), "i");
62 59
 		
60
+		this.gjjwjjk(orgInfo.getOrgId(), orgInfo.getOrgId(), "i");
61
+		
63 62
 	}
64 63
 
65 64
 	@Override
@@ -71,6 +70,8 @@ public class OrgInfoServiceImpl implements OrgInfoService {
71 70
 		 * 国家局数据
72 71
 		 */
73 72
 		this.gjjjk(orgInfo.getOrgId(), orgInfo.getOrgId(), "u");
73
+		
74
+		this.gjjwjjk(orgInfo.getOrgId(), orgInfo.getOrgId(), "u");
74 75
 	}
75 76
 
76 77
 	@Override
@@ -83,6 +84,9 @@ public class OrgInfoServiceImpl implements OrgInfoService {
83 84
 		 */
84 85
 		
85 86
 		this.gjjjk(orgId, orgId, "d");
87
+		
88
+		this.gjjwjjk(orgId, orgId, "d");
89
+		
86 90
 	}
87 91
 
88 92
 	@Override
@@ -239,4 +243,26 @@ public class OrgInfoServiceImpl implements OrgInfoService {
239 243
            
240 244
     	
241 245
        }
246
+       
247
+       public void gjjwjjk(Integer id, Integer orgId,String czbz) {
248
+           
249
+     	  String tableName = "ODS_UP_WJXXJK";
250
+    		/**
251
+             * restTemplate调用
252
+             */
253
+            //String url = "http://localhost:9022/recPublish/sendMessage";//
254
+            //发送post请求,并打印结果,以String类型接收响应结果JSON字符串
255
+    		
256
+            MultiValueMap<String, Object> sendMap = new LinkedMultiValueMap<>();
257
+    		sendMap.add("tableName", tableName);
258
+    		sendMap.add("czbz", czbz);
259
+    		sendMap.add("ywId", id);
260
+    		sendMap.add("orgId", orgId);
261
+
262
+         restTemplate.postForObject(jsgjjsjUrl, sendMap, String.class);
263
+            
264
+     	
265
+        }
266
+
267
+	
242 268
 }

+ 98 - 0
src/main/java/com/chinaitop/depot/system/service/impl/UserRoleServiceImpl.java

@@ -1,8 +1,21 @@
1 1
 package com.chinaitop.depot.system.service.impl;
2 2
 
3
+import com.chinaitop.depot.system.mapper.FuncInfoMapper;
4
+import com.chinaitop.depot.system.mapper.RoleFuncMapper;
5
+import com.chinaitop.depot.system.mapper.RoleInfoMapper;
6
+import com.chinaitop.depot.system.mapper.UserInfoMapper;
3 7
 import com.chinaitop.depot.system.mapper.UserRoleMapper;
8
+import com.chinaitop.depot.system.model.FuncInfo;
9
+import com.chinaitop.depot.system.model.FuncInfoExample;
10
+import com.chinaitop.depot.system.model.RoleFunc;
11
+import com.chinaitop.depot.system.model.RoleFuncExample;
12
+import com.chinaitop.depot.system.model.RoleInfo;
13
+import com.chinaitop.depot.system.model.RoleInfoExample;
14
+import com.chinaitop.depot.system.model.UserInfo;
15
+import com.chinaitop.depot.system.model.UserInfoExample;
4 16
 import com.chinaitop.depot.system.model.UserRole;
5 17
 import com.chinaitop.depot.system.model.UserRoleExample;
18
+import com.chinaitop.depot.system.model.RoleInfoExample.Criteria;
6 19
 import com.chinaitop.depot.system.service.UserRoleService;
7 20
 import org.springframework.stereotype.Service;
8 21
 
@@ -15,6 +28,18 @@ public class UserRoleServiceImpl implements UserRoleService {
15 28
 	
16 29
 	@Resource
17 30
 	private UserRoleMapper userRoleMapper;
31
+	
32
+	@Resource
33
+	private UserInfoMapper UserInfoMapper;
34
+	
35
+	@Resource
36
+	private RoleInfoMapper RoleInfoMapper;
37
+	
38
+	@Resource
39
+	private FuncInfoMapper funcInfoMapper;
40
+	
41
+	@Resource
42
+	private RoleFuncMapper roleFuncMapper;
18 43
 
19 44
 	@Override
20 45
 	public List<UserRole> queryByExample(UserRoleExample example) {
@@ -41,4 +66,77 @@ public class UserRoleServiceImpl implements UserRoleService {
41 66
 		return userRoleMapper.getUserRoleFeign(userId);
42 67
 	}
43 68
 
69
+	@Override
70
+	public void addRoleToUser() {
71
+		// TODO Auto-generated method stub
72
+		
73
+		//查询出 手动增加的 用户的信息
74
+		UserInfoExample example = new UserInfoExample();
75
+		example.createCriteria().andUserIdGreaterThanOrEqualTo(10);
76
+		example.createCriteria().andUserIdLessThanOrEqualTo(72);
77
+		List<UserInfo> userInfoList = UserInfoMapper.selectByExample(example);
78
+		
79
+		
80
+		//所有的权限信息
81
+		FuncInfoExample funcExample = new FuncInfoExample();
82
+		List<FuncInfo> funcInfoList = funcInfoMapper.selectByExample(funcExample);
83
+	  
84
+		for(UserInfo userInfo:userInfoList){
85
+			//查询 改单位下的 管理员 角色的  id
86
+			
87
+			RoleInfoExample example1 = new RoleInfoExample();
88
+			Criteria criteria1 = example1.createCriteria();
89
+			criteria1.andRoleNameEqualTo("系统管理员");
90
+			criteria1.andOrgIdEqualTo(userInfo.getOrgId());
91
+			List<RoleInfo> roleInfoList = RoleInfoMapper.selectByExample(example1);
92
+			
93
+			if(roleInfoList.size()>0){
94
+				/**
95
+				 * 人员加角色
96
+				 */
97
+				//查询 该人员 有没有该角色  有 不处理  无 则增加
98
+				UserRoleExample example2 = new UserRoleExample();
99
+				com.chinaitop.depot.system.model.UserRoleExample.Criteria criteria2 = example2.createCriteria();
100
+				criteria2.andRoleIdEqualTo(roleInfoList.get(0).getRoleId());
101
+				criteria2.andUserIdEqualTo(userInfo.getUserId());
102
+				List<UserRole> userRoleList = userRoleMapper.selectByExample(example2);
103
+				if(userRoleList.size()>0){
104
+				
105
+				}else{
106
+					UserRole userRole = new UserRole();
107
+					userRole.setUserId(userInfo.getUserId());
108
+					userRole.setRoleId(roleInfoList.get(0).getRoleId());
109
+					userRoleMapper.insert(userRole);
110
+				}
111
+				
112
+				/**
113
+				 * 角色 加 权限
114
+				 */
115
+				//查询 该角色 有没有该权限  有 不处理  无 则增加
116
+				
117
+				for(FuncInfo funcInfo:funcInfoList){
118
+					RoleFuncExample example3 = new RoleFuncExample();
119
+					com.chinaitop.depot.system.model.RoleFuncExample.Criteria criteria3 = example3.createCriteria();
120
+					criteria3.andRoleIdEqualTo(roleInfoList.get(0).getRoleId());
121
+					criteria3.andFuncIdEqualTo(funcInfo.getFuncId());
122
+					List<RoleFunc> roleFuncList = roleFuncMapper.selectByExample(example3); 
123
+					if(roleFuncList.size()>0){
124
+						
125
+					}else{
126
+						RoleFunc roleFunc = new RoleFunc();
127
+						roleFunc.setFuncId(funcInfo.getFuncId());
128
+						roleFunc.setRoleId(roleInfoList.get(0).getRoleId());
129
+						roleFuncMapper.insert(roleFunc);
130
+					}
131
+				}
132
+				
133
+			}
134
+		}
135
+		
136
+		
137
+		
138
+		
139
+		
140
+	}
141
+
44 142
 }