git-svn-id: https://192.168.57.71/svn/lyggkj@154 1a6f6e3a-4066-fe46-b609-79c204482ece

gkaq/yjpt-java/trunk/.project

@@ -27,4 +27,15 @@
 		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1484197008452</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-.svn</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>

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

@@ -10,10 +10,7 @@ import java.net.URLEncoder;
 import java.security.SecureRandom;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Random;
 import java.util.UUID;
@@ -343,32 +340,31 @@ public class AuthenticateController extends BaseController {
 	 * @return
 	 */
 	@Log(Type.LOGIN)
-	public BusinessContext doLogin(String usercode, String password,
-			String checkcode, Boolean needcheck) {
+	public BusinessContext doLogin(String usercode, String password,String checkcode, Boolean needcheck) {
 		BusinessContext bc = createBusinessContext();
 		if (Utils.getSession() != null && needcheck) {
 			if (StringUtils.isEmpty(checkcode)
-					|| !checkcode.equals(Utils.getSession().getAttribute(
-							GlobalData.USER_SESSION_CHECK_CODE))) {
+			   || !checkcode.equals(Utils.getSession().getAttribute(GlobalData.USER_SESSION_CHECK_CODE))) {
 				bc.addMsg("login.err.chkCode", "common", MsgLevel.ERROR);
 				return bc;
 			}
 		}
 		UserEntity user = authenticateService.doLogin(usercode, password);
 		if (null != user) {
-			Pattern p = Pattern.compile(Constants.PASSWORD_REGEX);  	  
-			Matcher m = p.matcher(password);  
-			SimpleDateFormat s = new SimpleDateFormat("yyyyMMdd");		
-			try {
-				Date yxq = Utils.getDateLastTime(s.parse(Constants.PASSWORD_YXQ));
-				//密码复杂度不够并且超出有效期外
-				if(!m.find()&&yxq.compareTo(new Date())<=0) {
-					bc.addMsg("loginPasswordError", "common", MsgLevel.ERROR);
-					return bc; 	
-				}
-			} catch (ParseException e) {
-				e.printStackTrace();
-			}	
+			/* 之前密码复杂度不够，超过设置的期限禁止登陆，现去掉。 */
+//			Pattern p = Pattern.compile(Constants.PASSWORD_REGEX);  	  
+//			Matcher m = p.matcher(password);  
+//			SimpleDateFormat s = new SimpleDateFormat("yyyyMMdd");		
+//			try {
+//				Date yxq = Utils.getDateLastTime(s.parse(Constants.PASSWORD_YXQ));
+//				//密码复杂度不够并且超出有效期外
+//				if(!m.find()&&yxq.compareTo(new Date())<=0) {
+//					bc.addMsg("loginPasswordError", "common", MsgLevel.ERROR);
+//					return bc; 	
+//				}
+//			} catch (ParseException e) {
+//				e.printStackTrace();
+//			}	
 			processLogin(bc, user);			
 		} else {
 			bc.addMsg("loginError", "common", MsgLevel.ERROR);
@@ -377,7 +373,6 @@ public class AuthenticateController extends BaseController {
 	}
 
 	private void processLogin(BusinessContext bc, UserEntity user) {
-		user = userService.findOne(user.getId());
 		if (user.getAddUser() != null) {
 			user.getAddUser().getCode();
 		}
@@ -388,15 +383,13 @@ public class AuthenticateController extends BaseController {
 		bc.setAttribute("jsessionid", Utils.getSession().getId());
 		if (Constants.NO.equals(user.getSfjyr())) {
 			// 非经营人
-			bc.setAttribute("szd",
-					codeService.findOne(new Long(user.getSzd().getByzd2())));
+			bc.setAttribute("szd",codeService.findOne(new Long(user.getSzd().getByzd2())));
 		} else {
 			// 经营人
 			bc.setAttribute("szd", codeService.findOne(user.getSzd().getId()));
 		}
 		bc.setAttribute("deployMode", GlobalData.DEPLOY_MODE);
-		bc.setAttribute("deploySzd",
-				codeService.findOne(new Long(GlobalData.CITY_CODE)));
+		bc.setAttribute("deploySzd",codeService.findOne(new Long(GlobalData.CITY_CODE)));
 		bc.setAttribute("birtUrl", Constants.BIRT_URL);
 		bc.setAttribute("adminId", GlobalData.adminID);
 		bc.setAttribute("tbUserId", GlobalData.TB_USER.getId());
@@ -408,18 +401,15 @@ public class AuthenticateController extends BaseController {
 		bc.setAttribute("thyj", codeService.findOne(11200016l).getBz());
 		bc.setAttribute("version", GlobalData.APP_VERSION);
 		
-		
 		//设置是否在危险品审批中使用签章功能的参数
 		bc.setAttribute("iSignature", GlobalData.iSignature);
 		
 		if (Constants.NO.equals(user.getSfjyr())) {
 			// 非经营人
-			bc.setAttribute("initMenu",
-					menuService.findByCode(GlobalData.INIT_MENU));
+			bc.setAttribute("initMenu",menuService.findByCode(GlobalData.INIT_MENU));
 		} else {
 			// 经营人
-			bc.setAttribute("initMenu",
-					menuService.findByCode(GlobalData.JJR_MENU));
+			bc.setAttribute("initMenu",menuService.findByCode(GlobalData.JJR_MENU));
 		}
 	}
 
@@ -431,8 +421,7 @@ public class AuthenticateController extends BaseController {
 	public BusinessContext doLogout() {
 		authenticateService.doLogout();
 		BusinessContext bc = createBusinessContext();
-		bc.setAttribute("szd",
-				codeService.findOne(new Long(GlobalData.CITY_CODE)));
+		bc.setAttribute("szd",codeService.findOne(new Long(GlobalData.CITY_CODE)));
 		return bc;
 	}
 
@@ -445,8 +434,7 @@ public class AuthenticateController extends BaseController {
 	 * @param changeByAdmin
 	 * @return
 	 */
-	public BusinessContext changePwd(String userCode, String oldPwd,
-			String newPwd, Boolean changeByAdmin) {
+	public BusinessContext changePwd(String userCode, String oldPwd,String newPwd, Boolean changeByAdmin) {
 		BusinessContext bc = createBusinessContext();
 		Pattern p = Pattern.compile(Constants.PASSWORD_REGEX);  	  
 		Matcher m = p.matcher(newPwd);  

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/task/TaskController.java

@@ -60,11 +60,11 @@ public class TaskController extends BaseController {
 	public BusinessContext doSearch() {
 		BusinessContext businessContext = new BusinessContext();
 		UserEntity userEntity = Utils.getCurrentUser();
-		List<RoleEntity> yhssjss = userEntity.getRoles();
-		List<Long> roleIds = new ArrayList<Long>();
-		for (RoleEntity yhssjs : yhssjss) {
-			roleIds.add(yhssjs.getId());
-		}
+//		List<RoleEntity> yhssjss = userEntity.getRoles();
+//		List<Long> roleIds = new ArrayList<Long>();
+//		for (RoleEntity yhssjs : yhssjss) {
+//			roleIds.add(yhssjs.getId());
+//		}
 		// 工作提醒列表
 		List<Gztx> gztxs = service.findTxByUser(userEntity.getId());
 		businessContext.setAttribute("tx", gztxs);

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

@@ -1212,13 +1212,78 @@ public class ZysqbpController extends BaseController {
 		return null;
 	}
 
+//	public BusinessContext save(ZysqbpEntity vo) {
+//		long startTime = System.currentTimeMillis();
+//		String url =Thread.currentThread().getStackTrace()[2].getClassName()
+//				+ "."
+//				+"save";
+//		BusinessContext bc = createBusinessContext();
+//		vo = zysqbpService.kgwgSave(vo);
+//		bc.setResult(vo);
+//		bc.addMsg("save.success", "common", MsgLevel.INFO);
+//		long cost = System.currentTimeMillis() - startTime;
+//		// System.err.println(url + ",cost:"+cost);
+//		LOGGER.info(url + "<SUCCESS> cost:" + cost);
+//		return bc;
+//	}
+	
 	public BusinessContext save(ZysqbpEntity vo) {
 		long startTime = System.currentTimeMillis();
-		String url =Thread.currentThread().getStackTrace()[2].getClassName()
+		String url = Thread.currentThread().getStackTrace()[2].getClassName()
 				+ "."
-				+"save";
+				+ Thread.currentThread().getStackTrace()[2].getMethodName();
 		BusinessContext bc = createBusinessContext();
-		vo = zysqbpService.kgwgSave(vo);
+		
+		
+		/***********从开工、完工报处调用save函数才需要执行这边代码****plus by xh-2016-11-02*************/
+		//开工报
+		if(vo.getKgzt().equals("K")){//为这个值表明是在填写开工报，在flex页面save处特别设置的
+			vo.setKgzt("Y");
+			//开工报填报人
+			if(vo.getSr()==null && Constants.YES.equals(Utils.getCurrentUser().getSfjyr())){
+				//经营人账户登陆只可以填报一次 ，管理员账号登陆可以修改，但是管理员肯定不是开工、完工报填写人
+				vo.setSr(Utils.getCurrentUser().getName());
+			}
+		}
+		//完工报 
+		if(vo.getWgzt().equals("W")){
+			vo.setWgzt("Y");
+			if(vo.getFr()==null && Constants.YES.equals(Utils.getCurrentUser().getSfjyr())){
+				//经营人账户登陆只可以填报一次 ，管理员账号登陆可以修改，但是管理员肯定不是开工、完工报填写人
+				vo.setFr(Utils.getCurrentUser().getName());
+			}
+		}
+		/*-------------------------------------------------------------------------------*/
+		
+		
+		vo = zysqbpService.saveKgwg(vo);
+		// 同步到省级
+		if (Constants.DEPLOY_MODE_CITY.equals(GlobalData.DEPLOY_MODE)
+				&& Constants.YES.equals(GlobalData.JAXWS_SYNC)) {
+			final Long tempid = vo.getId();
+			Thread thread = new Thread(new Runnable() {
+				@Override
+				public void run() {
+					ZysqbpEntity vo_f = zysqbpService.findOne(tempid);
+					try {
+						ZysqbpWebService webService = zysqbpService.getWebService();
+						if (webService != null) {
+							webService.save(vo_f);
+							vo_f.setTbzt(Constants.YES);
+							zysqbpService.save(vo_f);
+						} else {
+							vo_f.setTbzt(Constants.NO);
+							zysqbpService.save(vo_f);
+						}
+					} catch (Exception e) {
+						e.printStackTrace();
+						vo_f.setTbzt(Constants.NO);
+						zysqbpService.save(vo_f);
+					}
+				}
+			});
+			threadPool.execute(thread);
+		}
 		bc.setResult(vo);
 		bc.addMsg("save.success", "common", MsgLevel.INFO);
 		long cost = System.currentTimeMillis() - startTime;
@@ -1426,20 +1491,22 @@ public class ZysqbpController extends BaseController {
 				+ "submit";
 		BusinessContext bc = createBusinessContext();
 		int nsns = 0;
-		Date fzDate = vo.getZyddqybh().getFzsq().getYxqkssj();
+		
+		Date fzDate = vo.getZyddqybh().getFzsq().getYxqkssj();//附证有效期开始时间即（一般都是）发证日期
 		Calendar cal = Calendar.getInstance();
 		Calendar today = Calendar.getInstance();
 		cal.setTime(fzDate);
-		if (cal.get(Calendar.YEAR) + 2 == today.get(Calendar.YEAR)) {
+		if (cal.get(Calendar.YEAR) + 1 == today.get(Calendar.YEAR)) { 
 			nsns = 1;
-		} else if (cal.get(Calendar.YEAR) + 3 == today.get(Calendar.YEAR)) {
+		} else if (cal.get(Calendar.YEAR) + 2 == today.get(Calendar.YEAR)) {
 			nsns = 2;
 		}
-		List<JyrNsEntity> list = nsService.findByJyrAndNsns(vo.getZyddqybh()
-				.getFzsq().getByzd1(), nsns);
-		if (!(list.size() > 0 && list.get(0).getRecordStatus() == BaseEntity.RECORD_STATE_COMPLETED)
-				&& ((Constants.FZNS_CHECK_DATE) < today.get(Calendar.YEAR))
-				&& nsns > 0) {
+		List<JyrNsEntity> list = nsService.findByJyrAndNsns(vo.getZyddqybh().getFzsq().getByzd1(), nsns);
+		
+		
+		if (!(list.size() > 0 && list.get(0).getRecordStatus() != BaseEntity.RECORD_STATE_DELETE)//之前状态判断为2 completed，但实际值只会是1
+			&& ((Constants.FZNS_CHECK_DATE) < today.get(Calendar.YEAR))
+			&& nsns > 0) {
 			bc.addMsg("zysqbp.fzns.invalidated", "zysqbp", MsgLevel.ERROR);
 			return bc;
 		}

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

@@ -146,6 +146,56 @@ public class ZysqbpEntity extends BaseEntity<Long> {
 	/** 集装箱号*/
 	private String jzxxh;
 
+	
+	/*******************************新增字段用于记录开工报、完工报填报人  plus by xh-2016-11-02**************************************/
+	/**  开工报填报人ID */
+//	private UserEntity sr;//start_reporter 之前这么写和flex的vo映射不了，不知道为啥，因为太长、有“_”？ 
+//	
+//	@ManyToOne(fetch = FetchType.LAZY, targetEntity = UserEntity.class)
+//	@JoinColumn(name = "sr")
+//	@RemotingExclude 
+//	public UserEntity getSr() {
+//		return sr;
+//	}
+//	
+//	public void setSr(UserEntity sr) {
+//		this.sr = sr;
+//	}
+	
+	/** 完工报填报人ID*/
+//	private UserEntity fr;
+//	
+//	@ManyToOne(fetch = FetchType.LAZY, targetEntity = UserEntity.class)
+//	@JoinColumn(name = "fr")
+//	@RemotingExclude 
+//	public UserEntity getFr() {
+//		return fr;
+//	}
+//	
+//	public void setFr(UserEntity fr) {
+//		this.fr = fr;
+//	}
+    //以上用ID的方式不行，会与user表进行连表查询会报错，但是省级数据库user表并没有与市级同步，会报错，所以这边是直接用名字吧
+	
+	private String sr;
+	public String getSr() {
+		return sr;
+	}
+	public void setSr(String sr) {
+		this.sr = sr;
+	}
+
+	private String fr;
+	public String getFr() {
+		return fr;
+	}
+	public void setFr(String fr) {
+		this.fr = fr;
+	}
+
+	
+	/*-------------------------------新增字段用于记录开工报、完工报填报人 end -------------------------------------------------------------*/
+	
 	public String getCnno() {
 		return cnno;
 	}

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/impl/zysqbp/ZysqbpServiceImpl.java

@@ -2246,7 +2246,7 @@ public class ZysqbpServiceImpl extends BaseWorkFlowServiceImpl<ZysqbpEntity, Lon
 	}
 
 	@Override
-	public ZysqbpEntity kgwgSave(ZysqbpEntity entity) {
+	public ZysqbpEntity saveKgwg(ZysqbpEntity entity) {
 		long startTime = System.currentTimeMillis();
 		String url = Thread.currentThread().getStackTrace()[2].getClassName()
 				+ "."

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/zysqbp/ZysqbpService.java

@@ -104,13 +104,6 @@ public interface ZysqbpService extends BaseWorkFlowService {
 
 	public ZysqbpGatherEntity gatherImformattion(Long szd);
 
-	/***
-	 * 开工或者完工情况填写后同步到省级
-	 * 
-	 * @param entity
-	 * @return
-	 */
-	public ZysqbpEntity kgwgSave(ZysqbpEntity entity);
 
 	public int countTodaEntities();
 
@@ -381,4 +374,13 @@ public interface ZysqbpService extends BaseWorkFlowService {
 	public String findDataMenu(String type);
 	
 	public String findRcharMenu(Long num, String type);
+
+	/***
+	 * 开工或者完工情况填写后同步到省级
+	 * 
+	 * @param entity
+	 * @return
+	 */
+	//public ZysqbpEntity kgwgSave(ZysqbpEntity entity);
+	public ZysqbpEntity saveKgwg(ZysqbpEntity entity);
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/webService/zysqbp/WhsqbpWebService.java

@@ -448,7 +448,7 @@ public class WhsqbpWebService extends BaseController {
 			entity.setXg(sqbp.getXg());
 			entity.setWgzt(sqbp.getWgzt());
 			entity.setWgsj(sqbp.getWgsj());
-			sqbp = zysqbpService.kgwgSave(entity);
+			sqbp = zysqbpService.saveKgwg(entity);
 		}
 		return sqbp;
 	}

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

@@ -25,7 +25,7 @@ web.service.url=localhost
 web.service.port=8087
 
 # Province WebService 
-web.province.service.url = 192.168.57.71
+web.province.service.url = 192.168.57.36
 web.province.service.port=8089
 
 #\u4f5c\u4e1a\u7533\u62a5\uff0c\u95f4\u9694\u7684\u65f6\u95f4\uff0c\u5fc5\u987b\u5b8c\u6210
@@ -47,7 +47,7 @@ zysb.check=N
 #\u5bc6\u94a5
 my_yjpt_gkj=yjpt_gkj
 #\u5bc6\u7801\u6709\u6548\u671f\u9650
-password.yxq=20161230
+password.yxq=20171230
 
 #\u9644\u8bc1\u4e8c\u7ef4\u7801\u5730\u5740
 fz.qrcode=http://m.yuanxd.com:8091/weixinoa/mobile/fuzheng/wxhwzyfz.jsp?code=

gkaq/yjpt-java/trunk/resources/spring/applicationContext-datachange.xml

@@ -14,8 +14,7 @@
 		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd">
 	<description>数据交换配置 </description>
 	<!-- 权利阳光 Jpa Entity Manager 配置 -->
-	<bean id="entityManagerFactory-qlyg" 
-		class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
+	<bean id="entityManagerFactory-qlyg" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
 		<property name="dataSource" ref="dataSource-qlyg" />
 		<property name="jpaVendorAdapter" ref="hibernateJpaVendorAdapter" />
 		<property name="packagesToScan" value="com.jtgh.qlyg.entity" />

gkaq/yjpt-java/trunk/resources/spring/applicationContext-workflow.xml

@@ -16,9 +16,9 @@
 		<property name="history" value="full" />
 		<property name="deploymentResources">
 			<list>
-				<value>classpath*:/deployments/jdjc.*</value>
-					<!--
+				<!--
 					<value>classpath*:/deployments/*</value>
+					<value>classpath*:/deployments/jdjc.*</value>
 					<value>classpath*:/deployments/bgzysbsp-city.*</value>
 					<value>classpath*:/deployments/qxzysbsp-city.*</value>
 					<value>classpath*:/deployments/autoAudit.*</value>
@@ -33,7 +33,6 @@
 					<value>classpath*:/deployments/yjyaba-city.*</value>
 					<value>classpath*:/deployments/zdsgyhpc-city.*</value>
 					<value>classpath*:/deployments/zysbsp-city.*</value>
-					<value>classpath*:/deployments/jdjc.*</value>
 				-->
 
 			</list>

gkaq/yjpt-java/trunk/resources/spring/applicationContext.xml

@@ -18,8 +18,7 @@
 	<context:component-scan base-package="com.jtgh">
 	</context:component-scan>
 
-	<context:property-placeholder
-								  ignore-resource-not-found="true" location="classpath*:spring/application.properties" />
+	<context:property-placeholder ignore-resource-not-found="true" location="classpath*:spring/application.properties" />
 
 	<!-- Jpa Entity Manager 配置 -->
 	<bean id="entityManagerFactory"
@@ -130,8 +129,7 @@
 		</tx:attributes>
 	</tx:advice>
 	<aop:config>
-		<aop:pointcut id="txPointcut"
-					  expression="execution(* com.jtgh.yjpt.service..*.*(..))" />
+		<aop:pointcut id="txPointcut" expression="execution(* com.jtgh.yjpt.service..*.*(..))" />
 		<aop:advisor advice-ref="txAdvice" pointcut-ref="txPointcut" />
 	</aop:config>
 
@@ -139,8 +137,7 @@
 	
 	<!-- WebService -->
 	<bean class="org.springframework.remoting.jaxws.SimpleJaxWsServiceExporter">
-		<property name="baseAddress"
-				  value="http://${web.service.url}:${web.service.port}/" />
+		<property name="baseAddress" value="http://${web.service.url}:${web.service.port}/" />
 	</bean>
 
 	<!-- 定时任务 一-->
@@ -163,27 +160,33 @@
 		<!-- 是否允许任务并发执行。当值为false时，表示必须等到前一个线程处理完毕后才再启一个新的线程 -->  
 	</bean> 
 	<bean id="yxqJob" class="com.jtgh.yjpt.common.servlet.YxqValid"/> 
+	
+	
+	
+	
 	<!-- 危货作业申请用户锁定-->
-	<!--bean class="org.springframework.scheduling.quartz.SchedulerFactoryBean">  
-       <property name="triggers">  
-           <list>  
-              <ref bean="whzrsbTrigger"/>  
-           </list>  
-       </property>  
-       <property name="autoStartup" value="true"/>  
-	</bean>  
-	<bean id="whzrsbTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">  
-       <property name="jobDetail" ref="whzyjobDetail"/>  
-       <property name="cronExpression" value="* * 2 * * ?"/>
-	</bean>  
-	<bean id="whzyjobDetail" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">   
-        <property name="targetObject" ref="whzrsbJob"/>  
-        <property name="targetMethod" value="execute"/>  
-        <property name="concurrent" value="false"/-->
-        <!-- 是否允许任务并发执行。当值为false时，表示必须等到前一个线程处理完毕后才再启一个新的线程 -->  
-	<!--/bean> 
-	<bean id="whzrsbJob" class="com.jtgh.yjpt.common.servlet.WhzyValid"/--> 
-	<!-- 经营人的定时任务-->
+<!-- 	<bean class="org.springframework.scheduling.quartz.SchedulerFactoryBean">   -->
+<!--        <property name="triggers">   -->
+<!--            <list>   -->
+<!--               <ref bean="whzrsbTrigger"/>   -->
+<!--            </list>   -->
+<!--        </property>   -->
+<!--        <property name="autoStartup" value="true"/>   -->
+<!-- 	</bean>   -->
+<!-- 	<bean id="whzrsbTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">   -->
+<!--        <property name="jobDetail" ref="whzyjobDetail"/>   -->
+<!--        <property name="cronExpression" value="* * 2 * * ?"/> -->
+<!-- 	</bean>   -->
+<!-- 	<bean id="whzyjobDetail" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">    -->
+<!--         <property name="targetObject" ref="whzrsbJob"/>   -->
+<!--         <property name="targetMethod" value="execute"/>   -->
+<!--         <property name="concurrent" value="false"/>  -->
+<!-- 	</bean>  -->
+<!-- 	<bean id="whzrsbJob" class="com.jtgh.yjpt.common.servlet.WhzyValid"/>  -->
+	
+	
+	<!-- ******************************quartz定时任务********************************* -->
+	<!-- quartz定时任务设置及相关trigger引用 -->
 	<bean class="org.springframework.scheduling.quartz.SchedulerFactoryBean">  
        <property name="triggers">  
            <list>  
@@ -200,7 +203,10 @@
            </list>  
        </property>  
        <property name="autoStartup" value="true"/>  
-	</bean>  
+	</bean> 
+	
+	<!-- ******************************1****************************** -->
+	<!-- trigger:jyrSynTimerTrigger -->
 	<bean id="jyrSynTimerTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">  
        <property name="jobDetail" ref="jyrSynTimejobDetail"/>  
        <property name="cronExpression" value="0 30 1 * * ?"/>
@@ -212,6 +218,9 @@
         <!-- 是否允许任务并发执行。当值为false时，表示必须等到前一个线程处理完毕后才再启一个新的线程 -->  
 	</bean> 
 	<bean id="jyrSynTimer" class="com.jtgh.yjpt.common.systimer.JyrSynTimer"/> 
+	
+	<!-- ******************************2****************************** -->
+	<!-- trigger:baTrigger -->
 	<!-- 安全备案模块的同步 -->
 	<bean id="baTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">  
 		<property name="jobDetail" ref="baJobDetail"/>  
@@ -224,6 +233,9 @@
 		<!-- 是否允许任务并发执行。当值为false时，表示必须等到前一个线程处理完毕后才再启一个新的线程 -->  
 	</bean> 
 	<bean id="baJob" class="com.jtgh.yjpt.common.systimer.BaSycn"/> 
+	
+	<!-- ******************************3****************************** -->
+	<!-- trigger:spTrigger -->
 	<!-- 安全审批模块的同步 -->
 	<bean id="spTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">  
 		<property name="jobDetail" ref="spJobDetail"/>  
@@ -235,11 +247,14 @@
 		<property name="concurrent" value="false"/>
 		<!-- 是否允许任务并发执行。当值为false时，表示必须等到前一个线程处理完毕后才再启一个新的线程 -->  
 	</bean> 
-	<bean id="spJob" class="com.jtgh.yjpt.common.systimer.SpSycn"/> 
+	<bean id="spJob" class="com.jtgh.yjpt.common.systimer.SpSycn"/>
+	
+	<!-- ******************************4****************************** -->
+	<!-- trigger:zcdcTrigger -->
 	<!-- 自查督查的同步 -->
 	<bean id="zcdcTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">  
 		<property name="jobDetail" ref="zcdcJobDetail"/>  
-		<property name="cronExpression" value="0 0 3 * * ?"/>
+		<property name="cronExpression" value="0 0/1 * * * ?"/>
 	</bean> 
 	<bean id="zcdcJobDetail" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">   
 		<property name="targetObject" ref="zcdcJob"/>  
@@ -248,10 +263,13 @@
 		<!-- 是否允许任务并发执行。当值为false时，表示必须等到前一个线程处理完毕后才再启一个新的线程 -->  
 	</bean> 
 	<bean id="zcdcJob" class="com.jtgh.yjpt.common.systimer.ZcdcSycn"/> 
+	
+	<!-- ******************************5****************************** -->
+	<!-- trigger:taskTrigger -->	
 	<!-- 任务的同步 -->
 	<bean id="taskTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">  
 		<property name="jobDetail" ref="taskJobDetail"/>  
-		<property name="cronExpression" value="0 0/10 * * * ?"/>
+		<property name="cronExpression" value="0 0 * * * ?"/>
 	</bean> 
 	<bean id="taskJobDetail" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">   
 		<property name="targetObject" ref="taskJob"/>  
@@ -260,10 +278,13 @@
 		<!-- 是否允许任务并发执行。当值为false时，表示必须等到前一个线程处理完毕后才再启一个新的线程 -->  
 	</bean> 
 	<bean id="taskJob" class="com.jtgh.yjpt.common.systimer.TaskSycn"/> 
+	
+	<!-- ******************************6****************************** -->
+	<!-- trigger:yjglSynTimerTrigger -->
 	<!-- 应急管理模块 -->
 	<bean id="yjglSynTimerTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">  
        <property name="jobDetail" ref="yjglSynTimerjobDetail"/>  
-       <property name="cronExpression" value="0 24 12 * * ?"/>
+       <property name="cronExpression" value="0 30 2 * * ?"/>
 	</bean>  
 	<bean id="yjglSynTimerjobDetail" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">   
         <property name="targetObject" ref="yjglSynTimer"/>  
@@ -271,8 +292,10 @@
         <property name="concurrent" value="true"/>
         <!-- 是否允许任务并发执行。当值为false时，表示必须等到前一个线程处理完毕后才再启一个新的线程 -->  
 	</bean> 
+	<bean id="yjglSynTimer" class="com.jtgh.yjpt.common.systimer.YjglSynTimer"/>
 	
-	<bean id="yjglSynTimer" class="com.jtgh.yjpt.common.systimer.YjglSynTimer"/> 
+	<!-- ******************************7****************************** -->
+	<!-- trigger:sysSynTimerTrigger -->
 	<!-- 系统设置模块 -->
 	<bean id="sysSynTimerTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">  
        <property name="jobDetail" ref="sysSynTimerjobDetail"/>  
@@ -284,9 +307,10 @@
         <property name="concurrent" value="true"/>
         <!-- 是否允许任务并发执行。当值为false时，表示必须等到前一个线程处理完毕后才再启一个新的线程 -->  
 	</bean> 
-	
 	<bean id="sysSynTimer" class="com.jtgh.yjpt.common.systimer.SysSynTimer"/> 
 	
+	<!-- ******************************8****************************** -->
+	<!-- trigger:yhTxTrigger -->
 	<!-- 每月上报隐患到期提醒 -->
 	<bean id="yhTxTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
 		<property name="jobDetail" ref="yhTxJobDetail"/>
@@ -299,7 +323,9 @@
 	</bean>
 	<bean id="yhTxJob" class="com.jtgh.yjpt.common.systimer.YhTxTimer"/>
 	
-		<!--海事数据的获取 -->
+	<!-- ******************************9****************************** -->
+	<!-- trigger:hsTrigger -->
+	<!--海事数据的获取 -->
 	<bean id="hsDataGetTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">  
 		<property name="jobDetail" ref="hsJobDataGetDetail"/>  
 		<property name="cronExpression" value="0 0-20/10 * * * ?"/>
@@ -312,6 +338,8 @@
 	 </bean> 
 	<bean id="hsDataGetJob" class="com.jtgh.yjpt.common.systimer.HsDataGet"/>
 	
+	<!-- ******************************10****************************** -->
+	<!-- trigger:hsDataGetTrigger -->
 	<!--海事的同步 -->
 	<bean id="hsTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">  
 		<property name="jobDetail" ref="hsJobDetail"/>  
@@ -324,4 +352,5 @@
 		<!-- 是否允许任务并发执行。当值为false时，表示必须等到前一个线程处理完毕后才再启一个新的线程 -->  
 	 </bean> 
 	<bean id="hsJob" class="com.jtgh.yjpt.common.systimer.HsSycn"/>
+	
 </beans>

gkaq/yjpt-java/trunk/resources/sql/init/9.update.sql.ftl

@@ -8826,6 +8826,8 @@ alter  table T_GKHS_BZHWAQSYD modify sbdwbh varchar2(30);
 alter  table T_GKHS_SZGTAQSYD modify sbdwbh varchar2(30);
 alter  table T_GKHS_SZYTAQSYD modify sbdwbh varchar2(30);
 </#if>
+
+
 <#if versionDate?date("yyyyMMdd") lt "20161013"?date("yyyyMMdd") >
 --督查中增加CG字段
 ALTER TABLE T_YJPT_DC ADD (CG NUMBER NULL)  ;
@@ -8841,7 +8843,16 @@ CREATE TABLE "T_YJPT_JYRREL" (
 COMMENT ON TABLE "YJPTLYG"."T_YJPT_JYRREL" IS '经营人和外部KEY关系表';
 COMMENT ON COLUMN "YJPTLYG"."T_YJPT_JYRREL"."KEY" IS '外部key';
 </#if>
+
+
 <#if versionDate?date("yyyyMMdd") lt "20161206"?date("yyyyMMdd")>
 ALTER TABLE T_YJPT_JYRJCXX ADD DANGER_SRC_UNIT_NUM NUMBER;
 COMMENT ON COLUMN T_YJPT_JYRJCXX.DANGER_SRC_UNIT_NUM IS '重大危险源单元';
-</#if>
+</#if>
+
+<#if versionDate?date("yyyyMMdd") lt "20170103"?date("yyyyMMdd")>
+Alter TABLE T_YJPT_WXHWGKZYSBD ADD SR VARCHAR2(100);
+Alter TABLE T_YJPT_WXHWGKZYSBD ADD FR VARCHAR2(100);
+COMMENT ON COLUMN T_YJPT_WXHWGKZYSBD.SR IS '开工报填报人StartReport';
+COMMENT ON COLUMN T_YJPT_WXHWGKZYSBD.FR IS '完工报填报人FinishReport';
+</#if>

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

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