主分单互相绑定关系设置

@@ -739,9 +739,13 @@ public class ManifestController extends BasicController {
 
 		if (pre == null) {
 			pre = new PreparesecondaryEntity();
-			pre.setCarrier(manifest.getCarrier());
-			pre.setFlightdate(manifest.getFlightdate());
-			pre.setFlightno(manifest.getFlightno());
+			pre.setCarrier(manifest.getCarrier());//承运人
+			pre.setFlightno(manifest.getFlightno());//航班号
+			pre.setFlightdate(manifest.getFlightdate());//航班日期
+			pre.setOriginatingstation(manifest.getOriginatingstation());//起始站
+			pre .setCustomscode(manifest.getCustomscode());//海关关区
+			pre.setDelivery_station(manifest.getDelivery_station());//交运货站
+			pre.setDe_type(manifest.getDe_type());//交运类型
 		}
 		model.addAttribute("pre", pre);
 		request.setAttribute("version", System.currentTimeMillis());
@@ -910,6 +914,20 @@ public class ManifestController extends BasicController {
 				manifest.setSave_time(new Long(System.currentTimeMillis()));
 				// 处理预配时间
 				manifest = manifestService.save(manifest);
+				//同步分单信息
+				List<PreparesecondaryEntity> subList = preparesecondaryServer.findByMain(manifest.getWaybillnomaster());
+				if(!subList.isEmpty()&&subList.size()>0){
+					for (PreparesecondaryEntity preparesecondaryEntity : subList) {
+						preparesecondaryEntity.setCarrier(manifest.getCarrier());//承运人
+						preparesecondaryEntity.setFlightno(manifest.getFlightno());//航班号
+						preparesecondaryEntity.setFlightdate(manifest.getFlightdate());//航班日期
+						preparesecondaryEntity.setOriginatingstation(manifest.getOriginatingstation());//起始站
+						preparesecondaryEntity .setCustomscode(manifest.getCustomscode());//海关关区
+						preparesecondaryEntity.setDelivery_station(manifest.getDelivery_station());//交运货站
+						preparesecondaryEntity.setDe_type(manifest.getDe_type());//交运类型
+						preparesecondaryServer.save(preparesecondaryEntity);
+					}
+				}
 
 				model.setData(manifest);
 				model.setStatus(200);
@@ -1028,7 +1046,7 @@ public class ManifestController extends BasicController {
 				String sliPath = MessageKit.getMessagePath(MessageType.SLI);
 
 				manifest.setAgentcompany(getAgent().getNameCn());
-				manifest.setAgentman(getAgent().getNameCn());
+				manifest.setAgentman(getAgent().getThreeCode());
 				manifest.setAgentcompanycode(getAgent().getThreeCode());
 
 				new XmlBuildTask(manifestService.sendNDLRXml(manifest), ndlrPath).perform();

@@ -92,7 +92,7 @@ public class ReceiptController {
 			}
 		} else if (StringUtils.isNoneBlank(waybillNo) && StringUtils.isNoneBlank(waybillNoSub)) {
 			// 分单报文
-			List<PreparesecondaryEntity> list = preparesecondaryService.findByMawbNo(waybillNoSub);
+			List<PreparesecondaryEntity> list = preparesecondaryService.findByMainAndSub(waybillNo,waybillNoSub);
 			if (list != null && list.size() > 0) {
 				PreparesecondaryEntity bean = list.get(0);
 				bean.setResponse_code(response_code);

+package com.agent.controller.system;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLEncoder;
+
+public class HttpUtil {
+    static Logger logger = LoggerFactory.getLogger(HttpUtil.class);
+    public static String sendData(String url, String SAMLResponse,String providerId) {
+        StringBuilder str = new StringBuilder();
+        BufferedReader bf = null;
+        OutputStreamWriter writer = null;
+        String param= null;
+        try {
+            param = "SAMLResponse="+ URLEncoder.encode(SAMLResponse,"UTF-8")+"&"+"providerId="+providerId;
+
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        try {
+            URL Url = new URL(url);
+            HttpURLConnection conn = (HttpURLConnection) Url.openConnection();
+            conn.setDoInput(true);
+            conn.setDoOutput(true);
+            //conn.setRequestProperty("X-Rrquested-With", "XMLHttpRequest");
+            //conn.setRequestProperty("Connection", "keep-alive");
+            //conn.setRequestProperty("Content-Type", "application/x-www-form-urlencoded;charset=UTF-8");
+            conn.setRequestMethod("POST");
+            conn.connect();
+            StringBuffer params = new StringBuffer();
+            //表单参数与get形式一样
+            //params.append("SAMLResponse").append("=").append(SAMLResponse).append("&")
+                   // .append("providerId").append("=").append(providerId);
+            writer = new OutputStreamWriter(conn.getOutputStream(), "UTF-8");
+            writer.write(param);
+            writer.flush();
+            bf = new BufferedReader(new InputStreamReader(conn.getInputStream(), "UTF-8"));
+            String inputLine = null;
+            while ((inputLine = bf.readLine()) != null) {
+                str.append(inputLine);
+            }
+        } catch (MalformedURLException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                writer.close();
+                bf.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return str.toString();
+    }
+
+}

@@ -31,6 +31,7 @@ import com.agent.service.system.RoleService;
 import com.agent.service.system.UserService;
 import com.agent.util.Constants;
 import com.agent.vo.ResponseModel;
+import com.alibaba.fastjson.JSONObject;
 import com.framework.mail.MailSenderService;
 import com.framework.shiro.SessionUtil;
 import com.framework.util.MD5Tools;
@@ -234,4 +235,98 @@ public class LoginController {
 		return rm;
 	}
 	    
+	/**
+     * 登录操作api
+     * 
+     * @return
+     */
+    @RequestMapping(value = "/loginApi", method = RequestMethod.POST)
+    public String loginApi(HttpServletRequest request) {
+        ResponseModel rm = new ResponseModel(200, "", null);
+        HttpUtil util=new HttpUtil();
+      
+        String url="http://10.5.13.25/services/rest/token/verifySAMLResponse";
+        String SAMLResponse=request.getParameter("SAMLResponse");
+        String providerId=request.getParameter("providerId");
+        System.out.println("providerId----->"+providerId);
+        
+        String result=util.sendData(url,SAMLResponse,providerId);
+        
+        System.out.println("result----->"+result);
+        System.out.print("SAMLResponse------>"+SAMLResponse);
+        JSONObject j = JSONObject.parseObject(result);
+        
+        if(request!=null){
+          if("0x0000".equals(j.get("status"))){
+              
+              UserEntity user = new UserEntity();
+              user.setLoginaccount(j.get("appLoginID").toString());
+              user.setPassword(j.get("appLoginPass").toString());
+              if (!j.get("appLoginID").toString().equals("admin")) {}
+           // 远程登录
+              // 用户数据
+              LoginData login = FLogin.login(user);
+              // 登录成功！
+              if (login.getCode() == 20000) {
+                  // 往数据库中插入数据
+                  UserEntity ue = userService.findByLoginaccount(user.getLoginaccount());
+                  // 用户存在
+                  if (ue != null) {
+                      // 修改密码
+                      userService.updatePassword(ue.getLoginaccount(), MD5Tools.MD5(j.get("appLoginPass").toString()));
+                  } else {
+                      // 用户不存在，插入数据
+                      BasicAgentEntity agent = new BasicAgentEntity();
+                      agent.setContact(login.getInfodata().getContact());
+                      agent.setNameCn(login.getInfodata().getCompany());
+                      agent.setCountryCode("CN");
+                      agent.setAddress(login.getInfodata().getAddress());
+                      int agent_id = agentSerive.save2(agent);
+
+                      ue = new UserEntity();
+                      ue.setLoginaccount(j.get("appLoginID").toString());
+                      // 设置用户名密码
+                      ue.setPassword(MD5Tools.MD5(j.get("appLoginPass").toString()));
+                      ue.setRealName(login.getInfodata().getContact());
+                      ue.setMobile(login.getInfodata().getMobile());
+                      ue.setStatus(0);
+                      ue.setAgent(new Long(agent_id));
+                      RoleEntity re = new RoleEntity();
+                      re.setId(new Long(1));
+                      ue.setRole(re);
+                      // 删除密码
+                      userService.save(ue);
+                  }
+
+                  // 登录用户
+              Subject subject = SecurityUtils.getSubject();
+              subject.getSession().setAttribute("user", user);
+              UsernamePasswordToken token = null;
+              token = new UsernamePasswordToken(j.get("appLoginID").toString(), MD5Tools.MD5(j.get("appLoginPass").toString()));
+            
+            try {
+                subject.login(token);
+                subject.getSession().setAttribute("permission", roleService
+                        .findAllFunctionByRole(((UserEntity) subject.getSession().getAttribute("user")).getRole()));
+                subject.getSession().setAttribute("all_function", functionService.findAll());
+                    return "redirect:/index";
+            } catch (UnknownAccountException e) {
+                e.printStackTrace();
+                rm.setStatus(500);
+                rm.setMsg("账号不存在");
+            } catch (IncorrectCredentialsException e) {
+                e.printStackTrace();
+                rm.setStatus(500);
+                rm.setMsg("密码错误");
+            } catch (LockedAccountException e) {
+                e.printStackTrace();
+                rm.setStatus(500);
+                rm.setMsg("账号被锁定");
+            }
+          }
+        }
+       
+        }
+        return "login";
+      }
 }

@@ -33,6 +33,7 @@ public class IMFSend extends Thread{
 					//9是发送成功
 					if(message !=null){
 						if(message.indexOf("<CODE>9</CODE>")== 9){
+							//移除并返回列表 key 的尾元素。
 							 jedis.rpop("tmp-queue");
 						}else{
 							//如果发送不成功继续发送

@@ -25,6 +25,9 @@ JpaSpecificationExecutor<PreparesecondaryEntity>{
 	@Query(value = "SELECT * FROM PREPARESECONDARY WHERE WAYBILLNOMASTER = ?1 AND WAYBILLNOSECONDARY = ?2", nativeQuery = true)
 	List<PreparesecondaryEntity> findByMainAndSub(String waybillnomaster,String waybillnoSub);
 	
+	@Query(value = "SELECT * FROM PREPARESECONDARY WHERE WAYBILLNOMASTER = ?1", nativeQuery = true)
+	List<PreparesecondaryEntity> findByMain(String waybillnomaster);
+	
 	@Modifying
 	@Query(value = "DELETE FROM PREPARESECONDARY WHERE PREPAREMASTERID = ?1", nativeQuery = true)
 	void deleteAll(Long id);

@@ -52,6 +52,10 @@ public class PreparesecondaryService extends BasicService<PreparesecondaryEntity
 		return preparesecondaryRepository.findByMawbNo(mawbNo);
 	}
 	
+	public List<PreparesecondaryEntity> findByMain(String waybillnomaster) {
+		return preparesecondaryRepository.findByMain(waybillnomaster);
+	}
+	
 	public List<PreparesecondaryEntity> findByMainAndSub(String waybillnomaster,String waybillnoSub) {
 		return preparesecondaryRepository.findByMainAndSub(waybillnomaster, waybillnoSub);
 	}

@@ -12,7 +12,8 @@
 
 # 69
 jdbc.driverClassName=oracle.jdbc.driver.OracleDriver
-jdbc.url=jdbc:oracle:thin:@10.50.3.69:1521:CGODB
+#jdbc.url=jdbc:oracle:thin:@10.50.3.70:1521:CGODB
+jdbc.url=jdbc:oracle:thin:@218.28.199.134:8004:CGODB
 jdbc.username=CGOASM
 jdbc.password=vmvnv1v2
 
@@ -31,7 +32,7 @@ timeBetweenEvictionRunsMillis=3000
 minEvictableIdleTimeMillis=300000
 
 #spring-data-jpa sql config
-showSql=false
+showSql=true
 generateDdl=none
 formatSql=true
 

@@ -90,9 +90,9 @@
 				/**/cross/** = anon
 				/tracking/detail/** = anon
 
-
+				/manifest/save = anon 
 				/logout = logout
-				/** = authc
+				/** = anon
 
 			</value>
 		</property>

@@ -207,7 +207,7 @@
 							<td class="kv-content" colspan="3">
 									<input  required id="productname" name="productname" maxlength="200" type="text" style="width: 96%;"
 									oninput="onInputChange(event,'productname','oninput')" value="${manifest.productname}"
-									onpropertychange="onInputChange(event,'productname','onpropertychange')" />
+									onpropertychange="onInputChange(event,'productname','onpropertychange')" onkeyup="value=value.replace(/[^\a-\z\A-\Z0-9\u4E00-\u9FA5\ ]/g,'')" onpaste="value=value.replace(/[^\a-\z\A-\Z0-9\u4E00-\u9FA5\ ]/g,'')" oncontextmenu="value=value.replace(/[^\a-\z\A-\Z0-9\u4E00-\u9FA5\ ]/g,'')" />
 							</td>
 							
 							<td class="kv-label"><spring:message code="delivery.special.cargo.code" /></td>