。。。

src/main/java/com/chinaitop/depot/system/controller/RoleInfoController.java

@@ -26,6 +26,7 @@ import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -95,7 +96,7 @@ public class RoleInfoController {
 		PageInfo<RoleInfo> pageInfo = null;
 		try {
 			if(parentId == 0) {//是顶级机构，则获取出入库的角色信息
-				if("正常".equals(NetStateUtil.connectingAddress(wsdlUrl))) {
+				/*if("正常".equals(NetStateUtil.connectingAddress(wsdlUrl))) {
 					ExchangeServer wb = new ExchangeServer();
 					IExchangeService action = wb.getExchangeServiceImplPort();
 					//获取系统所有角色
@@ -112,7 +113,7 @@ public class RoleInfoController {
 						roleInfo.setRoleId(100+i);
 						list.add(roleInfo);
 					}
-				}
+				}*/
 			}
 		} finally {
 			pageInfo = new PageInfo<RoleInfo>(list);
@@ -126,7 +127,7 @@ public class RoleInfoController {
 	 * @param roleId	角色编号
 	 * @return	RoleInfo 角色信息
 	 */
-	@RequestMapping(value="/edit")
+	@RequestMapping(value="/edit",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
 	public RoleInfo edit(Integer roleId) {
 		RoleInfo roleInfo = new RoleInfo();
 		if (roleId != null) {
@@ -154,7 +155,7 @@ public class RoleInfoController {
 			return roleInfoService.validRoleName(roleName,roleId);
 		}else {
 			try {
-				if("正常".equals(NetStateUtil.connectingAddress(wsdlUrl))) {
+				/*if("正常".equals(NetStateUtil.connectingAddress(wsdlUrl))) {
 					ExchangeServer wb = new ExchangeServer();
 					IExchangeService action = wb.getExchangeServiceImplPort();
 					//获取系统所有角色
@@ -168,7 +169,7 @@ public class RoleInfoController {
 							return false;
 						}
 					}
-				}
+				}*/
 			}catch (Exception e) {
 				e.printStackTrace();
 			}
@@ -309,7 +310,7 @@ public class RoleInfoController {
 		}
 		
 		//追加出入库的角色信息
-		if("正常".equals(NetStateUtil.connectingAddress(wsdlUrl))) {
+		/*if("正常".equals(NetStateUtil.connectingAddress(wsdlUrl))) {
 			try {
 				ExchangeServer wb = new ExchangeServer();
 				IExchangeService action = wb.getExchangeServiceImplPort();
@@ -329,7 +330,7 @@ public class RoleInfoController {
 			} catch (Exception e) {
 				e.printStackTrace();
 			}
-		}
+		}*/
 		
 		modelMap.put("roleList", voList);
 		modelMap.put("roleNameObj", roleNameObj);
@@ -343,7 +344,7 @@ public class RoleInfoController {
 		List<Map<String, Object>> funcList = new ArrayList<Map<String, Object>>();
 		List<Map<String, Object>> btnList = new ArrayList<Map<String, Object>>();
 		//追加出入库的角色信息
-		if("正常".equals(NetStateUtil.connectingAddress(wsdlUrl))) {
+		/*if("正常".equals(NetStateUtil.connectingAddress(wsdlUrl))) {
 			try {
 				ExchangeServer wb = new ExchangeServer();
 				IExchangeService action = wb.getExchangeServiceImplPort();
@@ -371,7 +372,7 @@ public class RoleInfoController {
 			} catch (Exception e) {
 				e.printStackTrace();
 			}
-		}
+		}*/
 		modelMap.put("funcList", funcList);
 		modelMap.put("btnList", btnList);
 		return modelMap;
@@ -420,5 +421,14 @@ public class RoleInfoController {
 		modelMap.put("status", status.equals("1") ? "success":"fail");
 		return modelMap;
 	}
-
+	
+	/**
+	 * 增加基础的 角色到表里
+	 */
+	@RequestMapping(value="/addBasicRole")
+	public void addBasicRole() {
+		roleInfoService.addBasicRole();
+		
+	}
+	
 }

src/main/java/com/chinaitop/depot/system/service/RoleInfoService.java

@@ -55,4 +55,6 @@ public interface RoleInfoService {
 	 */
 	boolean validRoleName(String roleName,String roleId);
 
+	void addBasicRole();
+
 }

src/main/java/com/chinaitop/depot/system/service/impl/RoleInfoServiceImpl.java

@@ -1,21 +1,37 @@
 package com.chinaitop.depot.system.service.impl;
 
+import com.chinaitop.depot.system.mapper.OrgInfoMapper;
 import com.chinaitop.depot.system.mapper.RoleInfoMapper;
+import com.chinaitop.depot.system.model.OrgInfo;
+import com.chinaitop.depot.system.model.OrgInfoExample;
 import com.chinaitop.depot.system.model.RoleInfo;
 import com.chinaitop.depot.system.model.RoleInfoExample;
 import com.chinaitop.depot.system.model.RoleInfoExample.Criteria;
 import com.chinaitop.depot.system.service.RoleInfoService;
+import com.github.andrewoma.dexx.collection.ArrayList;
+import com.github.pagehelper.PageHelper;
+
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+
+import java.util.Date;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
+
 @Service
 public class RoleInfoServiceImpl implements RoleInfoService {
 	
 	@Resource
 	private RoleInfoMapper RoleInfoMapper;
+	
+	@Resource
+	private OrgInfoMapper orgInfoMapper;
+	
+	
 
 	@Override
 	public List<RoleInfo> queryByExample(RoleInfoExample example) {
@@ -67,4 +83,58 @@ public class RoleInfoServiceImpl implements RoleInfoService {
 		return true;
 	}
 
+	
+	@Override
+	public void addBasicRole() {
+		// TODO Auto-generated method stub
+		//查询所有的粮库
+		OrgInfoExample example = new OrgInfoExample();
+		com.chinaitop.depot.system.model.OrgInfoExample.Criteria criteria =   example.createCriteria();
+		criteria.andOrgClassIdEqualTo(5318);//粮库
+		List<OrgInfo> list = orgInfoMapper.selectByExample(example);
+		
+		// 所有的角色
+		/**
+		 *  经营人员
+			经营部经理
+			库领导
+			保管员
+			仓储人员
+			仓储部经理
+			系统管理员
+			总经理
+			经理
+			副经理
+			会计
+			出纳
+			秘书
+		 */
+		List<String> roleList = new LinkedList<String>();
+		roleList.add("经营人员");
+		roleList.add("经营部经理");
+		roleList.add("库领导");
+		roleList.add("保管员");
+		roleList.add("仓储人员");
+		roleList.add("仓储部经理");
+		roleList.add("系统管理员");
+		roleList.add("总经理");
+		roleList.add("经理");
+		roleList.add("副经理");
+		roleList.add("会计");
+		roleList.add("出纳");
+		roleList.add("秘书");
+		
+		
+		for(OrgInfo orgInfo:list){
+			
+			for(String roleName:roleList){
+				RoleInfo roleInfo = new RoleInfo();
+				roleInfo.setRoleName(roleName);
+				roleInfo.setOrgId(orgInfo.getOrgId());
+				RoleInfoMapper.insertSelective(roleInfo);
+			}
+		}
+		
+	}
+
 }