|
|
@@ -19,10 +19,15 @@ import com.fasterxml.jackson.databind.ObjectMapper;
|
|
19
|
19
|
import com.github.pagehelper.PageHelper;
|
|
20
|
20
|
import com.github.pagehelper.PageInfo;
|
|
21
|
21
|
|
|
|
22
|
+import io.swagger.annotations.ApiImplicitParam;
|
|
|
23
|
+import io.swagger.annotations.ApiImplicitParams;
|
|
|
24
|
+import io.swagger.annotations.ApiOperation;
|
|
|
25
|
+
|
|
22
|
26
|
import org.apache.commons.lang.ObjectUtils;
|
|
23
|
27
|
import org.apache.commons.lang3.StringUtils;
|
|
24
|
28
|
import org.springframework.beans.factory.annotation.Value;
|
|
25
|
29
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
30
|
+import org.springframework.web.bind.annotation.RequestMethod;
|
|
26
|
31
|
import org.springframework.web.bind.annotation.RestController;
|
|
27
|
32
|
|
|
28
|
33
|
import javax.annotation.Resource;
|
|
|
@@ -129,6 +134,47 @@ public class RoleInfoController {
|
|
129
|
134
|
}
|
|
130
|
135
|
return roleInfo;
|
|
131
|
136
|
}
|
|
|
137
|
+
|
|
|
138
|
+ /**
|
|
|
139
|
+ * 验证角色名称是否可用
|
|
|
140
|
+ * @param roleName 角色名称
|
|
|
141
|
+ * @param roleId 角色id
|
|
|
142
|
+ * @param status 类型:1 粮库、2 出入库
|
|
|
143
|
+ * @return
|
|
|
144
|
+ */
|
|
|
145
|
+ @RequestMapping(value="/validRoleName", method = RequestMethod.GET)
|
|
|
146
|
+ @ApiOperation(value="验证角色名称", notes = "验证角色名称是否可用")
|
|
|
147
|
+ @ApiImplicitParams({
|
|
|
148
|
+ @ApiImplicitParam(name = "roleName", value = "移动端类型", paramType = "query"),
|
|
|
149
|
+ @ApiImplicitParam(name = "roleId", value = "角色id", paramType = "query"),
|
|
|
150
|
+ @ApiImplicitParam(name = "status", value = "类型:1 粮库、2 出入库", paramType = "query")
|
|
|
151
|
+ })
|
|
|
152
|
+ public Boolean validRoleName(String roleName,String roleId, String status) {
|
|
|
153
|
+ if("1".equals(status)) {
|
|
|
154
|
+ return roleInfoService.validRoleName(roleName,roleId);
|
|
|
155
|
+ }else {
|
|
|
156
|
+ try {
|
|
|
157
|
+ if("正常".equals(NetStateUtil.connectingAddress(wsdlUrl))) {
|
|
|
158
|
+ ExchangeServer wb = new ExchangeServer();
|
|
|
159
|
+ IExchangeService action = wb.getExchangeServiceImplPort();
|
|
|
160
|
+ //获取系统所有角色
|
|
|
161
|
+ String roles = action.getAllRoles(FLATID, KEY);
|
|
|
162
|
+ JSONObject obj = JSONObject.parseObject(roles);
|
|
|
163
|
+ String result = obj.getString("result");
|
|
|
164
|
+ JSONArray data = JSONArray.parseArray(result);
|
|
|
165
|
+ for(int i=0;i<data.size();i++) {
|
|
|
166
|
+ Map<String,Object> map = (Map<String,Object>)data.get(i);
|
|
|
167
|
+ if(ObjectUtils.toString(map.get("roleName"),"").equals(roleName) && !ObjectUtils.toString(map.get("roleId"),"").equals(roleId)) {
|
|
|
168
|
+ return false;
|
|
|
169
|
+ }
|
|
|
170
|
+ }
|
|
|
171
|
+ }
|
|
|
172
|
+ }catch (Exception e) {
|
|
|
173
|
+ e.printStackTrace();
|
|
|
174
|
+ }
|
|
|
175
|
+ return true;
|
|
|
176
|
+ }
|
|
|
177
|
+ }
|
|
132
|
178
|
|
|
133
|
179
|
/**
|
|
134
|
180
|
* 保存角色信息
|