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

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

@@ -271,6 +271,10 @@ public class Constants {
 	 */
 	public static String ZYSB_CHECK_72 = Constants.YES;
 	/**
+	 * 密码有效期
+	 */
+	public  static  String  PASSWORD_YXQ="20161001";
+	/**
 	 * 菜单类型
 	 * <p>
 	 * 0:主菜单
@@ -844,6 +848,10 @@ public class Constants {
 	 * 密钥
 	 */
 	public final static String YJPT_GKJ = "yjpt_gkj";
+	/**
+	 * 
+	 */
+	public final static String PASSWORD_REGEX="^(?=.*?[a-zA-Z])(?=.*?\\d)(?=.*?[-`=\\\\\\[\\];',.\\/~!@#$%^&*()_+|{}:<>\"]).{8,}$";
 
 	// ************************功能模块********************************************
 	/**

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

@@ -175,6 +175,11 @@ public class GlobalData {
 		if(StringUtils.hasLength(prop)) {
 			Utils.setField(null, prop, "ZYSB_CHECK_72", Constants.class);
 		}
+		prop = String.valueOf(p.get("password.yxq"));
+		if(StringUtils.hasLength(prop)) {
+			Utils.setField(null, prop, "PASSWORD_YXQ", Constants.class);
+		}
+
 		
 	}
 

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

@@ -26,6 +26,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.ResourceBundle;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import javax.imageio.ImageIO;
 import javax.persistence.criteria.CriteriaBuilder;
@@ -826,5 +828,18 @@ public abstract class Utils {
 		}
 		return null;
 	}
+	
+	/**
+	 * 判断字符是否满足某个正则表达式
+	 * @param pwd
+	 * @param regex
+	 * @return
+	 */
+	public static Boolean pwdHas(String pwd, String regex)
+	{
+		Pattern p = Pattern.compile(regex);  	  
+		Matcher m = p.matcher(pwd);  
+		return m.find();
+	}
 			
 }

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

@@ -10,7 +10,10 @@ 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;
@@ -135,6 +138,8 @@ public class AuthenticateController extends BaseController {
 			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);
 		} else {
 			bc.setAttribute("status", true);
 			// bc.setAttribute("user", user);
@@ -351,7 +356,20 @@ public class AuthenticateController extends BaseController {
 		}
 		UserEntity user = authenticateService.doLogin(usercode, password);
 		if (null != user) {
-			processLogin(bc, 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();
+			}	
+			processLogin(bc, user);			
 		} else {
 			bc.addMsg("loginError", "common", MsgLevel.ERROR);
 		}
@@ -430,7 +448,7 @@ public class AuthenticateController extends BaseController {
 	public BusinessContext changePwd(String userCode, String oldPwd,
 			String newPwd, Boolean changeByAdmin) {
 		BusinessContext bc = createBusinessContext();
-		Pattern p = Pattern.compile("^(?=.*?[a-zA-Z])(?=.*?\\d)(?=.*?[-`=\\\\\\[\\];',.\\/~!@#$%^&*()_+|{}:<>\"]).{8,}$");  	  
+		Pattern p = Pattern.compile(Constants.PASSWORD_REGEX);  	  
 		Matcher m = p.matcher(newPwd);  
 		if(!m.find()) {
 			bc.addMsg("changePwd.changePwd.errStylepwd", "common", MsgLevel.ERROR);

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/zyfzndjy/GkwxhwzyfzblhhzController.java

@@ -168,14 +168,21 @@ public class GkwxhwzyfzblhhzController extends BaseController {
 
 	/**
 	 * 一览查询
+	 * 
 	 * @param functionId
 	 * @param pageable
-	 * @param jyr 企业
-	 * @param szd 所在地
-	 * @param gq 港区
-	 * @param whdj 危货等级
-	 * @param lcStatus 流程状态
-	 * @param fddbr 法定代表人
+	 * @param jyr
+	 *            企业
+	 * @param szd
+	 *            所在地
+	 * @param gq
+	 *            港区
+	 * @param whdj
+	 *            危货等级
+	 * @param lcStatus
+	 *            流程状态
+	 * @param fddbr
+	 *            法定代表人
 	 * @return
 	 */
 	@Log(Type.QUERY)
@@ -195,8 +202,9 @@ public class GkwxhwzyfzblhhzController extends BaseController {
 							BaseEntity.RECORD_STATE_DELETE));
 					// 根据 申请单位 过滤
 					if (null != jyr && !"".equals(jyr)) {
-						list.add(cb.like(
-								root.get("jyrVo").get("gkjyr").as(String.class), "%" + jyr + "%"));
+						list.add(cb
+								.like(root.get("jyrVo").get("gkjyr")
+										.as(String.class), "%" + jyr + "%"));
 					}
 					// 根据所在地过滤
 					if (null != szd) {
@@ -281,9 +289,10 @@ public class GkwxhwzyfzblhhzController extends BaseController {
 					}
 					// 根据 申请单位 过滤
 					if (!"".equals(param.get(1))) {
-						list.add(cb.like(
-								root.get("jyrVo").get("gkjyr").as(String.class),
-								"%"+param.get(1)+"%"));
+						list.add(cb
+								.like(root.get("jyrVo").get("gkjyr")
+										.as(String.class), "%" + param.get(1)
+										+ "%"));
 					}
 					// 根据港区过滤
 					if (!"".equals(param.get(2))) {
@@ -2793,7 +2802,8 @@ public class GkwxhwzyfzblhhzController extends BaseController {
 	@Log(Type.QUERY)
 	public BusinessContext listFzxx(Pageable pageable, final JyrEntity jyr,
 			final CodeEntity szd, final GqEntity gq, final Date yxrq1,
-			final Date yxrq2, final String wxpm) {
+			final Date yxrq2, final String wxpm, final CodeEntity szqy,
+			final CodeEntity zycs) {
 		try {
 			Specification<GkwxhwzyfzblFzEntity> spec = new Specification<GkwxhwzyfzblFzEntity>() {
 
@@ -2814,11 +2824,11 @@ public class GkwxhwzyfzblhhzController extends BaseController {
 								.as(String.class)));
 					}
 					if (null != szd)
-						list.add(cb.like(root.get("jyr").get("szd").get("id")
+						list.add(cb.like(root.get("fzsq").get("szd").get("id")
 								.as(String.class), szd.getId() + "%"));
 					if (null != gq)
 						list.add(cb.equal(
-								root.get("jyr").get("szgq").as(GqEntity.class),
+								root.get("fzsq").get("ssgq").as(GqEntity.class),
 								gq));
 					if (null != jyr)
 						list.add(cb.equal(root.get("jyr").as(JyrEntity.class),
@@ -2833,6 +2843,13 @@ public class GkwxhwzyfzblhhzController extends BaseController {
 					if (null != wxpm)
 						list.add(cb.like(root.get("wxhwm").as(String.class),
 								"%" + wxpm + "%"));
+					if (null != szqy)
+						list.add(cb.equal(
+								root.get("fzsq").get("ssgq").get("gqszsylx")
+										.as(CodeEntity.class), szqy));
+					if (null != zycs)
+						list.add(cb.equal(
+								root.get("zycs").as(CodeEntity.class), zycs));
 					return cb.and(list.toArray(new Predicate[] {}));
 				}
 			};
@@ -2853,12 +2870,12 @@ public class GkwxhwzyfzblhhzController extends BaseController {
 	@RequestMapping(value = "jyxkzAndFz", method = RequestMethod.GET)
 	@ResponseBody
 	@RemotingExclude
-	public void jyxkzAndFz(String filePath,HttpServletResponse response,
+	public void jyxkzAndFz(String filePath, HttpServletResponse response,
 			HttpServletRequest request) {
 		List<CodeEntity> szds = codeService// .findSzdByParent(90011l);
 				.findSzdByParent(Constants.SZD_ID_PROVINCE);
 		if (szds != null && szds.size() > 0) {
-			 System.out.println("szd:" + szds.size() + "个!");
+			System.out.println("szd:" + szds.size() + "个!");
 		}
 		for (CodeEntity szd : szds) {
 			List<PredicateModel> filterList = new ArrayList<PredicateModel>();
@@ -2869,8 +2886,8 @@ public class GkwxhwzyfzblhhzController extends BaseController {
 					.searchByPredicateModels(filterList);
 			List<JyrEntity> jyrList = jyrService.findAll(spec);
 			if (jyrList != null && jyrList.size() > 0) {
-				 System.out
-				 .println(szd.getBz() + "的经营人" + jyrList.size() + "个!");
+				System.out
+						.println(szd.getBz() + "的经营人" + jyrList.size() + "个!");
 			}
 			for (JyrEntity jyr : jyrList) {
 				// 经营许可证扫描件
@@ -2960,4 +2977,92 @@ public class GkwxhwzyfzblhhzController extends BaseController {
 			}
 		}
 	}
+
+	public Collection<String[]> printFzxx(final List<String> param)
+			throws ParseException {
+		Collection<GkwxhwzyfzblFzEntity> dataset = null;
+		try {
+			Specification<GkwxhwzyfzblFzEntity> spec = new Specification<GkwxhwzyfzblFzEntity>() {
+				@Override
+				public Predicate toPredicate(Root<GkwxhwzyfzblFzEntity> root,
+						CriteriaQuery<?> query, CriteriaBuilder cb) {
+					List<Predicate> list = new ArrayList<Predicate>();
+					list.add(cb.notEqual(
+							root.get("recordStatus").as(String.class),
+							BaseEntity.RECORD_STATE_DELETE));
+					list.add(cb.isNotNull(root.get("fzsq").as(
+							GkwxhwzyfzblhhzEntity.class)));
+					if (root.get("fzsq") != null) {
+						list.add(cb.equal(root.get("fzsq").get("recordStatus")
+								.as(String.class),
+								BaseEntity.RECORD_STATE_COMPLETED));
+						list.add(cb.isNotNull(root.get("fzsq").get("fzjg")
+								.as(String.class)));
+					}
+					if (null != param.get(0) && !"".equals(param.get(0)))
+						list.add(cb.like(root.get("fzsq").get("szd").get("id")
+								.as(String.class),param.get(0) + "%"));
+					if (null != param.get(1) && !"".equals(param.get(1)))
+						list.add(cb.equal(
+								root.get("fzsq").get("ssgq").get("id").as(Long.class),
+								Long.parseLong( param.get(1))));
+					if (null != param.get(2) && !"".equals(param.get(2)))
+						list.add(cb.equal(root.get("jyr").get("id").as(Long.class),
+								Long.parseLong( param.get(2))));
+					if (null != param.get(3) && !"".equals(param.get(3))) {
+						try {
+							list.add(cb.greaterThanOrEqualTo(	root.get("fzsq").get("yxqjssj").as(Date.class), sdf.parse(param.get(3))));
+						} catch (ParseException e) {
+							e.printStackTrace();
+						}
+					}
+					if (null != param.get(4) && !"".equals(param.get(4))) {
+						try {
+							list.add(cb.lessThan(root.get("fzsq").get("yxqjssj")
+									.as(Date.class), DateUtil.addDate(
+									sdf.parse(param.get(4)), 1)));
+						} catch (ParseException e) {
+							e.printStackTrace();
+						}
+					}
+					if (null != param.get(5) && !"".equals(param.get(5)))
+						list.add(cb.like(root.get("wxhwm").as(String.class),
+								"%" + param.get(5) + "%"));
+					if (null != param.get(6) && !"".equals(param.get(6)))
+						list.add(cb.equal(
+								root.get("fzsq").get("ssgq").get("gqszsylx").get("id").as(Long.class),Long.parseLong(param.get(6))));
+					if (null != param.get(7) && !"".equals(param.get(7)))
+						list.add(cb.equal(
+								root.get("zycs").get("id").as(Long.class),Long.parseLong(param.get(7))));
+					return cb.and(list.toArray(new Predicate[] {}));
+				}
+			};
+			dataset = gkwxhwzyfzService.findAll(spec, sort);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		Collection<String[]> strings = new ArrayList<String[]>();
+		int i = 1;
+		if (dataset != null)
+			for (GkwxhwzyfzblFzEntity entity : dataset) {
+				String[] ss = new String[] {
+							i + "",
+							null==entity.getFzsq()?"":entity.getFzsq().getByzd1(),
+							null == entity.getJyr() ? "" : entity.getJyr().getGkjyr(),
+							entity.getQynbmc(),
+							entity.getFzcsbh(),
+							entity.getByzd5(),
+							null==entity.getFzsq()?"":entity.getFzsq().getFzjg(),
+							(null==entity.getFzsq()||null==entity.getFzsq().getFzsj())?"":sdf.format(entity.getFzsq().getFzsj()),
+							(null==entity.getFzsq()||null==entity.getFzsq().getYxqjssj())?"":sdf.format(entity.getFzsq().getYxqjssj()),
+							(null==entity.getFzsq()||null==entity.getFzsq().getSsgq()) ? "" : entity.getFzsq().getSsgq()
+									.getGqmc(),
+							(null==entity.getFzsq()||null==entity.getFzsq().getSzd()) ? "" : resource
+									.getString(entity.getFzsq().getSzd().getName()) 
+					};
+				strings.add(ss);
+				i++;
+				} 
+		return strings;
+	}
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/entity/auth/UserEntity.java

@@ -134,6 +134,9 @@ public class UserEntity extends BaseEntity<Long> {
 	
 	/** 是否船代 **/
 	private String sfcd = null;
+	
+	/**密码是否有效*/
+	private Date pdyxq = null ;
 
 	public String getBgdz() {
 		return bgdz;
@@ -382,4 +385,16 @@ public class UserEntity extends BaseEntity<Long> {
 		this.sfcd = sfcd;
 	}
 
+	@Transient
+	@XmlTransient
+	public Date getPdyxq() {
+		return pdyxq;
+	}
+
+	public void setPdyxq(Date pdyxq) {
+		this.pdyxq = pdyxq;
+	}
+
+
+
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/hs/CbService.java

@@ -1,5 +1,7 @@
 package com.jtgh.yjpt.service.hs;
 
+import java.util.List;
+
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.domain.Specification;
@@ -20,4 +22,6 @@ public interface CbService {
 			Pageable pageable);
 
 	public void save(CbEntity entity);
+
+	public List<CbEntity> findAll(Specification<CbEntity> spec);
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/impl/auth/AuthenticateServiceImpl.java

@@ -1,7 +1,12 @@
 package com.jtgh.yjpt.service.impl.auth;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import javax.servlet.http.HttpSession;
 
@@ -53,6 +58,17 @@ public class AuthenticateServiceImpl implements AuthenticateService {
 					user.getAddUser().getCode();
 				if (user.getUpdateUser() != null)
 					user.getUpdateUser().getCode();
+				Pattern p = Pattern.compile(Constants.PASSWORD_REGEX);  	  
+				Matcher m = p.matcher(password);  
+				if(!m.find()){				
+					try {
+						SimpleDateFormat s = new SimpleDateFormat("yyyyMMdd");	
+						Date yxq = Utils.getDateLastTime(s.parse(Constants.PASSWORD_YXQ));
+						user.setPdyxq(yxq);
+					} catch (ParseException e) {
+						e.printStackTrace();
+					}			
+				}
 				session.setAttribute(GlobalData.USER_SESSION_KEY, user);
 				return user;
 			}

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/impl/hs/CbServiceImpl.java

@@ -1,5 +1,7 @@
 package com.jtgh.yjpt.service.impl.hs;
 
+import java.util.List;
+
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 
@@ -36,5 +38,15 @@ public class CbServiceImpl implements CbService {
 	public void save(CbEntity entity) {
 		entityManager.persist(entity);
 	}
+	
+	@Override
+	public List<CbEntity> findAll(Specification<CbEntity> spec) {
+		try {
+			return query.findAll(spec, CbEntity.class);
+		}catch (Exception e) {
+			e.printStackTrace();
+			return null;
+		}
+	}
 
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/zyfzndjy/GkwxhwzyfzService.java

@@ -6,10 +6,12 @@ package com.jtgh.yjpt.service.zyfzndjy;
  * @author 马都喜
  */
 
+import java.util.Collection;
 import java.util.List;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
 import org.springframework.data.jpa.domain.Specification;
 
 import com.jtgh.yjpt.entity.zyfzhz.GkwxhwzyfzhzEntity;
@@ -30,6 +32,9 @@ public interface GkwxhwzyfzService extends BaseWorkFlowService {
 
 	public List<GkwxhwzyfzblFzEntity> findByFzsq(
 			GkwxhwzyfzblhhzEntity gkwxhwzyfzblhhzEntity);
+	
+	public Collection<GkwxhwzyfzblFzEntity> findAll(
+			Specification<GkwxhwzyfzblFzEntity> spec, Sort sort);
 
 	public List<GkwxhwzyfzblFzEntity> findByFzhz(
 			GkwxhwzyfzhzEntity gkwxhwzyfzhzEntity);

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

@@ -24,6 +24,7 @@ import com.jtgh.yjpt.client.zysqbp.ZysqbpWebService;
 import com.jtgh.yjpt.common.Constants;
 import com.jtgh.yjpt.common.GlobalData;
 import com.jtgh.yjpt.common.PredicateModel;
+import com.jtgh.yjpt.common.PredicateModel.JoinType;
 import com.jtgh.yjpt.common.PredicateModel.Operator;
 import com.jtgh.yjpt.common.SinglePageRequest;
 import com.jtgh.yjpt.common.SpecificationCreater;
@@ -914,5 +915,50 @@ public class WhsqbpWebService extends BaseController {
 		return list;
 	}
 	
+	/**
+	 * 根据英文名称获取船舶信息
+	 * @param ywcm
+	 * @return
+	 */
+	public CbEntity getCbByYwcm(String ywcm){
+		List<PredicateModel> filterList = new ArrayList<PredicateModel>();
+		addNotEmptyModel(filterList, "ywcm", ywcm, PredicateModel.Operator.EQ);
+		Specification<CbEntity> spec = SpecificationCreater
+				.searchByPredicateModels(filterList);
+		List<CbEntity> list =cbService.findAll(spec);	
+		if(list!=null && list.size()>0){
+			return list.get(0);
+		}
+		return null;
+	}
+	
 	
+	/**
+	 * 根据船舶获取申报记录（已完成）
+	 * @param cm
+	 * @param n
+	 * @param pageCount
+	 * @return
+	 */
+	public List<ZysqbpEntity> getZysqbpPageListByCb( String cm,int n, int pageCount) {
+		List<PredicateModel> filterList = new ArrayList<PredicateModel>();
+		List<PredicateModel> recordList = new ArrayList<PredicateModel>();
+		// 只检索已完成和变更已完成的数据
+		addNotEmptyModel(recordList, "recordStatus",
+						BaseEntity.RECORD_STATE_BGCOMPLETED, Operator.EQ);
+		addNotEmptyModel(recordList, "recordStatus",
+				BaseEntity.RECORD_STATE_COMPLETED, Operator.EQ);
+		filterList.add(new PredicateModel(JoinType.OR, recordList));
+		// 根据船名
+		addNotEmptyModel(filterList, "cm", cm, Operator.EQ);
+		Specification<ZysqbpEntity> spec = SpecificationCreater
+				.searchByPredicateModels(filterList);
+		SinglePageRequest page = new SinglePageRequest(pageCount, n, "desc",
+				"bgsj");
+		Page<ZysqbpEntity> list = zysqbpService.findAll(spec, page);
+		if(list==null||list.getTotalPages()<pageCount){
+			return  new ArrayList<ZysqbpEntity>();
+		}
+		return list.getContent();
+	}
 }

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

@@ -83,6 +83,7 @@ fileSelect=\u8bf7\u9009\u62e9\u6587\u4ef6\u4e0a\u4f20
 form.no=\u5426
 form.yes=\u662f
 login.title=\u6c5f\u82cf\u7701\u6e2f\u53e3\u5b89\u5168\u76d1\u7ba1\u4e0e\u5e94\u6025\u7ba1\u7406\u7cfb\u7edf
+loginPasswordError=\u8be5\u7528\u6237\u7981\u6b62\u767b\u9646\uff0c\u767b\u9646\u5931\u8d25\uff01
 loginError=\u7528\u6237\u540d\u6216\u5bc6\u7801\u9519\u8bef\uff0c\u767b\u5f55\u5931\u8d25\uff01
 login.btnLogin=\u767b\u5f55
 login.btnRegist=\u6ce8\u518c
@@ -209,6 +210,7 @@ logoutConfirmTitle=\u767b\u51fa\u7cfb\u7edf
 otherConfirm=\u786e\u8ba4\u64cd\u4f5c\uff1f
 otherConfirmTitle=\u786e\u8ba4\u4fe1\u606f
 
+password.yxq= \u60a8\u5f53\u524d\u5bc6\u7801\u4e0d\u6ee1\u8db3\u590d\u6742\u5ea6\u8981\u6c42\uff088\u4f4d\u53ca\u4ee5\u4e0a\u5e76\u5305\u62ec\u5b57\u6bcd\u3001\u6570\u5b57\u3001\u7279\u6b8a\u5b57\u7b26\uff09\uff0c\u5f53\u524d\u5bc6\u7801\u8fd8\u53ef\u4ee5\u7ee7\u7eed\u4f7f\u7528\u81f3{0}\uff0c\u5efa\u8bae\u60a8\u7acb\u5373\u4fee\u6539\u5bc6\u7801\uff01
 session.timeout=\u4f1a\u8bdd\u8d85\u65f6\uff0c\u8bf7\u91cd\u65b0\u767b\u5f55\uff01
 systemError=\u7cfb\u7edf\u9519\u8bef
 systemTip=\u7cfb\u7edf\u63d0\u793a

gkaq/yjpt-java/trunk/resources/frxzxk/frxzxk.properties

@@ -12,7 +12,7 @@ xzxdrmc-9001102=\u9547\u6c5f\u5e02\u4ea4\u901a\u8fd0\u8f93\u5c40
 #\u8bb8\u53ef\u673a\u5173
 xkjg-90014=\u5357\u4eac\u5e02\u4ea4\u901a\u8fd0\u8f93\u5c40
 xkjg-9001401=\u5357\u4eac\u5e02\u4ea4\u901a\u8fd0\u8f93\u5c40
-xkjg-9001402=\u5357\u4eac\u5e02\u4ea4\u901a\u8fd0\u8f93\u5c40
+xkjg-9001402=\u5357\u4eac\u5e02\u516d\u5408\u533a\u6e2f\u53e3\u7ba1\u7406\u6240
 xkjg-90011=\u9547\u6c5f\u5e02\u4ea4\u901a\u8fd0\u8f93\u5c40
 xkjg-9001101=\u9547\u6c5f\u5e02\u4ea4\u901a\u8fd0\u8f93\u5c40
 xkjg-9001102=\u9547\u6c5f\u5e02\u4ea4\u901a\u8fd0\u8f93\u5c40

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

@@ -21,8 +21,8 @@ hibernate.hbm2ddl.auto=
 
 
 # local WebService
-web.service.url=192.168.57.40
-web.service.port=8088
+web.service.url=localhost
+web.service.port=28088
 
 # Province WebService 
 web.province.service.url=192.168.39.115
@@ -46,6 +46,8 @@ dc.yqzg=Y
 zysb.check=N
 #\u5bc6\u94a5
 my_yjpt_gkj=yjpt_gkj
+#\u5bc6\u7801\u6709\u6548\u671f\u9650
+password.yxq=20161001
 
 #\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/application.properties.ftl

@@ -54,6 +54,8 @@ dc.yqzg=N
 zysb.check=N
 #密钥
 my_yjpt_gkj=yjpt_gkj
+#密码有效期限
+password.yxq=20161001
 
 #附证二维码地址
 fz.qrcode=http://m.yuanxd.com:8091/weixinoa/mobile/fuzheng/wxhwzyfz.jsp?code=

gkaq/yjpt-java/trunk/resources/sql/init/1.table.sql

@@ -1512,7 +1512,7 @@ create table T_YJPT_CG
   clfs          VARCHAR2(10),
   fjdsssfnjjzs  VARCHAR2(10),
   zsbh          VARCHAR2(40),
-  tbr           VARCHAR2(40),
+  tbr           VARCHAR2(100),
   lxdh          VARCHAR2(40),
   tbsj          DATE,
   hysl          NUMBER,
@@ -2266,7 +2266,7 @@ create table T_YJPT_GKAQPJJGSQBAB
   byzd3         VARCHAR2(100),
   byzd4         VARCHAR2(100),
   byzd5         VARCHAR2(100),
-  tbr           VARCHAR2(50),
+  tbr           VARCHAR2(100),
   tbsj          TIMESTAMP(6),
   record_code   VARCHAR2(30),
   babh          VARCHAR2(100),
@@ -2453,7 +2453,7 @@ create table T_YJPT_GKSSSB
   id            NUMBER not null,
   ssmc          VARCHAR2(80),
   qymc          VARCHAR2(40),
-  tbr           VARCHAR2(40),
+  tbr           VARCHAR2(100),
   lxdh          VARCHAR2(40),
   szd           NUMBER,
   szgq          NUMBER,
@@ -5467,7 +5467,7 @@ create table T_YJPT_QSK
   yt            VARCHAR2(40),
   szyq          VARCHAR2(40),
   gyrk          NUMBER,
-  tbr           VARCHAR2(40),
+  tbr           VARCHAR2(100),
   add_user      VARCHAR2(50),
   add_date      TIMESTAMP(6),
   update_user   VARCHAR2(50),
@@ -6877,7 +6877,7 @@ create table T_YJPT_YJJYNLJBQK
   yjjyzjk_f      CHAR(1),
   yjjyzjk_rs     NUMBER,
   yjjyzjk_zylx   VARCHAR2(1000),
-  tbr            VARCHAR2(50),
+  tbr            VARCHAR2(100),
   tbrlxdh        VARCHAR2(30),
   add_user       VARCHAR2(50),
   add_date       TIMESTAMP(6),
@@ -7502,7 +7502,7 @@ create table T_YJPT_YJYA
   zyfz_id       NUMBER,
   qymc          NUMBER,
   fbsj          TIMESTAMP(6),
-  tbr           VARCHAR2(50),
+  tbr           VARCHAR2(100),
   tbrlxdh       VARCHAR2(20),
   gkdw          VARCHAR2(200),
   dwaddress     VARCHAR2(100),
@@ -7777,7 +7777,7 @@ create table T_YJPT_YJYL
   byzd5         VARCHAR2(100),
   ylgjz         VARCHAR2(100),
   tbsj          TIMESTAMP(6),
-  tbr           VARCHAR2(30),
+  tbr           VARCHAR2(100),
   zzz1          VARCHAR2(50),
   zzxs1         CHAR(1),
   zzz2          VARCHAR2(50),
@@ -8532,7 +8532,7 @@ create table T_YJPT_ZDSGYHPCZGBA
   byzd3         VARCHAR2(100),
   byzd4         VARCHAR2(100),
   byzd5         VARCHAR2(100),
-  tbr           VARCHAR2(50),
+  tbr           VARCHAR2(100),
   tbsj          TIMESTAMP(6),
   record_code   VARCHAR2(30),
   babh          VARCHAR2(100),

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

@@ -8629,7 +8629,7 @@ COMMENT ON COLUMN T_YJPT_CGSY.szd IS '所在地';
 ALTER TABLE T_YJPT_CGSY ADD CONSTRAINT T_YJPT_CGSY_pk PRIMARY KEY (ID);
 CREATE SEQUENCE SEQ_T_YJPT_CGSY MINVALUE ${seqMinvalue} MAXVALUE ${seqMaxvalue} INCREMENT BY 1 START WITH ${seqStartWith} CACHE ${seqCache} NOORDER NOCYCLE;
 </#if>
-<#if versionDate?date("yyyyMMdd") lt "20160715"?date("yyyyMMdd"）
+<#if versionDate?date("yyyyMMdd") lt "20160715"?date("yyyyMMdd")>
 --人员基本信息增加照片附件 7.11
 Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,BZ,SZD,GQ,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (10000366,null,'null','FJSSLX',6,'T_YJPT_JYRDRYXX',null,null,null,null,1,null,null,null,null,null,'人员基本信息',null,null,'0',null,null,null,null,null);
 </#if>
@@ -8640,8 +8640,45 @@ UPDATE T_YJPT_GGDM G SET G.PX=3 WHERE G.ID=2203;
 Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,BZ,SZD,GQ,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (2204,null,'SXLX',null,1,'SXLX.CJGL',null,null,null,null,1,null,null,null,null,null,' 长江干流',null,null,'0',null,null,null,null,null);
 Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,BZ,SZD,GQ,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (2205,null,'SXLX',null,2,'SXLX.HHSX',null,null,null,null,1,null,null,null,null,null,' 淮河水系',null,null,'0',null,null,null,null,null);
 Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,BZ,SZD,GQ,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (2206,null,'SXLX',null,3,'SXLX.CJZL',null,null,null,null,1,null,null,null,null,null,' 长江支流',null,null,'0',null,null,null,null,null);
-Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,BZ,SZD,GQ,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (22076,null,'SXLX',null,4,'SXLX.QTSX',null,null,null,null,1,null,null,null,null,null,' 其他水系',null,null,'0',null,null,null,null,null);
+Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,BZ,SZD,GQ,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (2207,null,'SXLX',null,4,'SXLX.QTSX',null,null,null,null,1,null,null,null,null,null,' 其他水系',null,null,'0',null,null,null,null,null);
+--更新泊位型式
+DELETE FROM T_YJPT_GGDM WHERE GROUPCODE LIKE 'BWXS%';
+Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,BZ,SZD,GQ,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (10000002,null,'BWXS','BWXS',1,'BWXS.ZLS',null,null,null,null,1,null,null,null,null,null,'泊位型式.直立式',null,null,'0',null,null,null,null,null);
+Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,BZ,SZD,GQ,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (10000003,null,'BWXS','BWXS',2,'BWXS.XP',null,null,null,null,1,null,null,null,null,null,'泊位型式.斜坡',null,null,'0',null,null,null,null,null);
+Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,BZ,SZD,GQ,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (10000004,null,'BWXS','BWXS',3,'BWXS.FMT',null,null,null,null,1,null,null,null,null,null,'泊位型式.浮码头',null,null,'0',null,null,null,null,null);
+Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,BZ,SZD,GQ,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (10000005,null,'BWXS','BWXS',4,'BWXS.DDXB',null,null,null,null,1,null,null,null,null,null,'泊位型式.单点系泊',null,null,'0',null,null,null,null,null);
+Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,BZ,SZD,GQ,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (10000006,null,'BWXS','BWXS',5,'BWXS.GBZXPT',null,null,null,null,1,null,null,null,null,null,'泊位型式.过驳装卸平台',null,null,'0',null,null,null,null,null);
+Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,BZ,SZD,GQ,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (10000007,null,'BWXS','BWXS',6,'BWXS.QT',null,null,null,null,1,null,null,null,null,null,'泊位型式.其他',null,null,'0',null,null,null,null,null);
+Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,BZ,SZD,GQ,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (10000008,10000002,'BWXS2','BWXS2',1,'BWXS2.ZLS',null,null,null,null,1,null,null,null,null,null,'泊位型式2.重力式',null,null,'0',null,null,null,null,null);
+Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,BZ,SZD,GQ,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (10000009,10000002,'BWXS2','BWXS2',2,'BWXS2.BZ',null,null,null,null,1,null,null,null,null,null,'泊位型式2.板桩',null,null,'0',null,null,null,null,null);
+Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,BZ,SZD,GQ,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (10000010,10000002,'BWXS2','BWXS2',3,'BWXS2.GZ',null,null,null,null,1,null,null,null,null,null,'泊位型式2.高桩',null,null,'0',null,null,null,null,null);
+Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,BZ,SZD,GQ,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (10000011,10000002,'BWXS2','BWXS2',4,'BWXS2.QT',null,null,null,null,1,null,null,null,null,null,'泊位型式2.其他',null,null,'0',null,null,null,null,null);
+Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,BZ,SZD,GQ,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (10001004,10000003,'BWXS','BWXS',1,'BWXS2.PDJXP',null,null,null,null,1,null,null,null,null,null,'泊位型式2.皮带机斜坡',null,null,'0',null,null,null,null,null);
+Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,BZ,SZD,GQ,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (10001005,10000003,'BWXS','BWXS',2,'BWXS2.LCMT',null,null,null,null,1,null,null,null,null,null,'泊位型式2.缆车码头',null,null,'0',null,null,null,null,null);
+Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,BZ,SZD,GQ,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (10001006,10000003,'BWXS','BWXS',3,'BWXS2.QT',null,null,null,null,1,null,null,null,null,null,'泊位型式2.其他',null,null,'0',null,null,null,null,null);
 --天宁区的行政区划 修正 0701
 UPDATE T_YJPT_GGDM G SET G.ID=320402 WHERE G.ID=320401320402;
 UPDATE T_YJPT_JYRJCXX J SET J.XZQH=320402 WHERE J.XZQH=320401320402;
+</#if>
+
+<#if versionDate?date("yyyyMMdd") lt "20160722"?date("yyyyMMdd") >
+--增加申报单集装箱箱号长度
+Alter TABLE T_YJPT_WXHWGKZYSBD MODIFY (JZXXH VARCHAR2(2000));
+Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,RECORD_STATUS,BZ,RECORD_CODE) values (11200016,null,'MSG','BACK',1,'BACK',1,'不同意作业','0');
+Update T_YJPT_GGDM set bz='不同意作业' where id=11200015;
+
+--用户增加密码校验天数
+alter table t_yjpt_user add  pdyxq  TIMESTAMP(6);
+comment on column T_YJPT_USER.pdyxq
+--填表人字段加长
+alter table T_YJPT_CG modify tbr varchar2(100);
+alter table T_YJPT_GKAQPJJGSQBAB modify tbr varchar2(100);
+alter table T_YJPT_GKSSSB modify tbr varchar2(100);
+alter table T_YJPT_QSK modify tbr varchar2(100);
+alter table T_YJPT_YJJYNLJBQK modify tbr varchar2(100);
+alter table T_YJPT_YJYL modify tbr varchar2(100);
+alter table T_YJPT_ZDSGYHPCZGBA modify tbr varchar2(100);
+alter table T_YJPT_GKSSSB modify tbr varchar2(100);
+alter table T_YJPT_QSK modify tbr varchar2(100);
+alter table T_YJPT_YJJYNLJBQK modify tbr varchar2(100);
 </#if>

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

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