线程同步

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

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

@@ -215,6 +215,7 @@ public class ZysqbpController extends BaseController {
 
 	/**
 	 * 一览查询
+	 * 
 	 * @param pageable
 	 * @param functionId
 	 * @param entity
@@ -269,7 +270,7 @@ public class ZysqbpController extends BaseController {
 							&& !"".equals(entity.getWxhwmcbh()))
 						list.add(cb.like(root.get("wxhwmcbh").as(String.class),
 								"%" + entity.getWxhwmcbh() + "%"));
-					if(null!=entity.getZydw()) {
+					if (null != entity.getZydw()) {
 						list.add(cb.equal(
 								root.get("zydw").get("id").as(String.class),
 								entity.getZydw().getId()));
@@ -384,9 +385,10 @@ public class ZysqbpController extends BaseController {
 		return null;
 
 	}
-	
+
 	/**
-	 *计算不通过和被退回的数量 
+	 * 计算不通过和被退回的数量
+	 * 
 	 * @param functionId
 	 * @param entity
 	 * @param lcStatus
@@ -407,7 +409,7 @@ public class ZysqbpController extends BaseController {
 			final Date wgsj1, final Date wgsj2, final String name,
 			final String gkdw) {
 		BusinessContext bc = new BusinessContext();
-		try {		
+		try {
 			Specification<ZysqbpEntity> spec1 = new Specification<ZysqbpEntity>() {
 				@Override
 				public Predicate toPredicate(Root<ZysqbpEntity> root,
@@ -437,7 +439,7 @@ public class ZysqbpController extends BaseController {
 							&& !"".equals(entity.getWxhwmcbh()))
 						list.add(cb.like(root.get("wxhwmcbh").as(String.class),
 								"%" + entity.getWxhwmcbh() + "%"));
-					if(null!=entity.getZydw()) {
+					if (null != entity.getZydw()) {
 						list.add(cb.equal(
 								root.get("zydw").get("id").as(String.class),
 								entity.getZydw().getId()));
@@ -516,7 +518,7 @@ public class ZysqbpController extends BaseController {
 							&& !"".equals(entity.getWxhwmcbh()))
 						list.add(cb.like(root.get("wxhwmcbh").as(String.class),
 								"%" + entity.getWxhwmcbh() + "%"));
-					if(null!=entity.getZydw()) {
+					if (null != entity.getZydw()) {
 						list.add(cb.equal(
 								root.get("zydw").get("id").as(String.class),
 								entity.getZydw().getId()));
@@ -788,7 +790,7 @@ public class ZysqbpController extends BaseController {
 					if (!"".equals(param.get(17)))
 						list.add(cb.equal(
 								root.get("zydw").get("id").as(Long.class),
-								Long.parseLong(param.get(17) ) ));
+								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),
@@ -1184,6 +1186,34 @@ public class ZysqbpController extends BaseController {
 	public BusinessContext save(ZysqbpEntity vo) {
 		BusinessContext bc = createBusinessContext();
 		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);
 		return bc;
@@ -1616,10 +1646,12 @@ public class ZysqbpController extends BaseController {
 						ZysqbpEntity.PROCESS_DEFINITION_KEY);
 		if (list == null || list.size() == 0) {
 			ZysqbpEntity entity2 = zysqbpService.findOne(entity.getId());
-			String tx = "提交的作业申请（船名："+ entity.getCm() +"，申报单编号："+ entity.getBh() +"）已作废";
+			String tx = "提交的作业申请（船名：" + entity.getCm() + "，申报单编号："
+					+ entity.getBh() + "）已作废";
 			if (auditflag) {
 				entity2.setRecordStatus(YjyabaEntity.RECORD_STATE_REJECT);
-				tx = "提交的作业申请（船名："+ entity.getCm() +"，申报单编号："+ entity.getBh() +"）已退回";
+				tx = "提交的作业申请（船名：" + entity.getCm() + "，申报单编号："
+						+ entity.getBh() + "）已退回";
 			} else {
 				entity2.setRecordStatus(YjyabaEntity.RECORD_STATE_CALEL);
 			}
@@ -1742,12 +1774,14 @@ public class ZysqbpController extends BaseController {
 						ZysqbpEntity.PROCESS_DEFINITION_KEY);
 		if (list == null || list.size() == 0) {
 			ZysqbpEntity entity2 = zysqbpService.findOne(entity.getId());
-			String tx = "提交的作业申请（船名："+ entity.getCm() +"，申报单编号："+ entity.getBh() +"）已审核通过";
+			String tx = "提交的作业申请（船名：" + entity.getCm() + "，申报单编号："
+					+ entity.getBh() + "）已审核通过";
 			if (auditflag) {
 				entity2.setRecordStatus(YjyabaEntity.RECORD_STATE_COMPLETED);
 			} else {
 				entity2.setRecordStatus(YjyabaEntity.RECORD_STATE_CALEL);
-				tx = "提交的作业申请（船名："+ entity.getCm() +"，申报单编号："+ entity.getBh() +"）已审核未通过";
+				tx = "提交的作业申请（船名：" + entity.getCm() + "，申报单编号："
+						+ entity.getBh() + "）已审核未通过";
 			}
 			entity2.setBh(entity.getBh());
 			ZysqbpEntity vo = zysqbpService.save(entity2);
@@ -2923,7 +2957,9 @@ public class ZysqbpController extends BaseController {
 				// 发工作提醒
 				setGztx(entity1.getId().toString(),
 						"你单位" + sdf2.format(list.get(0).getStartTime())
-								+ "提交的取消作业申请（船名："+ entity.getCm() +"，申报单编号："+ entity.getBh() +"）已审核未通过", list.get(0).getStartUser());
+								+ "提交的取消作业申请（船名：" + entity.getCm() + "，申报单编号："
+								+ entity.getBh() + "）已审核未通过", list.get(0)
+								.getStartUser());
 			}
 
 			// 同步
@@ -2950,7 +2986,9 @@ public class ZysqbpController extends BaseController {
 				// 发工作提醒
 				setGztx(entity2.getId().toString(),
 						"你单位" + sdf2.format(list2.get(0).getStartTime())
-								+ "提交的取消作业申请（船名："+ entity.getCm() +"，申报单编号："+ entity.getBh() +"）已审核通过", list2.get(0).getStartUser());
+								+ "提交的取消作业申请（船名：" + entity.getCm() + "，申报单编号："
+								+ entity.getBh() + "）已审核通过", list2.get(0)
+								.getStartUser());
 			}
 			// 同步
 			final ZysqbpEntity entity2_f = entity2;
@@ -3008,7 +3046,9 @@ public class ZysqbpController extends BaseController {
 			if (list1 != null && list1.size() > 0) {
 				setGztx(entity1.getId().toString(),
 						"你单位" + sdf2.format(list1.get(0).getStartTime())
-								+ "申请的作业变更（船名："+ entity.getCm() +"，申报单编号："+ entity.getBh() +"）已审核未通过", list1.get(0).getStartUser());
+								+ "申请的作业变更（船名：" + entity.getCm() + "，申报单编号："
+								+ entity.getBh() + "）已审核未通过", list1.get(0)
+								.getStartUser());
 			}
 			// 同步
 			tb(entity1);
@@ -3029,7 +3069,9 @@ public class ZysqbpController extends BaseController {
 			if (list2 != null && list2.size() > 0) {
 				setGztx(entity2.getId().toString(),
 						"你单位" + sdf2.format(list2.get(0).getStartTime())
-								+ "申请的作业变更（船名："+ entity.getCm() +"，申报单编号："+ entity.getBh() +"）已审核通过", list2.get(0).getStartUser());
+								+ "申请的作业变更（船名：" + entity.getCm() + "，申报单编号："
+								+ entity.getBh() + "）已审核通过", list2.get(0)
+								.getStartUser());
 			}
 			// 同步
 			tb(entity2);
@@ -3691,20 +3733,26 @@ public class ZysqbpController extends BaseController {
 					entity.setXmmc(p.get("xmmc").toString());
 					entity.setSplb(p.get("splb").toString());
 					if (null != ba.getSzd()) {
-						if(p.containsKey("xkjg-" + ba.getSzd().getId())){
+						if (p.containsKey("xkjg-" + ba.getSzd().getId())) {
 							entity.setXkjg(p.get("xkjg-" + ba.getSzd().getId())
 									.toString());
-						} else if (p.containsKey("xkjg-" + ba.getSzd().getParent().getId())) {
-							entity.setXkjg(p.get("xkjg-" + ba.getSzd().getParent().getId())
+						} else if (p.containsKey("xkjg-"
+								+ ba.getSzd().getParent().getId())) {
+							entity.setXkjg(p.get(
+									"xkjg-" + ba.getSzd().getParent().getId())
 									.toString());
 						}
-						
-						if(p.containsKey("xzxkqlbm-" + ba.getSzd().getId())){
+
+						if (p.containsKey("xzxkqlbm-" + ba.getSzd().getId())) {
 							entity.setXzxkqlbm(p.get(
-									"xzxkqlbm-" + ba.getSzd().getId()).toString());
-						} else if (p.containsKey("xzxkqlbm-" + ba.getSzd().getParent().getId())) {
+									"xzxkqlbm-" + ba.getSzd().getId())
+									.toString());
+						} else if (p.containsKey("xzxkqlbm-"
+								+ ba.getSzd().getParent().getId())) {
 							entity.setXzxkqlbm(p.get(
-									"xzxkqlbm-" + ba.getSzd().getParent().getId()).toString());
+									"xzxkqlbm-"
+											+ ba.getSzd().getParent().getId())
+									.toString());
 						}
 						entity.setDfbm(ba.getSzd().getCode());
 					}
@@ -3858,21 +3906,27 @@ public class ZysqbpController extends BaseController {
 					entity.setXmmc(p.get("xmmc").toString());
 					entity.setSplb(p.get("splb").toString());
 					if (null != zysqbpEntity.getSzd()) {
-						//许可机关
-						if(p.containsKey("xkjg-" + ba.getSzd().getId())){
+						// 许可机关
+						if (p.containsKey("xkjg-" + ba.getSzd().getId())) {
 							entity.setXkjg(p.get("xkjg-" + ba.getSzd().getId())
 									.toString());
-						} else if (p.containsKey("xkjg-" + ba.getSzd().getParent().getId())) {
-							entity.setXkjg(p.get("xkjg-" + ba.getSzd().getParent().getId())
+						} else if (p.containsKey("xkjg-"
+								+ ba.getSzd().getParent().getId())) {
+							entity.setXkjg(p.get(
+									"xkjg-" + ba.getSzd().getParent().getId())
 									.toString());
 						}
-						//行政许可权利编码
-						if(p.containsKey("xzxkqlbm-" + ba.getSzd().getId())){
+						// 行政许可权利编码
+						if (p.containsKey("xzxkqlbm-" + ba.getSzd().getId())) {
 							entity.setXzxkqlbm(p.get(
-									"xzxkqlbm-" + ba.getSzd().getId()).toString());
-						} else if (p.containsKey("xzxkqlbm-" + ba.getSzd().getParent().getId())) {
+									"xzxkqlbm-" + ba.getSzd().getId())
+									.toString());
+						} else if (p.containsKey("xzxkqlbm-"
+								+ ba.getSzd().getParent().getId())) {
 							entity.setXzxkqlbm(p.get(
-									"xzxkqlbm-" + ba.getSzd().getParent().getId()).toString());
+									"xzxkqlbm-"
+											+ ba.getSzd().getParent().getId())
+									.toString());
 						}
 						entity.setDfbm(zysqbpEntity.getSzd().getCode());
 					}
@@ -4203,13 +4257,13 @@ public class ZysqbpController extends BaseController {
 		String type = MemType.TYPE_FRXZXK;
 		switch (index) {
 		case 0:
-			 type = MemType.TYPE_FRXZXK;
+			type = MemType.TYPE_FRXZXK;
 			break;
 		case 1:
-			 type = MemType.TYPE_DSJFX;
+			type = MemType.TYPE_DSJFX;
 			break;
 		case 2:
-			 type = MemType.TYPE_SBXK;
+			type = MemType.TYPE_SBXK;
 			break;
 		default:
 			break;
@@ -4292,9 +4346,10 @@ public class ZysqbpController extends BaseController {
 		}
 		return createBusinessContext();
 	}
-	
+
 	/**
 	 * 危险货物作业许可
+	 * 
 	 * @param page
 	 * @param functioniId
 	 * @param szdId
@@ -4302,7 +4357,8 @@ public class ZysqbpController extends BaseController {
 	 * @param stop
 	 * @return
 	 */
-	public BusinessContext listOfXksb( SinglePageRequest page,Long functioniId,final Long szdId,final Date start,final Date stop) {
+	public BusinessContext listOfXksb(SinglePageRequest page, Long functioniId,
+			final Long szdId, final Date start, final Date stop) {
 		BusinessContext bc = new BusinessContext();
 		try {
 			Specification<TaskInfoEntity> spec = new Specification<TaskInfoEntity>() {
@@ -4374,8 +4430,7 @@ public class ZysqbpController extends BaseController {
 			};
 			page = new SinglePageRequest(page.getPageNumber(),
 					page.getPageSize(), "desc", "auditTime");
-			Page<TaskInfoEntity> pageList = taskService
-					.findAll1(spec, page);
+			Page<TaskInfoEntity> pageList = taskService.findAll1(spec, page);
 			List<XksbEntity> list2 = new ArrayList<XksbEntity>();
 			InputStream in = ZysqbpController.class
 					.getResourceAsStream("/frxzxk/frxzxk.properties");
@@ -4394,49 +4449,57 @@ public class ZysqbpController extends BaseController {
 				entity.setBjh(zysqbpEntity.getBh());
 				if (in != null) {
 					if (null != ba.getSzd()) {
-						if(p.containsKey("xzxkqlbm-" + ba.getSzd().getId())){
+						if (p.containsKey("xzxkqlbm-" + ba.getSzd().getId())) {
 							entity.setQlsxbm(p.get(
-									"xzxkqlbm-" + ba.getSzd().getId()).toString());
-						} else if (p.containsKey("xzxkqlbm-" + ba.getSzd().getParent().getId())) {
+									"xzxkqlbm-" + ba.getSzd().getId())
+									.toString());
+						} else if (p.containsKey("xzxkqlbm-"
+								+ ba.getSzd().getParent().getId())) {
 							entity.setQlsxbm(p.get(
-									"xzxkqlbm-" + ba.getSzd().getParent().getId()).toString());
+									"xzxkqlbm-"
+											+ ba.getSzd().getParent().getId())
+									.toString());
 						}
-						if(p.containsKey("xkjg-" + ba.getSzd().getId())){
+						if (p.containsKey("xkjg-" + ba.getSzd().getId())) {
 							entity.setYwcs(p.get("xkjg-" + ba.getSzd().getId())
 									.toString());
-						} else if (p.containsKey("xkjg-" + ba.getSzd().getParent().getId())) {
-							entity.setYwcs(p.get("xkjg-" + ba.getSzd().getParent().getId())
+						} else if (p.containsKey("xkjg-"
+								+ ba.getSzd().getParent().getId())) {
+							entity.setYwcs(p.get(
+									"xkjg-" + ba.getSzd().getParent().getId())
 									.toString());
 						}
-						
-						//承诺时限
-						if(p.containsKey("cnsx-" + ba.getSzd().getId())){
+
+						// 承诺时限
+						if (p.containsKey("cnsx-" + ba.getSzd().getId())) {
 							entity.setCnsx(p.get("cnsx-" + ba.getSzd().getId())
 									.toString());
-						} else if (p.containsKey("cnsx-" + ba.getSzd().getParent().getId())) {
-							entity.setCnsx(p.get("cnsx-" + ba.getSzd().getParent().getId())
+						} else if (p.containsKey("cnsx-"
+								+ ba.getSzd().getParent().getId())) {
+							entity.setCnsx(p.get(
+									"cnsx-" + ba.getSzd().getParent().getId())
 									.toString());
 						}
 					}
 				}
-				//联系人
+				// 联系人
 				entity.setLxr(zysqbpEntity.getBgr());
-				//联系电话
+				// 联系电话
 				entity.setLxdh(zysqbpEntity.getLxfs());
 				if (null != zysqbpEntity.getZydw()) {
-					//申请单位
-					entity.setSqdw(zysqbpEntity.getZydw().getGkjyr());		
-					//申请人联系地址
+					// 申请单位
+					entity.setSqdw(zysqbpEntity.getZydw().getGkjyr());
+					// 申请人联系地址
 					entity.setSqrlxdz(zysqbpEntity.getZydw().getBgdz());
 				}
 				Date time = ba.getAuditTime();
-				//受理时间
+				// 受理时间
 				entity.setSlsj(time);
-				//办结人姓名
+				// 办结人姓名
 				entity.setBlryxm(ba.getAuditUsername());
-				//办结状态
-				entity.setBjzt(zysqbpEntity.getRecordStatus()+"");
-				//办结意见
+				// 办结状态
+				entity.setBjzt(zysqbpEntity.getRecordStatus() + "");
+				// 办结意见
 				entity.setBjyj(ba.getAuditMsg());
 				if (zysqbpEntity.getRecordStatus() == BaseEntity.RECORD_STATE_COMPLETED) {// 已完成作业对应的流程
 					entity.setBjyj("同意办结");
@@ -4447,7 +4510,7 @@ public class ZysqbpController extends BaseController {
 				} else if (zysqbpEntity.getRecordStatus() == BaseEntity.RECORD_STATE_REJECT) {// 作废作业对应的流程
 					entity.setBjyj("不同意办结");
 				}
-				//办结时间
+				// 办结时间
 				entity.setBjsj(time);
 				list2.add(entity);
 			}
@@ -4459,9 +4522,10 @@ public class ZysqbpController extends BaseController {
 		}
 		return null;
 	}
-	
+
 	/**
 	 * 作业申报许可打印
+	 * 
 	 * @param param
 	 * @return
 	 * @throws ParseException
@@ -4574,49 +4638,57 @@ public class ZysqbpController extends BaseController {
 				entity.setBjh(zysqbpEntity.getBh());
 				if (in != null) {
 					if (null != ba.getSzd()) {
-						if(p.containsKey("xzxkqlbm-" + ba.getSzd().getId())){
+						if (p.containsKey("xzxkqlbm-" + ba.getSzd().getId())) {
 							entity.setQlsxbm(p.get(
-									"xzxkqlbm-" + ba.getSzd().getId()).toString());
-						} else if (p.containsKey("xzxkqlbm-" + ba.getSzd().getParent().getId())) {
+									"xzxkqlbm-" + ba.getSzd().getId())
+									.toString());
+						} else if (p.containsKey("xzxkqlbm-"
+								+ ba.getSzd().getParent().getId())) {
 							entity.setQlsxbm(p.get(
-									"xzxkqlbm-" + ba.getSzd().getParent().getId()).toString());
+									"xzxkqlbm-"
+											+ ba.getSzd().getParent().getId())
+									.toString());
 						}
-						if(p.containsKey("xkjg-" + ba.getSzd().getId())){
+						if (p.containsKey("xkjg-" + ba.getSzd().getId())) {
 							entity.setYwcs(p.get("xkjg-" + ba.getSzd().getId())
 									.toString());
-						} else if (p.containsKey("xkjg-" + ba.getSzd().getParent().getId())) {
-							entity.setYwcs(p.get("xkjg-" + ba.getSzd().getParent().getId())
+						} else if (p.containsKey("xkjg-"
+								+ ba.getSzd().getParent().getId())) {
+							entity.setYwcs(p.get(
+									"xkjg-" + ba.getSzd().getParent().getId())
 									.toString());
 						}
-						
-						//承诺时限
-						if(p.containsKey("cnsx-" + ba.getSzd().getId())){
+
+						// 承诺时限
+						if (p.containsKey("cnsx-" + ba.getSzd().getId())) {
 							entity.setCnsx(p.get("cnsx-" + ba.getSzd().getId())
 									.toString());
-						} else if (p.containsKey("cnsx-" + ba.getSzd().getParent().getId())) {
-							entity.setCnsx(p.get("cnsx-" + ba.getSzd().getParent().getId())
+						} else if (p.containsKey("cnsx-"
+								+ ba.getSzd().getParent().getId())) {
+							entity.setCnsx(p.get(
+									"cnsx-" + ba.getSzd().getParent().getId())
 									.toString());
 						}
 					}
 				}
-				//联系人
+				// 联系人
 				entity.setLxr(zysqbpEntity.getBgr());
-				//联系电话
+				// 联系电话
 				entity.setLxdh(zysqbpEntity.getLxfs());
 				if (null != zysqbpEntity.getZydw()) {
-					//申请单位
-					entity.setSqdw(zysqbpEntity.getZydw().getGkjyr());		
-					//申请人联系地址
+					// 申请单位
+					entity.setSqdw(zysqbpEntity.getZydw().getGkjyr());
+					// 申请人联系地址
 					entity.setSqrlxdz(zysqbpEntity.getZydw().getBgdz());
 				}
 				Date time = ba.getAuditTime();
-				//受理时间
+				// 受理时间
 				entity.setSlsj(time);
-				//办理人姓名
+				// 办理人姓名
 				entity.setBlryxm(ba.getAuditUsername());
-				//办结状态
-				entity.setBjzt(zysqbpEntity.getRecordStatus()+"");
-				//办结意见
+				// 办结状态
+				entity.setBjzt(zysqbpEntity.getRecordStatus() + "");
+				// 办结意见
 				entity.setBjyj(ba.getAuditMsg());
 				if (zysqbpEntity.getRecordStatus() == BaseEntity.RECORD_STATE_COMPLETED) {// 已完成作业对应的流程
 					entity.setBjyj("同意办结");
@@ -4627,7 +4699,7 @@ public class ZysqbpController extends BaseController {
 				} else if (zysqbpEntity.getRecordStatus() == BaseEntity.RECORD_STATE_REJECT) {// 作废作业对应的流程
 					entity.setBjyj("不同意办结");
 				}
-				//办结时间
+				// 办结时间
 				entity.setBjsj(time);
 				int i = 1;
 				if (true) {
@@ -4641,13 +4713,14 @@ public class ZysqbpController extends BaseController {
 							entity.getSqrlxdz(),
 							entity.getLxdh(),
 							entity.getCnsx(),
-							null == entity.getSlsj()? "" : sdf3.format(entity
-									.getSlsj()), 
+							null == entity.getSlsj() ? "" : sdf3.format(entity
+									.getSlsj()),
 							entity.getBlryxm(),
-							entity.getBlrygh(), 
-							entity.getBjzt(), entity.getBjyj(),
-							null == entity.getBjsj()? "" : sdf3.format(entity
-									.getBjsj())};
+							entity.getBlrygh(),
+							entity.getBjzt(),
+							entity.getBjyj(),
+							null == entity.getBjsj() ? "" : sdf3.format(entity
+									.getBjsj()) };
 					strings.add(ss);
 					i++;
 				}
@@ -4655,84 +4728,97 @@ public class ZysqbpController extends BaseController {
 		}
 		return strings;
 	}
-	
+
 	/*
-	 * 批量签章时，获取所要保护的数据 
-	 * xh 2016.7.4
-	 * (  public String GetmSignatureData(@RequestParam String documentID,HttpSession session)  )
+	 * 批量签章时，获取所要保护的数据 xh 2016.7.4 ( public String
+	 * GetmSignatureData(@RequestParam String documentID,HttpSession session) )
 	 */
 	@RequestMapping(value = "GetmSignatureData", method = RequestMethod.GET)
-	@ResponseBody 
-	public String GetmSignatureData(@RequestParam String documentID){ 
+	@ResponseBody
+	public String GetmSignatureData(@RequestParam String documentID) {
 		ZysqbpEntity data = zysqbpService.findOne(Long.parseLong(documentID));
-		
-		String audit_user="",audit_date="",audit_op="";
-		SimpleDateFormat myFmt=new SimpleDateFormat("yyyy-M-d");
-		SimpleDateFormat myFmt2=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-		
-		//审批信息
+
+		String audit_user = "", audit_date = "", audit_op = "";
+		SimpleDateFormat myFmt = new SimpleDateFormat("yyyy-M-d");
+		SimpleDateFormat myFmt2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+		// 审批信息
 		if (data.getTaskList() != null && data.getTaskList().size() > 0) {
 			for (TaskInfoEntity task : data.getTaskList()) {
 				if ("wf.sc".equals(task.getCurrName())) {
-//					parameters.put("audit_user", task.getAuditUsername());
-//					parameters.put("audit_date", task.getAuditTime());
-//					parameters.put("audit_op", task.getAuditMsg());
-//					parameters.put("audit_dept", task.getByzd2());
+					// parameters.put("audit_user", task.getAuditUsername());
+					// parameters.put("audit_date", task.getAuditTime());
+					// parameters.put("audit_op", task.getAuditMsg());
+					// parameters.put("audit_dept", task.getByzd2());
 					audit_user = task.getAuditUsername();
-					if(task.getAuditTime()!=null)
+					if (task.getAuditTime() != null)
 						audit_date = myFmt.format(task.getAuditTime());
-					audit_op =  task.getAuditMsg();	
+					audit_op = task.getAuditMsg();
 				}
 			}
 		}
-		
-		
-		String div = "\r\n";//分隔符
+
+		String div = "\r\n";// 分隔符
 		StringBuffer sb = new StringBuffer();
-		sb.append("BH="+ ((data.getBh()==null)?"":data.getBh())+ div);
-		sb.append("ZYDW="+((data.getZydw()==null)?"":data.getZydw().getGkjyr())+div);
-		sb.append("ZYWTR="+((data.getZywtr()==null)?"":data.getZywtr())+div);
-		sb.append("CM="+((data.getCm()==null)?"":data.getCm())+div);
-		sb.append("XCGLFZR="+((data.getXcglfzr()==null)?"":data.getXcglfzr())+div);
-		sb.append("WXHWMCBH="+((data.getWxhwmcbh()==null)?"":data.getWxhwmcbh())+div);
-		sb.append("WPBH="+((data.getWpbh()==null)?"":data.getWpbh())+div);
-		sb.append("JSPM="+((data.getJspm()==null)?"":data.getJspm())+div);
-		sb.append("BZ="+((data.getBz()==null)?"":data.getBz())+div);
-		sb.append("WXPLB="+((data.getWxplb()==null)?"":data.getWxplb())+div);
-		sb.append("BYZD4="+((data.getByzd4()==null)?"":data.getByzd4())+div);
-	 
-		String inorout ="";
+		sb.append("BH=" + ((data.getBh() == null) ? "" : data.getBh()) + div);
+		sb.append("ZYDW="
+				+ ((data.getZydw() == null) ? "" : data.getZydw().getGkjyr())
+				+ div);
+		sb.append("ZYWTR=" + ((data.getZywtr() == null) ? "" : data.getZywtr())
+				+ div);
+		sb.append("CM=" + ((data.getCm() == null) ? "" : data.getCm()) + div);
+		sb.append("XCGLFZR="
+				+ ((data.getXcglfzr() == null) ? "" : data.getXcglfzr()) + div);
+		sb.append("WXHWMCBH="
+				+ ((data.getWxhwmcbh() == null) ? "" : data.getWxhwmcbh())
+				+ div);
+		sb.append("WPBH=" + ((data.getWpbh() == null) ? "" : data.getWpbh())
+				+ div);
+		sb.append("JSPM=" + ((data.getJspm() == null) ? "" : data.getJspm())
+				+ div);
+		sb.append("BZ=" + ((data.getBz() == null) ? "" : data.getBz()) + div);
+		sb.append("WXPLB=" + ((data.getWxplb() == null) ? "" : data.getWxplb())
+				+ div);
+		sb.append("BYZD4=" + ((data.getByzd4() == null) ? "" : data.getByzd4())
+				+ div);
+
+		String inorout = "";
 		// 1进港/2出港
-		if(data.getInorout().equals("1")){ 
+		if (data.getInorout().equals("1")) {
 			inorout = "进港";
+		} else if (data.getInorout().equals("2")) {
+			inorout = "出港";
 		}
-		else if(data.getInorout().equals("2")){ 
-			inorout="出港";
-		} 
-		sb.append("INOROUT="+inorout+div);
-		
-		sb.append("ZYSL="+((data.getZysl()==null)?"":data.getZysl())+div);
-		sb.append("SG="+((data.getSg()==null)?"":data.getSg())+div);
-		sb.append("XG="+((data.getXg()==null)?"":data.getXg())+div);
-		
-		String mao="";
-		//1内贸/2外贸 
-		if(data.getMao().equals("1")){ 
+		sb.append("INOROUT=" + inorout + div);
+
+		sb.append("ZYSL=" + ((data.getZysl() == null) ? "" : data.getZysl())
+				+ div);
+		sb.append("SG=" + ((data.getSg() == null) ? "" : data.getSg()) + div);
+		sb.append("XG=" + ((data.getXg() == null) ? "" : data.getXg()) + div);
+
+		String mao = "";
+		// 1内贸/2外贸
+		if (data.getMao().equals("1")) {
 			mao = "内贸";
-		}
-		else if(data.getMao().equals("2")){ 
+		} else if (data.getMao().equals("2")) {
 			mao = "外贸 ";
 		}
-		sb.append("MAO="+mao+div);
-		
-		 
-		sb.append("HZWXX="+(data.getHzwxx()==null?"": resource.getString(data.getHzwxx().getName()))+div);
-		sb.append("DXDJ="+((data.getDxdj()==null)?"":data.getDxdj())+div);
-		sb.append("WRLB="+((data.getWrlb()==null)?"":data.getWrlb())+div);
-		sb.append("JZXSL="+((data.getWrlb()==null)?"":data.getWrlb())+div);
-		sb.append("HC="+((data.getHc()==null)?"":data.getHc())+div);
-		sb.append("HWZL="+  (data.getHwzl()==null?"": resource.getString(data.getHwzl().getName()))+div);
-		 	
+		sb.append("MAO=" + mao + div);
+
+		sb.append("HZWXX="
+				+ (data.getHzwxx() == null ? "" : resource.getString(data
+						.getHzwxx().getName())) + div);
+		sb.append("DXDJ=" + ((data.getDxdj() == null) ? "" : data.getDxdj())
+				+ div);
+		sb.append("WRLB=" + ((data.getWrlb() == null) ? "" : data.getWrlb())
+				+ div);
+		sb.append("JZXSL=" + ((data.getWrlb() == null) ? "" : data.getWrlb())
+				+ div);
+		sb.append("HC=" + ((data.getHc() == null) ? "" : data.getHc()) + div);
+		sb.append("HWZL="
+				+ (data.getHwzl() == null ? "" : resource.getString(data
+						.getHwzl().getName())) + div);
+
 		String hwxs = data.getHwxs();
 		String hwxs1 = "";
 		if (hwxs != null && hwxs != "") {
@@ -4820,35 +4906,46 @@ public class ZysqbpController extends BaseController {
 			}
 			hwxs1 = hwxs1.substring(0, hwxs1.length() - 1);
 		}
-		
-		sb.append("HWXS="+hwxs1+div);
-		sb.append("LHXZ="+((data.getLhxz()==null)?"":data.getLhxz())+div);
-		 
-		String zydd = ((data.getZydd()==null)?"":resource.getString(data.getZydd().getName()))+
-				((data.getZyddqybh()==null) ? "" : data.getZyddqybh().getQynbmc());
-		sb.append("ZYDD="+zydd+div);
-		  
-		sb.append("ZYSJQ="+((data.getZysjq()==null)?"":myFmt2.format(data.getZysjq()))+div);
-		sb.append("ZYSJZ="+((data.getZysjz()==null)?"":myFmt2.format(data.getZysjz()))+div);
-		sb.append("AQFFCS="+((data.getAqffcs()==null)?"":data.getAqffcs())+div);
-		sb.append("BGR="+((data.getBgr()==null)?"":data.getBgr())+div);
-		sb.append("LXFS="+((data.getLxfs()==null)?"":data.getLxfs())+div);
-		sb.append("BGSJ="+((data.getBgsj()==null)?"":myFmt2.format(data.getBgsj()))+div);
-		sb.append("BYZD2="+((data.getByzd2()==null)?"":data.getByzd2())+div);
- 
-		//审核意见 
-		sb.append("SHYJ="+audit_op+div);
-		sb.append("SHR="+audit_user+div);
-		sb.append("SHSJ="+audit_date+div);
- 
-	     
-	    try {
-			return  java.net.URLEncoder.encode(sb.toString(),"gb2312");
-		} catch (UnsupportedEncodingException e) { 
+
+		sb.append("HWXS=" + hwxs1 + div);
+		sb.append("LHXZ=" + ((data.getLhxz() == null) ? "" : data.getLhxz())
+				+ div);
+
+		String zydd = ((data.getZydd() == null) ? "" : resource.getString(data
+				.getZydd().getName()))
+				+ ((data.getZyddqybh() == null) ? "" : data.getZyddqybh()
+						.getQynbmc());
+		sb.append("ZYDD=" + zydd + div);
+
+		sb.append("ZYSJQ="
+				+ ((data.getZysjq() == null) ? "" : myFmt2.format(data
+						.getZysjq())) + div);
+		sb.append("ZYSJZ="
+				+ ((data.getZysjz() == null) ? "" : myFmt2.format(data
+						.getZysjz())) + div);
+		sb.append("AQFFCS="
+				+ ((data.getAqffcs() == null) ? "" : data.getAqffcs()) + div);
+		sb.append("BGR=" + ((data.getBgr() == null) ? "" : data.getBgr()) + div);
+		sb.append("LXFS=" + ((data.getLxfs() == null) ? "" : data.getLxfs())
+				+ div);
+		sb.append("BGSJ="
+				+ ((data.getBgsj() == null) ? ""
+						: myFmt2.format(data.getBgsj())) + div);
+		sb.append("BYZD2=" + ((data.getByzd2() == null) ? "" : data.getByzd2())
+				+ div);
+
+		// 审核意见
+		sb.append("SHYJ=" + audit_op + div);
+		sb.append("SHR=" + audit_user + div);
+		sb.append("SHSJ=" + audit_date + div);
+
+		try {
+			return java.net.URLEncoder.encode(sb.toString(), "gb2312");
+		} catch (UnsupportedEncodingException e) {
 			e.printStackTrace();
-		}  
-	     
-	    return "error";
+		}
+
+		return "error";
 	}
 
 }

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

@@ -2224,16 +2224,16 @@ public class ZysqbpServiceImpl extends
 	public ZysqbpEntity saveKgwg(ZysqbpEntity entity) {
 		entity = this.save(entity);
 		// 同步到省级
-		if (Constants.YES.equals(GlobalData.JAXWS_SYNC)) {
-			ZysqbpWebService webServce = getWebService();
-			if (webServce != null) {
-				try {
-					webServce.save(entity);
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-			}
-		}
+//		if (Constants.YES.equals(GlobalData.JAXWS_SYNC)) {
+//			ZysqbpWebService webServce = getWebService();
+//			if (webServce != null) {
+//				try {
+//					webServce.save(entity);
+//				} catch (Exception e) {
+//					e.printStackTrace();
+//				}
+//			}
+//		}
 		return entity;
 	}
 

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

@@ -21,6 +21,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
 import com.jtgh.yjpt.client.zysqbp.ZysqbpWebService;
+import com.jtgh.yjpt.common.BusinessContext;
 import com.jtgh.yjpt.common.Constants;
 import com.jtgh.yjpt.common.GlobalData;
 import com.jtgh.yjpt.common.PredicateModel;
@@ -88,11 +89,12 @@ public class WhsqbpWebService extends BaseController {
 	@Autowired
 	private DcService dcService;
 	@Autowired
-	private CkService ckService;	
+	private CkService ckService;
 	@Autowired
 	private CbService cbService;
 	@Autowired
 	private HsCompareService compareService;
+
 	// @Autowired
 	// private WorkflowMangerService workService;
 	// @Autowired
@@ -147,8 +149,8 @@ public class WhsqbpWebService extends BaseController {
 			// 只检索审核中的状态记录
 			addNotEmptyModel(filterList, "recordStatus",
 					BaseEntity.RECORD_STATE_DELETE, Operator.NEQ);
-			//非admin 用户
-			if(!user.getId().equals("1l")) {
+			// 非admin 用户
+			if (!user.getId().equals("1l")) {
 				addNotEmptyModel(filterList, "recordStatus",
 						BaseEntity.RECORD_STATE_COMPLETED, Operator.NEQ);
 				addNotEmptyModel(filterList, "recordStatus",
@@ -159,7 +161,7 @@ public class WhsqbpWebService extends BaseController {
 						BaseEntity.RECORD_STATE_REJECT, Operator.NEQ);
 				addNotEmptyModel(filterList, "recordStatus",
 						BaseEntity.RECORD_STATE_CALEL, Operator.NEQ);
-			}		
+			}
 			// 根据所在地过滤
 			addNotEmptyModel(filterList, "szd.id", szd, Operator.LIKE);
 			// List<ZysqbpEntity> list =
@@ -384,7 +386,10 @@ public class WhsqbpWebService extends BaseController {
 	 * @return
 	 */
 	public ZysqbpEntity saveKgWg(ZysqbpEntity sqbp) {
-		return zysqbpService.saveKgwg(sqbp);
+		BusinessContext bc = zysqbpController.save(sqbp);
+		if (bc != null)
+			return (ZysqbpEntity) bc.getResult();
+		return null;
 	}
 
 	/**
@@ -528,7 +533,7 @@ public class WhsqbpWebService extends BaseController {
 
 	public ZysqbpEntity aduit(String shyj, String shsj, boolean auditflag,
 			ZysqbpEntity entity) throws CloneNotSupportedException {
-		entity =zysqbpService.findOne(entity.getId());
+		entity = zysqbpService.findOne(entity.getId());
 		// 确保entity有重新查一下
 		zysqbpController.aduit(shyj, new Date(), auditflag, entity);
 		entity = zysqbpService.findOne(entity.getId());
@@ -642,9 +647,9 @@ public class WhsqbpWebService extends BaseController {
 	 * 
 	 */
 	public ZysqbpEntity doQxzy(ZysqbpEntity vo) {
-		ZysqbpEntity entity =  zysqbpService.findOne(vo.getId());
+		ZysqbpEntity entity = zysqbpService.findOne(vo.getId());
 		try {
-			//存取取消原因
+			// 存取取消原因
 			entity.setByzd1(vo.getByzd1());
 			zysqqxService.submitQxWebService(entity);
 			entity.setRecordStatus(BaseEntity.RECORD_STATE_QXSUBMIT);// 提交过后，状态改为取消审核中
@@ -730,7 +735,7 @@ public class WhsqbpWebService extends BaseController {
 	}
 
 	/**
-	 * 判断当前用户是否有审批权限 之判断 
+	 * 判断当前用户是否有审批权限 之判断
 	 * 
 	 * @param id
 	 * @return 0 表示未签收，代办理，1表示已签收待办理 ，""表示 无流程
@@ -767,50 +772,54 @@ public class WhsqbpWebService extends BaseController {
 		}
 		return "";
 	}
-	
+
 	/**
 	 * 获取泊位信息
-	 * @param zycs 作业场所类型
-	 * @param id 场所id
+	 * 
+	 * @param zycs
+	 *            作业场所类型
+	 * @param id
+	 *            场所id
 	 * @return
 	 */
-	public BwEntity findByZycsAndId(String zycs,Long id) {
-		//只查询泊位的信息
-		if(Constants.GGDM_ID_ZYDD_BW.equals(Long.parseLong(zycs))) {
+	public BwEntity findByZycsAndId(String zycs, Long id) {
+		// 只查询泊位的信息
+		if (Constants.GGDM_ID_ZYDD_BW.equals(Long.parseLong(zycs))) {
 			return bwService.findOne(id);
 		}
 		return null;
 	}
 
-	
 	/**
 	 * 根据中文 船名和英文船名分页获取船舶信息
+	 * 
 	 * @param zwcm
 	 * @param ywcm
 	 * @param n
 	 * @param pageCount
 	 * @return
 	 */
-	public List<CbEntity> getCbPageListByCm(String zwcm,String ywcm,int n ,int pageCount){
+	public List<CbEntity> getCbPageListByCm(String zwcm, String ywcm, int n,
+			int pageCount) {
 		List<PredicateModel> filterList = new ArrayList<PredicateModel>();
 		addNotEmptyModel(filterList, "zwcm", zwcm, PredicateModel.Operator.LIKE);
 		addNotEmptyModel(filterList, "ywcm", ywcm, PredicateModel.Operator.LIKE);
 		Specification<CbEntity> spec = SpecificationCreater
 				.searchByPredicateModels(filterList);
-		SinglePageRequest page = new SinglePageRequest(pageCount, n,
-				"asc", "cbbh");
-		Page<CbEntity> list =cbService.findAll(spec,
-				page);	
+		SinglePageRequest page = new SinglePageRequest(pageCount, n, "asc",
+				"cbbh");
+		Page<CbEntity> list = cbService.findAll(spec, page);
 		return list.getContent();
 	}
-	
+
 	/**
 	 * 查询对比结果详细
 	 * 
-	 * @param id 作业申报id
+	 * @param id
+	 *            作业申报id
 	 * @return
 	 */
-	public List<ZysqbphsdbEntity>  queryDb(Long id) {
+	public List<ZysqbphsdbEntity> queryDb(Long id) {
 		List<ZysqbphsdbEntity> list = new ArrayList<ZysqbphsdbEntity>();
 		Map<String, Map<String, String>> map = compareService.mergeInfo(id);
 		if (map == null) {
@@ -842,6 +851,5 @@ public class WhsqbpWebService extends BaseController {
 		}
 		return list;
 	}
-	
-	
+
 }