git-svn-id: https://192.168.57.71/svn/jsgkj@1147 931142cf-59ea-a443-aa0e-51397b428577

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/common/GlobalData.java

@@ -90,6 +90,12 @@ public class GlobalData {
 		if(!StringUtils.isEmpty(IsUse_iSignature))
 			iSignature = IsUse_iSignature;
 		
+		//获得是否关闭经营人：码头、泊位、储罐、堆场的可编辑功能（增、删、改、复制） 
+		String IsDisableJyrEdit = sc.getInitParameter("JyrDisbleEdit");//从web.xml中读取配置信息
+		if(!StringUtils.isEmpty(IsDisableJyrEdit)){
+			JyrDisbleEdit = IsDisableJyrEdit; 
+		}
+		
 		try {
 			GlobalData.initProperties();
 			GlobalData.initApply();
@@ -403,7 +409,10 @@ public class GlobalData {
 	
 	/** 危险品审批是否启用签章,默认不启用*/
 	public static String iSignature = Constants.NO;
-
+	
+	/** 是否关闭经营人：码头、泊位、储罐、堆场的可编辑功能（增、删、改、复制）,默认不关闭 */
+	public static String JyrDisbleEdit = Constants.NO;
+	
 	/**
 	 * 超级用户ID
 	 */

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/BaseController.java

@@ -622,8 +622,7 @@ public abstract class BaseController {
 			Root<?> root, List<Predicate> filterList, String user, String jyr) {
 		if (user == null)
 			user = "addUser";
-		if (Utils.getCurrentUser() != null
-				&& !GlobalData.adminID.equals(Utils.getCurrentUser().getId())) {// 不是超级用户
+		if (Utils.getCurrentUser() != null && !GlobalData.adminID.equals(Utils.getCurrentUser().getId())) {// 不是超级用户
 			List<Predicate> orList = new ArrayList<Predicate>();
 			String role = getCurrentRoleCode(functionId);
 			// 行政人员可以查找所有比自己低级的数据，以及经营人、建设单位、评价机构的数据
@@ -631,9 +630,8 @@ public abstract class BaseController {
 				// 行政人员按照所在地过滤
 				if (Utils.getCurrentUser().getSzd() != null)
 					filterList.add(cb.like(
-							root.get("szd").get("id").as(String.class), Utils
-									.getCurrentUser().getSzd().getByzd2()
-									+ "%"));
+							root.get("szd").get("id").as(String.class), 
+							Utils.getCurrentUser().getSzd().getByzd2() + "%"));
 				if (role != null)
 					role = Utils.getParentRole(role);
 				orList.add(cb.like(root.get("recordCode").as(String.class),

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

@@ -130,16 +130,18 @@ public class AuthenticateController extends BaseController {
 			bc.setAttribute("user", user);
 			bc.setAttribute("deployMode", GlobalData.DEPLOY_MODE);
 			bc.setAttribute("version", GlobalData.APP_VERSION);
-			bc.setAttribute("szd",
-					codeService.findOne(new Long(GlobalData.CITY_CODE)));
-			bc.setAttribute("deploySzd",
-					codeService.findOne(new Long(GlobalData.CITY_CODE)));
+			bc.setAttribute("szd", codeService.findOne(new Long(GlobalData.CITY_CODE)));
+			bc.setAttribute("deploySzd", codeService.findOne(new Long(GlobalData.CITY_CODE)));
 			bc.setAttribute("uploadFileSize", GlobalData.UPLOAD_FILE_SIZE);
 			bc.setAttribute("uploadImageSize", GlobalData.UPLOAD_IMAGE_SIZE);
 			bc.setAttribute("btyyj", codeService.findOne(11200015l).getBz());
 			bc.setAttribute("thyj", codeService.findOne(11200016l).getBz());
+			
 			//设置是否在危险品审批中使用签章功能的参数
 			bc.setAttribute("iSignature", GlobalData.iSignature);
+			//获得是否关闭经营人：码头、泊位、储罐、堆场的可编辑功能（增、删、改、复制）
+			bc.setAttribute("JyrDisbleEdit",GlobalData.JyrDisbleEdit);
+			
 		} else {
 			bc.setAttribute("status", true);
 			// bc.setAttribute("user", user);
@@ -411,6 +413,8 @@ public class AuthenticateController extends BaseController {
 		
 		//设置是否在危险品审批中使用签章功能的参数
 		bc.setAttribute("iSignature", GlobalData.iSignature);
+		//获得是否关闭经营人：码头、泊位、储罐、堆场的可编辑功能（增、删、改、复制）
+		bc.setAttribute("JyrDisbleEdit",GlobalData.JyrDisbleEdit);
 		
 		if (Constants.NO.equals(user.getSfjyr())) {
 			// 非经营人

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

@@ -153,62 +153,43 @@ public class JyrController extends BaseController {
 			Specification<JyrEntity> spec = new Specification<JyrEntity>() {
 
 				@Override
-				public Predicate toPredicate(Root<JyrEntity> root,
-						CriteriaQuery<?> query, CriteriaBuilder cb) {
+				public Predicate toPredicate(Root<JyrEntity> root,CriteriaQuery<?> query, CriteriaBuilder cb) {
 					List<Predicate> list = new ArrayList<Predicate>();
 					addRecordCodeFilter(functionId, cb, root, list, null, "id");
-					list.add(cb.notEqual(
-							root.get("recordStatus").as(String.class),
-							BaseEntity.RECORD_STATE_DELETE));
-					list.add(cb.notEqual(
-							root.get("recordStatus").as(String.class),
-							BaseEntity.RECORD_STATE_DRAFT));
+					//exclude 删除&草稿
+					list.add(cb.notEqual(root.get("recordStatus").as(String.class),BaseEntity.RECORD_STATE_DELETE));
+					list.add(cb.notEqual(root.get("recordStatus").as(String.class),BaseEntity.RECORD_STATE_DRAFT));
 					if (szd != null) {
-						list.add(cb.like(
-								root.get("szd").get("id").as(String.class), "%"
-										+ szd.getId() + "%"));
+						list.add(cb.like(root.get("szd").get("id").as(String.class),"%" + szd.getId() + "%"));
 					}
 					if (szgq != null) {
-						list.add(cb.equal(root.get("szgq").as(GqEntity.class),
-								szgq));
+						list.add(cb.equal(root.get("szgq").as(GqEntity.class),szgq));
 					}
-					list.add(cb.like(root.get("gkjyr").as(String.class), "%"
-							+ gkjyr + "%"));
-					if (sfwhqy != null
-							&& StringUtils.isNotEmpty(sfwhqy.trim())) {
+					list.add(cb.like(root.get("gkjyr").as(String.class), "%"+ gkjyr + "%"));
+					if (sfwhqy != null && StringUtils.isNotEmpty(sfwhqy.trim())) {
 						if("YW".equals(sfwhqy)) {
 							list.add(cb.or(new Predicate[] {
-									cb.equal(root.get("sfwhqy").as(String.class),
-											"Y"),cb.equal(root.get("sfwhqy").as(String.class),
-													"W")
+									cb.equal(root.get("sfwhqy").as(String.class),"Y"),
+									cb.equal(root.get("sfwhqy").as(String.class),"W")
 							}));
 						} else {
-							list.add(cb.equal(root.get("sfwhqy").as(String.class),
-									sfwhqy));
+							list.add(cb.equal(root.get("sfwhqy").as(String.class),sfwhqy));
 						}
 					}
 					if (StringUtils.isNotEmpty(szqy)) {
-						list.add(cb.equal(root.get("qylx").as(String.class),
-								szqy));
+						list.add(cb.equal(root.get("qylx").as(String.class),szqy));
 					}
-					list.add(cb.like(root.get("fddbr").as(String.class), "%"
-							+ fddbr + "%"));
+					list.add(cb.like(root.get("fddbr").as(String.class), "%" + fddbr + "%"));
 					if (StringUtils.isNotEmpty(mtlb)) {
 						List<Predicate> list2 = new ArrayList<Predicate>();
 						if ("Y".equalsIgnoreCase(mtlb.charAt(0) + "")) {
-							list2.add(cb.like(
-									root.get("qyxz").as(String.class),
-									"Y_Y____"));
+							list2.add(cb.like(root.get("qyxz").as(String.class),"Y_Y____"));
 						}
 						if ("Y".equalsIgnoreCase(mtlb.charAt(1) + "")) {
-							list2.add(cb.like(
-									root.get("qyxz").as(String.class),
-									"Y__Y___"));
+							list2.add(cb.like(root.get("qyxz").as(String.class),"Y__Y___"));
 						}
 						if ("Y".equalsIgnoreCase(mtlb.charAt(2) + "")) {
-							list2.add(cb.like(
-									root.get("qyxz").as(String.class),
-									"Y___Y__"));
+							list2.add(cb.like(root.get("qyxz").as(String.class),"Y___Y__"));
 						}
 						if (list2.size() > 0) {
 							list.add(cb.or(list2.toArray(new Predicate[] {})));
@@ -540,18 +521,14 @@ public class JyrController extends BaseController {
 	public BusinessContext listAll() {
 		BusinessContext bc = createBusinessContext();
 		List<PredicateModel> filterList = new ArrayList<PredicateModel>();
-		addNotEmptyModel(filterList, "recordStatus",
-				BaseEntity.RECORD_STATE_DELETE, Operator.NEQ);
-		addNotEmptyModel(filterList, "recordStatus",
-				BaseEntity.RECORD_STATE_DRAFT, Operator.NEQ);
+		addNotEmptyModel(filterList, "recordStatus",BaseEntity.RECORD_STATE_DELETE, Operator.NEQ);
+		addNotEmptyModel(filterList, "recordStatus",BaseEntity.RECORD_STATE_DRAFT, Operator.NEQ);
 		List<JyrEntity> list = new ArrayList<JyrEntity>();
 		// 经营人只能查询自己的记录
-		if (Constants.YES.equals(Utils.getCurrentUser().getSfjyr())
-				&& Utils.getCurrentUser().getJyrjcxx() != null) {
+		if (Constants.YES.equals(Utils.getCurrentUser().getSfjyr()) && Utils.getCurrentUser().getJyrjcxx() != null) {
 			list.add(Utils.getCurrentUser().getJyrjcxx());
 		} else {
-			Specification<JyrEntity> spec = SpecificationCreater
-					.searchByPredicateModels(filterList);
+			Specification<JyrEntity> spec = SpecificationCreater.searchByPredicateModels(filterList);
 			Sort sort2 = new Sort(Direction.ASC, "gkjyr");
 			list.addAll(service.findAll(spec,sort2)) ;
 		}

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/yjgl/zdwxyfb/CgController.java

@@ -85,20 +85,16 @@ public class CgController extends BaseController {
 	private GksssbService aqsssbService;
 
 	@Log(Type.QUERY)
-	public BusinessContext list(SinglePageRequest pageRequest, Long functionId,
-			CgEntity entity) {
+	public BusinessContext list(SinglePageRequest pageRequest, Long functionId,CgEntity entity) {
 		List<PredicateModel> filterList = new ArrayList<PredicateModel>();
 		addRecordCodeFilter(functionId, filterList, null, "dwmc");
 		if (entity.getSzd() != null)
-			addNotEmptyModel(filterList, "szd.id", entity.getSzd().getId(),
-					Operator.LIKE_R);
+			addNotEmptyModel(filterList, "szd.id", entity.getSzd().getId(),Operator.LIKE_R);
 		addNotEmptyModel(filterList, "gq", entity.getGq(), Operator.EQ);
 		addNotEmptyModel(filterList, "dwmc", entity.getDwmc(), Operator.EQ);
 		addNotEmptyModel(filterList, "cgqmc", entity.getCgqmc(), Operator.LIKE);
-		addNotEmptyModel(filterList, "recordStatus",
-				BaseEntity.RECORD_STATE_DELETE, Operator.NEQ);
-		Specification<CgEntity> spec = SpecificationCreater
-				.searchByPredicateModels(filterList);
+		addNotEmptyModel(filterList, "recordStatus", BaseEntity.RECORD_STATE_DELETE, Operator.NEQ);
+		Specification<CgEntity> spec = SpecificationCreater.searchByPredicateModels(filterList);
 		if (null == pageRequest) {
 			List<CgEntity> dataset = cgService.findAll(spec);
 			for (CgEntity vo : dataset) {

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/zysqbp/ZysqbpController.java

@@ -782,119 +782,111 @@ public class ZysqbpController extends BaseController {
 				new JRBeanCollectionDataSource(dataList), response, request);
 	}
 
-	public Collection<String[]> print(final List<String> param)
-			throws ParseException {
+
+	/**
+	 * 返回导出excel所需的数据
+	 * @param param
+	 * @return
+	 * @throws ParseException
+	 */
+	public Collection<String[]> print(final List<String> param) throws ParseException {
 		Collection<ZysqbpEntity> dataset = null;
 		try {
-			Specification<ZysqbpEntity> spec = new Specification<ZysqbpEntity>() {
-
+			Specification<ZysqbpEntity> spec = new Specification<ZysqbpEntity>() { 
 				@Override
-				public Predicate toPredicate(Root<ZysqbpEntity> root,
-						CriteriaQuery<?> query, CriteriaBuilder cb) {
+				public Predicate toPredicate(Root<ZysqbpEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
 					List<Predicate> list = new ArrayList<Predicate>();
-					addRecordCodeFilter(Long.parseLong(param.get(6)), cb, root,
-							list, null, "zydw");
-					list.add(cb.notEqual(
-							root.get("recordStatus").as(String.class),
-							BaseEntity.RECORD_STATE_DELETE));
-					if (!"".equals(param.get(0)))
-						list.add(cb.like(root.get("cm").as(String.class), "%"
-								+ param.get(0) + "%"));
-					if (!"".equals(param.get(1)))
-						list.add(cb.like(root.get("wpbh").as(String.class), "%"
-								+ param.get(1) + "%"));
-					if (!"".equals(param.get(2)))
-						list.add(cb.like(
-								root.get("zydw").get("gkjyr").as(String.class),
-								"%" + param.get(2) + "%"));
-					if (!"".equals(param.get(17)))
-						list.add(cb.equal(
-								root.get("zydw").get("id").as(Long.class),
-								Long.parseLong(param.get(17))));
-					if (!"null".equals(param.get(7))
-							&& !"".equals(param.get(7))) {
-						list.add(cb.equal(root.get("mao").as(String.class),
-								param.get(7)));
+					list.add(cb.notEqual( root.get("recordStatus").as(String.class), BaseEntity.RECORD_STATE_DELETE));
+					addRecordCodeFilter(Long.parseLong(param.get(6)), cb, root, list, null, "zydw");
+					if (!"".equals(param.get(0))){
+						list.add(cb.like(root.get("cm").as(String.class), "%" + param.get(0) + "%"));
+					}
+					if (!"".equals(param.get(1))){
+						list.add(cb.like(root.get("wpbh").as(String.class), "%" + param.get(1) + "%"));
+					}
+					if (!"".equals(param.get(2))){
+						list.add(cb.like(root.get("zydw").get("gkjyr").as(String.class), "%" + param.get(2) + "%"));
+					}
+					
+					if (!"".equals(param.get(3))){
+						list.add(cb.like(root.get("szd").get("id").as(String.class),param.get(3) + "%"));
+					}
+					if (!"".equals(param.get(4))){
+						list.add(cb.equal(root.get("szgq").get("id").as(Long.class),Long.parseLong(param.get(4))));
+					}
+					
+					if (!"null".equals(param.get(7)) && !"".equals(param.get(7))) {
+						list.add(cb.equal(root.get("mao").as(String.class), param.get(7)));
 					}
-					if (!"".equals(param.get(3)))
-						list.add(cb.like(
-								root.get("szd").get("id").as(String.class),
-								param.get(3) + "%"));
-					if (!"".equals(param.get(4)))
-						list.add(cb.equal(
-								root.get("szgq").get("id").as(Long.class),
-								Long.parseLong(param.get(4))));
 					if (!"".equals(param.get(8))) {
 						try {
-							list.add(cb.greaterThanOrEqualTo(root.get("bgsj")
-									.as(Date.class), sdf.parse(param.get(8))));
+							list.add(cb.greaterThanOrEqualTo(root.get("bgsj").as(Date.class), sdf.parse(param.get(8))));
 						} catch (ParseException e) {
 							e.printStackTrace();
 						}
 					}
 					if (!"".equals(param.get(9))) {
 						try {
-							list.add(cb.lessThan(root.get("bgsj")
-									.as(Date.class), DateUtil.addDate(
-									sdf.parse(param.get(9)), 1)));
+							list.add(cb.lessThan(root.get("bgsj").as(Date.class), DateUtil.addDate(sdf.parse(param.get(9)), 1)));
 						} catch (ParseException e) {
 							e.printStackTrace();
 						}
 					}
 					if (!"".equals(param.get(10))) {
 						try {
-							list.add(cb.greaterThanOrEqualTo(root.get("kgsj")
-									.as(Date.class), sdf.parse(param.get(10))));
+							list.add(cb.greaterThanOrEqualTo(root.get("kgsj").as(Date.class), sdf.parse(param.get(10))));
 						} catch (ParseException e) {
 							e.printStackTrace();
 						}
 					}
 					if (!"".equals(param.get(11))) {
 						try {
-							list.add(cb.lessThan(root.get("kgsj")
-									.as(Date.class), DateUtil.addDate(
-									sdf.parse(param.get(11)), 1)));
+							list.add(cb.lessThan(root.get("kgsj").as(Date.class), DateUtil.addDate(sdf.parse(param.get(11)), 1)));
 						} catch (ParseException e) {
 							e.printStackTrace();
 						}
 					}
 					if (!"".equals(param.get(12))) {
 						try {
-							list.add(cb.greaterThanOrEqualTo(root.get("wgsj")
-									.as(Date.class), sdf.parse(param.get(12))));
+							list.add(cb.greaterThanOrEqualTo(root.get("wgsj").as(Date.class), sdf.parse(param.get(12))));
 						} catch (ParseException e) {
 							e.printStackTrace();
 						}
 					}
 					if (!"".equals(param.get(13))) {
 						try {
-							list.add(cb.lessThan(root.get("wgsj")
-									.as(Date.class), DateUtil.addDate(
-									sdf.parse(param.get(13)), 1)));
+							list.add(cb.lessThan(root.get("wgsj").as(Date.class), DateUtil.addDate(sdf.parse(param.get(13)), 1)));
 						} catch (ParseException e) {
 							e.printStackTrace();
 						}
 					}
 					if (!"".equals(param.get(14))) {
-						list.add(cb.like(root.get("bh").as(String.class), "%"
-								+ param.get(14) + "%"));
+						list.add(cb.like(root.get("bh").as(String.class), "%"+ param.get(14) + "%"));
 					}
 					if (!"".equals(param.get(15))) {
-						list.add(cb.equal(
-								root.get("recordStatus").as(String.class),
-								param.get(15) + ""));
+						list.add(cb.equal(root.get("recordStatus").as(String.class),param.get(15) + ""));
 					}
+					
+					if (!"".equals(param.get(17))){
+						list.add(cb.equal(root.get("zydw").get("id").as(Long.class),Long.parseLong(param.get(17))));
+					}
+					
+					if(!"".equals(param.get(18))){
+						list.add(cb.like(root.get("wxhwmcbh").as(String.class),"%"+param.get(18) + "%" ));//危险物品 编号与名称，数据库实际存储的时候存反了
+					}
+					
+					//船代
 					if (Constants.YES.equals(Utils.getCurrentUser().getSfcd())) {
-						list.add(cb.equal(
-								root.get("addUser").as(UserEntity.class),
-								Utils.getCurrentUser()));
+						list.add(cb.equal(root.get("addUser").as(UserEntity.class),Utils.getCurrentUser()));
 					}
-					list = Utils.setAuditNameSpec(list, cb, query, root,
-							param.get(5), param.get(16));
+					
+					list = Utils.setAuditNameSpec(list, cb, query, root,param.get(5), param.get(16));
 					return cb.and(list.toArray(new Predicate[] {}));
 				}
 			};
+			
 			dataset = zysqbpService.findAll(spec, sort);
+			
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

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

@@ -34,7 +34,7 @@ public interface JyrDao extends MyRepository<JyrEntity, Long> {
 	 */
 	@Query(value = " select g.mc,x.a,x.b from t_yjpt_ggdm g left join (select substr(szd,0,5)szdid, "
 			+ "count(id)a,SUM(CASE WHEN T.SFWHQY='W' or T.SFWHQY='Y' THEN 1 ELSE 0 END)b from T_YJPT_JYRJCXX T  "
-			+ "where t.record_status!=9 group by substr(T .szd,0,5))x on g.id=x.szdid where "
+			+ "where t.record_status!=9 and t.record_status!=0 group by substr(T .szd,0,5))x on g.id=x.szdid where "
 			+ "g.fid =900 and g.groupcode='SZD' order by g.px", nativeQuery = true)
 	public List<Object[]> countQy();
 
@@ -112,7 +112,7 @@ public interface JyrDao extends MyRepository<JyrEntity, Long> {
 			+ "count(id)a,SUM(CASE WHEN T.SFWHQY='W' or T.SFWHQY='Y' THEN 1 ELSE 0 END)b, "
 			+ "SUM(CASE WHEN (T.SFWHQY='W' or T.SFWHQY='Y') AND TO_CHAR(T.ADD_DATE,'YYYY')=TO_CHAR(SYSDATE,'YYYY') THEN 1 ELSE 0 END)c,"
 			+ "SUM(CASE WHEN (T.SFWHQY='W' or T.SFWHQY='Y') AND TO_CHAR(T.ADD_DATE,'YYYYMM')=TO_CHAR(SYSDATE,'YYYYMM') "
-			+ "THEN 1 ELSE 0 END)d  from T_YJPT_JYRJCXX T where T.RECORD_STATUS!=9 group by substr(T.szd,0,5)) x "
+			+ "THEN 1 ELSE 0 END)d  from T_YJPT_JYRJCXX T where T.RECORD_STATUS!=9 and T.RECORD_STATUS!=0 group by substr(T.szd,0,5)) x "
 			+ "on x.szdid=g.id where g.fid =900 and g.groupcode='SZD' order by g.px", nativeQuery = true)
 	public List<Object[]> countJyr();
 

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/entity/zysqbp/ZysqbpEntity.java

@@ -19,7 +19,6 @@ import org.springframework.flex.remoting.RemotingExclude;
 
 import com.jtgh.yjpt.common.Constants;
 import com.jtgh.yjpt.entity.BaseEntity;
-import com.jtgh.yjpt.entity.auth.UserEntity;
 import com.jtgh.yjpt.entity.common.AccessoryEntity;
 import com.jtgh.yjpt.entity.common.CodeEntity;
 import com.jtgh.yjpt.entity.common.TaskInfoEntity;
@@ -62,7 +61,7 @@ public class ZysqbpEntity extends BaseEntity<Long> {
 	private String wxplb;
 	/** 危险物品名称 */
 	private String wxwpmc;
-	private String wxhwmcbh;
+	private String wxhwmcbh;//危险物品 编号与名称，数据库实际存储的时候存反了
 	/** 物品编号 */
 	private String wpbh;
 	/** 作业数量 */

gkaq/yjpt-java/trunk/resources/spring/application.properties

@@ -1,7 +1,7 @@
 #***************************************  jdbc info  ********************************************#
 jdbc.driver                 = oracle.jdbc.driver.OracleDriver
 jdbc.url                      = jdbc:oracle:thin:@192.168.57.36:1521:orcl
-jdbc.username           = yjptpro
+jdbc.username           = yjptzj
 jdbc.password            = yjpt
 hibernate.dialect        = org.hibernate.dialect.Oracle10gDialect
 #********************************** qlyg jdbc info**********************************************#
@@ -26,6 +26,8 @@ web.service.url=192.168.57.76
 web.service.port=8089
 
 # Province WebService 
+web.province.service.url=192.168.57.71
+web.province.service.port=8089
 
 #\u4f5c\u4e1a\u7533\u62a5\uff0c\u95f4\u9694\u7684\u65f6\u95f4\uff0c\u5fc5\u987b\u5b8c\u6210
 zysb.time=7

gkaq/yjpt-java/trunk/resources/sql/init/properties/cz.prop

@@ -14,6 +14,7 @@ openMap=Y
 qlygSync=Y
 qlygResult=1
 iSign=N
+JyrDisbleEdit=Y
 
 # config yjpt system database connection
 jdbcUrl=jdbc:oracle:thin:@10.9.30.225:1521:yjpt

gkaq/yjpt-java/trunk/resources/sql/init/properties/ha.prop

@@ -14,6 +14,7 @@ openMap=Y
 qlygSync=Y
 qlygResult=1
 iSign=N
+JyrDisbleEdit=Y
 
 # config yjpt system database connection
 jdbcUrl=jdbc:oracle:thin:@10.7.32.3:1521:orcl

gkaq/yjpt-java/trunk/resources/sql/init/properties/lyg.prop

@@ -14,6 +14,7 @@ openMap=Y
 qlygSync=Y
 qlygResult=1
 iSign=N
+JyrDisbleEdit=Y
 
 # config yjpt system database connection
 jdbcUrl=jdbc:oracle:thin:@10.33.0.148:1521:orcl

gkaq/yjpt-java/trunk/resources/sql/init/properties/lygnh.prop

@@ -14,6 +14,7 @@ openMap=Y
 qlygSync=Y
 qlygResult=1
 iSign=N
+JyrDisbleEdit=Y
 
 jdbcQlygUrl=jdbc:oracle:thin:@10.1.30.104:1521:JTTJJC
 jdbcQlygUsername=jsgk

gkaq/yjpt-java/trunk/resources/sql/init/properties/nj.prop

@@ -15,6 +15,7 @@ openMap=Y
 qlygSync=Y
 qlygResult=1
 iSign=N
+JyrDisbleEdit=Y
 
 # config yjpt system database connection
 jdbcUrl=jdbc:oracle:thin:@10.1.30.104:1521:JTTJJC

gkaq/yjpt-java/trunk/resources/sql/init/properties/nt.prop

@@ -14,6 +14,7 @@ openMap=Y
 qlygSync=Y
 qlygResult=1
 iSign=N
+JyrDisbleEdit=Y
 
 # config yjpt system database connection
 jdbcUrl=jdbc:oracle:thin:@10.32.0.119:1521:yjpt

gkaq/yjpt-java/trunk/resources/sql/init/properties/ntnh.prop

@@ -14,6 +14,7 @@ openMap=Y
 qlygSync=Y
 qlygResult=1
 iSign=N
+JyrDisbleEdit=Y
 
 
 # config yjpt system database connection

gkaq/yjpt-java/trunk/resources/sql/init/properties/s.prop

@@ -15,6 +15,7 @@ openMap=Y
 qlygSync=Y
 qlygResult=1
 iSign=N
+JyrDisbleEdit=Y
 
 # config yjpt system database connection
 jdbcUrl=jdbc:oracle:thin:@10.1.30.104:1521:JTTJJC

gkaq/yjpt-java/trunk/resources/sql/init/properties/sq.prop

@@ -14,6 +14,8 @@ openMap=Y
 qlygSync=Y
 qlygResult=1
 iSign=N
+JyrDisbleEdit=Y
+
 # config yjpt system database connection
 jdbcUrl=jdbc:oracle:thin:@10.11.30.29:1521:ORCL
 jdbcUsername=yjpt

gkaq/yjpt-java/trunk/resources/sql/init/properties/sz.prop

@@ -14,6 +14,7 @@ openMap=Y
 qlygSync=Y
 qlygResult=1
 iSign=N
+JyrDisbleEdit=Y
 
 # config yjpt system database connection
 jdbcUrl=jdbc:oracle:thin:@10.8.96.162:1521:orcl

gkaq/yjpt-java/trunk/resources/sql/init/properties/tx.prop

@@ -9,12 +9,12 @@ szdId=90028
 szdName=泰兴
 versionDate=20160604
 
-
 imageSize=0.2
 openMap=Y
 qlygSync=Y
 qlygResult=1
 iSign=N
+JyrDisbleEdit=Y
 
 # config yjpt system database connection
 jdbcUrl=jdbc:oracle:thin:@10.10.207.208:1521:orcl

gkaq/yjpt-java/trunk/resources/sql/init/properties/tz.prop

@@ -8,14 +8,14 @@ seqMaxvalue=5000000000
 szdId=90018
 szdName=泰州
 versionDate=20160604
-
-
+ 
 
 imageSize=0.2
 openMap=Y
 qlygSync=Y
 qlygResult=1
 iSign=N
+JyrDisbleEdit=Y
 
 # config yjpt system database connection
 jdbcUrl=jdbc:oracle:thin:@10.10.1.29:1521:orcl

gkaq/yjpt-java/trunk/resources/sql/init/properties/wx.prop

@@ -14,6 +14,7 @@ openMap=Y
 qlygSync=Y
 qlygResult=1
 iSign=N
+JyrDisbleEdit=Y
 
 # config yjpt system database connection
 jdbcUrl=jdbc:oracle:thin:@10.3.0.21:1521:orcl

gkaq/yjpt-java/trunk/resources/sql/init/properties/xz.prop

@@ -14,6 +14,7 @@ openMap=Y
 qlygSync=Y
 qlygResult=1
 iSign=N
+JyrDisbleEdit=Y
 
 # config yjpt system database connection
 jdbcUrl=jdbc:oracle:thin:@10.13.18.51:1521:yjpt

gkaq/yjpt-java/trunk/resources/sql/init/properties/yc.prop

@@ -14,6 +14,8 @@ openMap=Y
 qlygSync=Y
 qlygResult=1
 iSign=N
+JyrDisbleEdit=Y
+
 # config yjpt system database connection
 jdbcUrl=jdbc:oracle:thin:@192.168.100.250:1521:yjpt
 jdbcUsername=yjpt

gkaq/yjpt-java/trunk/resources/sql/init/properties/ycnh.prop

@@ -14,6 +14,7 @@ openMap=Y
 qlygSync=Y
 qlygResult=1
 iSign=N
+JyrDisbleEdit=Y
 
 # config yjpt system database connection
 jdbcUrl=jdbc:oracle:thin:@192.168.200.251:1521:yjpt

gkaq/yjpt-java/trunk/resources/sql/init/properties/yz.prop

@@ -14,6 +14,7 @@ openMap=Y
 qlygSync=Y
 qlygResult=1
 iSign=N
+JyrDisbleEdit=Y
 
 # config yjpt system database connection
 jdbcUrl=jdbc:oracle:thin:@171.26.1.241:1521:yjpt

gkaq/yjpt-java/trunk/resources/sql/init/properties/zj.prop

@@ -14,6 +14,7 @@ openMap=Y
 qlygSync=Y
 qlygResult=1
 iSign=N
+JyrDisbleEdit=Y
 
 # config yjpt system database connection
 jdbcUrl=jdbc:oracle:thin:@192.168.10.1:1521:zjeport

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

@@ -12,12 +12,12 @@
 	<context-param>
 		<description>0:省级;1:市级</description>
 		<param-name>deploy_mode</param-name>
-		<param-value>0</param-value>
+		<param-value>1</param-value>
 	</context-param>
 	<context-param>
 		<description>区域代码</description>
 		<param-name>city_code</param-name>
-		<param-value>900</param-value>
+		<param-value>90011</param-value>
 	</context-param>
 	<context-param>
 		<description>是否使用地图资源系统(Y/N)</description>
@@ -35,6 +35,11 @@
 		<param-value>N</param-value>
 	</context-param>
 	<context-param>
+		<description>是否关闭经营人：码头、泊位、储罐、堆场的可编辑功能（增、删、改、复制）(Y/N)</description>
+		<param-name>JyrDisbleEdit</param-name>
+		<param-value>N</param-value>
+	</context-param>
+	<context-param>
 		<param-name>contextConfigLocation</param-name>
 		<param-value>
 			classpath*:spring/applicationContext*.xml

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

@@ -35,6 +35,11 @@
 		<param-value>${iSign}</param-value>
 	</context-param>
 	<context-param>
+		<description>是否关闭经营人：码头、泊位、储罐、堆场的可编辑功能（增、删、改、复制）(Y/N)</description>
+		<param-name>JyrDisbleEdit</param-name>
+		<param-value>${JyrDisbleEdit}</param-value>
+	</context-param>
+	<context-param>
 		<param-name>contextConfigLocation</param-name>
 		<param-value>
 			classpath*:spring/applicationContext*.xml