git-svn-id: https://192.168.57.71/svn/hbghj@104 201dd7a2-ec1b-f84b-8b06-88221118ff88

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/auth/AuthenticateController.java

@@ -49,6 +49,7 @@ import com.jtgh.yjpt.common.Utils;
 import com.jtgh.yjpt.controller.BaseController;
 import com.jtgh.yjpt.entity.BaseEntity;
 import com.jtgh.yjpt.entity.aqpjjgxx.AqpjjgxxEntity;
+import com.jtgh.yjpt.entity.auth.RoleEntity;
 import com.jtgh.yjpt.entity.auth.UserEntity;
 import com.jtgh.yjpt.entity.common.CodeEntity;
 import com.jtgh.yjpt.entity.common.JsfxxwhEntity;
@@ -538,5 +539,52 @@ public class AuthenticateController extends BaseController {
 	}
 		
 	
+	 /**
+     * 用户权限：系统管理员、省级行政人员、市级行政人员、县级行政人员、企业用户
+     */
+	public BusinessContext UserAuth(){
+		BusinessContext bc = new BusinessContext();
+		String rtnStr = "";
+		
+		UserEntity user = authenticateService.checkSession();
+		 
+		if(user.getSfjyr().equals("Y")){
+			rtnStr = "企业用户";
+		}
+		else{
+			
+			//判断是否管理员
+			Boolean isAdmin  = false;
+		    List<RoleEntity> roleList = user.getRoles();
+		    for(RoleEntity role : roleList){
+		    	if(role.getName().equals("admin"))
+		    		isAdmin = true;
+		    }
+		    if(isAdmin){
+		    	rtnStr = "系统管理员";
+		    }
+		    else{
+		    	//------行政人员
+		    	//判断所在地深度：省、市、县
+		    	CodeEntity parentSzd = user.getSzd().getParent();
+		    	if(parentSzd!=null){
+		    		if(parentSzd.getParent()==null){
+		    			rtnStr="市级行政人员";
+		    		}
+		    		else{
+		    			rtnStr="县级行政人员";
+		    		}
+		    	}
+		    	else{
+		    		//parent 为null 省级
+		    		rtnStr ="省级行政人员";
+		    	}//end if else
+		    }
+		}
+		
+		bc.setResult(rtnStr); 
+		return bc;
+	}
+	
 }
 

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/common/CodeController.java

@@ -17,6 +17,7 @@ import com.jtgh.yjpt.common.PredicateModel;
 import com.jtgh.yjpt.common.SpecificationCreater;
 import com.jtgh.yjpt.common.servlet.InitServlet;
 import com.jtgh.yjpt.controller.BaseController;
+import com.jtgh.yjpt.entity.auth.UserEntity;
 import com.jtgh.yjpt.entity.common.CodeEntity;
 import com.jtgh.yjpt.service.common.CodeService;
 
@@ -252,4 +253,5 @@ public class CodeController extends BaseController {
 		}
 		return bc;
 	}
+	
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/jyr/JyrController.java

@@ -469,6 +469,15 @@ public class JyrController extends BaseController {
 				}
 			}
 		}
+		
+		//判断经营人名称是否已存在 
+		Boolean isExist = service.IsExistJyrName(jyrEntity);//不存在为true 存在false 
+		if(!isExist) {
+			bContext.addMsg("jyr.gkjyr.exist", "jlrxxgl", MsgLevel.ERROR);//存在，check失败
+			return bContext;
+		}
+	 
+		
 		//保存
 		jyrEntity = service.save(jyrEntity, dc_add_list, dc_del_list,
 				bw_add_list, bw_del_list, ckList, delCkList);
@@ -1663,5 +1672,6 @@ public class JyrController extends BaseController {
 		}
 		return null;
 	}
-
+	
+	  
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/dao/jyr/JyrDao.java

@@ -299,6 +299,10 @@ public interface JyrDao extends MyRepository<JyrEntity, Long> {
 
 	@Query("from JyrEntity where gkjyr =?1 and recordStatus<>9")
 	public List<JyrEntity> findByName(String name);
+	
+	//除了自身以外有无重名的
+	@Query("from JyrEntity where gkjyr =?1 and id<>?2 and recordStatus<>9")
+	public List<JyrEntity> findByNameAndID(String name,Long id);
 
 	/**
 	 * 经营人中危货企业和已发港口认证和已发危货认证

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/impl/jyr/JyrServiceImpl.java

@@ -1149,4 +1149,15 @@ public class JyrServiceImpl extends BaseService<JyrEntity, Long> implements
 			val1 = val.toString();
 		return val1;
 	}
+	
+	/*
+	 * check 港口经营人名称 是否已经存在 不存在返回true 
+	 */
+	public Boolean IsExistJyrName(JyrEntity jyrEntity){
+		Long id = (jyrEntity.getId()==null?0:jyrEntity.getId());
+		List<JyrEntity> listJyr = jyrDao.findByNameAndID(jyrEntity.getGkjyr(),id);
+		return listJyr.isEmpty();
+	}
+	
+	
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/jyr/JyrService.java

@@ -289,4 +289,10 @@ public interface JyrService {
 	 */
 	public void saveShxx(String gnmk, Long voId,List<JyrShxxEntity> shxx_change_list);
 	
+	
+	/*
+	 * check 港口经营人名称 是否已经存在 不存在返回true 
+	 */
+	public Boolean IsExistJyrName(JyrEntity jyrEntity);
+	
 }

gkaq/yjpt-java/trunk/locale/zh_CN/jlrxxgl.properties

@@ -82,6 +82,7 @@ xzqh=\u884c\u653f\u533a\u5212
 
 jyr.szd.empty=\u7ecf\u8425\u4eba\u6240\u5728\u5730\u4e0d\u80fd\u4e3a\u7a7a\uff01
 jyr.szgq.empty=\u7ecf\u8425\u4eba\u6240\u5728\u6e2f\u533a\u4e0d\u80fd\u4e3a\u7a7a\uff01
+jyr.gkjyr.exist=\u6e2f\u53e3\u7ecf\u8425\u4eba\u540d\u79f0\u5df2\u5b58\u5728\uff01
 jyr.qylx.empty=\u7ecf\u8425\u4eba\u4f01\u4e1a\u7c7b\u578b\u4e0d\u80fd\u4e3a\u7a7a\uff01
 jyr.gkjyr.empty=\u6e2f\u53e3\u7ecf\u8425\u4eba\u4e0d\u80fd\u4e3a\u7a7a\uff01
 jyr.qyxz.empty=\u7ecf\u8425\u4eba\u4f01\u4e1a\u6027\u8d28\u4e0d\u80fd\u4e3a\u7a7a\uff01

gkaq/yjpt-java/trunk/yjpt/WEB-INF/web.xml

@@ -7,7 +7,7 @@
 	<context-param>
 		<description>系统版本</description>
 		<param-name>version</param-name>
-		<param-value>1.1.1</param-value>
+		<param-value>1.1.3</param-value>
 	</context-param>	
 	<context-param>
 		<description>0:省级;1:市级</description>