修改redis地址

@@ -424,6 +424,16 @@
 			<version>1.1.1</version>
 		</dependency>
 
+		<dependency>
+			<groupId>com.google.code.gson</groupId>
+			<artifactId>gson</artifactId>
+			<version>2.8.2</version>
+		</dependency>
+		<dependency>
+			<groupId>com.jfinal</groupId>
+			<artifactId>jfinal</artifactId>
+			<version>3.4</version>
+		</dependency>
 	</dependencies>
 
 	<!-- 配置文件 -->

+package com.agent.billcheck;
+
+/**
+ * Created by cohesion on 2017/4/17.
+ *
+ * 账单核审
+ */
+public class BillCheckBean {
+	private Integer fid;
+
+	private String code;
+
+	private String type;
+
+	private String chgseq;
+
+	private String eiflag;
+
+	private String diflag;
+
+	private String bizope;
+
+	private String cuscode;
+
+	private String cusnm;
+
+	private String paymode;
+
+	private String cusrnm;
+
+	private String cdate;
+
+	private String feecd;
+
+	private String cfeewt;
+
+	private String feewt;
+
+	private String fee;
+
+	private String rate;
+
+	private String feenm;
+
+	private String payCostFid;
+
+	private String station;
+
+	public void setFid(Integer fid) {
+		this.fid = fid;
+	}
+
+	public int getFid() {
+		return this.fid;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getCode() {
+		return this.code;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public String getType() {
+		return this.type;
+	}
+
+	public void setChgseq(String chgseq) {
+		this.chgseq = chgseq;
+	}
+
+	public String getChgseq() {
+		return this.chgseq;
+	}
+
+	public void setEiflag(String eiflag) {
+		this.eiflag = eiflag;
+	}
+
+	public String getEiflag() {
+		return this.eiflag;
+	}
+
+	public void setDiflag(String diflag) {
+		this.diflag = diflag;
+	}
+
+	public String getDiflag() {
+		return this.diflag;
+	}
+
+	public void setBizope(String bizope) {
+		this.bizope = bizope;
+	}
+
+	public String getBizope() {
+		return this.bizope;
+	}
+
+	public void setCuscode(String cuscode) {
+		this.cuscode = cuscode;
+	}
+
+	public String getCuscode() {
+		return this.cuscode;
+	}
+
+	public void setCusnm(String cusnm) {
+		this.cusnm = cusnm;
+	}
+
+	public String getCusnm() {
+		return this.cusnm;
+	}
+
+	public void setPaymode(String paymode) {
+		this.paymode = paymode;
+	}
+
+	public String getPaymode() {
+		return this.paymode;
+	}
+
+	public void setCusrnm(String cusrnm) {
+		this.cusrnm = cusrnm;
+	}
+
+	public String getCusrnm() {
+		return this.cusrnm;
+	}
+
+	public void setCdate(String cdate) {
+		this.cdate = cdate;
+	}
+
+	public String getCdate() {
+		return this.cdate;
+	}
+
+	public String getFeecd() {
+		return feecd;
+	}
+
+	public void setFeecd(String feecd) {
+		this.feecd = feecd;
+	}
+
+	public String getCfeewt() {
+		return cfeewt;
+	}
+
+	public void setCfeewt(String cfeewt) {
+		this.cfeewt = cfeewt;
+	}
+
+	public String getFeewt() {
+		return feewt;
+	}
+
+	public void setFeewt(String feewt) {
+		this.feewt = feewt;
+	}
+
+	public String getFee() {
+		return fee;
+	}
+
+	public void setFee(String fee) {
+		this.fee = fee;
+	}
+
+	public String getRate() {
+		return rate;
+	}
+
+	public void setRate(String rate) {
+		this.rate = rate;
+	}
+
+	public String getFeenm() {
+		return feenm;
+	}
+
+	public void setFeenm(String feenm) {
+		this.feenm = feenm;
+	}
+
+	public String getPayCostFid() {
+		return payCostFid;
+	}
+
+	public void setPayCostFid(String payCostFid) {
+		this.payCostFid = payCostFid;
+	}
+
+	public String getStation() {
+		return station;
+	}
+
+	public void setStation(String station) {
+		this.station = station;
+	}
+
+}

+package com.agent.billcheck;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import com.agent.entity.agent.BillCheckEntity;
+import com.agent.service.agent.BillCheckFeeService;
+import com.agent.service.agent.BillCheckService;
+import com.framework.util.JsonKit;
+import com.jfinal.kit.HttpKit;
+import com.jfinal.kit.StrKit;
+
+/**
+ * Depiction:
+ * <p>
+ * Modify:
+ * <p>
+ * Author: William Lynn
+ * <p>
+ * Create Date：2018年9月6日 下午12:09:07
+ * 
+ */
+@Component
+public class BillTask {
+	public static boolean isRunning = false;
+
+	private final static String BILL_API = "http://10.50.3.64:8080/tj/cost/cost";
+
+	@Scheduled(cron = "10 * * * * ?")
+	public void perform() {
+		if (BillTask.isRunning) {
+			return;
+		}
+
+		BillTask.isRunning = true;
+		System.err.println();
+		System.err.println("BillTask start，will get json data......");
+
+		BillCheckService billCheckService = (BillCheckService) SpringContextKit.getBean("billCheckService");
+		BillCheckEntity last = billCheckService.last();
+		int fid = last != null ? last.getFid() : 0;
+		System.err.println("BillTask start，last fid is: " + fid);
+
+		Map<String, String> queryParas = new HashMap<>();
+		queryParas.put("fid", String.valueOf(fid));
+		String json = "";
+		try {
+			json = HttpKit.get(BILL_API, queryParas);
+		} catch (Exception e) {
+			System.err.println("BillTask get json data error -->" + e.toString());
+		}
+		List<BillCheckBean> list = JsonKit.parseArray(json, BillCheckBean.class);
+
+		if (list != null && !list.isEmpty()) {
+			BillCheckFeeService billCheckFeeService = (BillCheckFeeService) SpringContextKit
+					.getBean("billCheckFeeService");
+
+			for (BillCheckBean bean : list) {
+				String mawbNo = bean.getCode();
+				String start = mawbNo.substring(0, 3);
+				String end = mawbNo.substring(3, mawbNo.length());
+				mawbNo = start + "-" + end;
+				bean.setCode(mawbNo);
+				
+				if (!billCheckService.exist(mawbNo)) {
+					bean.setStation(getStationCode(bean.getChgseq()));
+
+					billCheckService.save(bean);
+				}
+
+				if (!billCheckFeeService.exist(mawbNo, bean.getFeenm())) {
+					billCheckFeeService.save(bean);
+				}
+			}
+
+		}
+
+		System.err.println("BillTask end, get json data finish......");
+		BillTask.isRunning = false;
+	}
+
+	private String getStationCode(String str) {
+		if (StrKit.isBlank(str))
+			return "";
+		String code = str.replaceAll("[^(A-Za-z)]", "");
+		return code;
+	}
+
+}

+package com.agent.billcheck;
+
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * Depiction:
+ * <p>
+ * Modify:
+ * <p>
+ * Author: William Lynn
+ * <p>
+ * Create Date：2018年9月7日 下午5:00:30
+ * 
+ */
+class FeeMap extends HashMap<String, List<Float>> {
+	private static final long serialVersionUID = 1L;
+
+	public FeeMap() {
+	}
+
+	public void push(String code, float fee) {
+		if (!containsKey(code)) {
+			List<Float> list = new ArrayList<>();
+			put(code, list);
+		}
+
+		List<Float> list = get(code);
+		list.add(fee);
+		put(code, list);
+	}
+
+	public String getTotal(String code) {
+		float total = 0.0f;
+		List<Float> list = get(code);
+		if (list != null && !list.isEmpty()) {
+			for (Float fee : list) {
+				total += fee;
+			}
+		}
+
+		DecimalFormat df = new DecimalFormat("0.00");
+		return df.format(total);
+	}
+	
+}

+package com.agent.billcheck;
+
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+
+/**
+ * Depiction:
+ * <p>
+ * Modify:
+ * <p>
+ * Author: William Lynn
+ * <p>
+ * Create Date：2018年9月6日 下午3:32:11
+ * 
+ */
+public class SpringContextKit implements ApplicationContextAware {
+	private static ApplicationContext applicationContext = null;
+
+	@Override
+	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+		if (SpringContextKit.applicationContext == null) {
+			SpringContextKit.applicationContext = applicationContext;
+			System.out.println(
+					"========ApplicationContext配置成功,在普通类可以通过调用ToolSpring.getAppContext()获取applicationContext对象,applicationContext="
+							+ applicationContext + "========");
+		}
+	}
+
+	public static ApplicationContext getApplicationContext() {
+		return applicationContext;
+	}
+
+	/**
+	 * 注意 bean name默认 = 类名(首字母小写) 例如: A8sClusterDao = getBean("a8sClusterDao")
+	 * 
+	 * @param name
+	 * @return
+	 * @throws BeansException
+	 */
+	public static Object getBean(String name) throws BeansException {
+		return applicationContext.getBean(name);
+	}
+
+	/**
+	 * 根据类名获取到bean
+	 * 
+	 * @param       <T>
+	 * @param clazz
+	 * @return
+	 * @throws BeansException
+	 */
+	@SuppressWarnings("unchecked")
+	public static <T> T getBeanByName(Class<T> clazz) throws BeansException {
+		try {
+			char[] cs = clazz.getSimpleName().toCharArray();
+			cs[0] += 32;// 首字母大写到小写
+			return (T) applicationContext.getBean(String.valueOf(cs));
+		} catch (Exception e) {
+			e.printStackTrace();
+			return null;
+		}
+	}
+
+	public static boolean containsBean(String name) {
+		return applicationContext.containsBean(name);
+	}
+
+	public static boolean isSingleton(String name) throws NoSuchBeanDefinitionException {
+		return applicationContext.isSingleton(name);
+	}
+
+}

@@ -11,11 +11,9 @@ import javax.servlet.http.HttpServletRequest;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.agent.controller.BasicController;
-import com.agent.entity.agent.BillCheckEntity;
 import com.agent.entity.agent.MakeHawbEntity;
 import com.agent.entity.agent.MakeMawbEntity;
 import com.agent.entity.agent.PubStationEntity;
@@ -24,7 +22,6 @@ import com.agent.service.agent.BillCheckService;
 import com.agent.service.agent.MakeHawbService;
 import com.agent.service.agent.MakeMawbService;
 import com.agent.service.agent.PubStationService;
-import com.agent.util.HttpJsonMsg;
 import com.agent.vo.ResponseModel;
 import com.alibaba.fastjson.JSONObject;
 import com.framework.util.DateFormat;
@@ -38,193 +35,117 @@ import tools.DataSerieal;
 
 /**
  * 账单核审
+ * 
  * @author 61004
  *
  */
 @Controller
 @RequestMapping(value = "/billcheck")
-public class BillCheckController extends BasicController{
-	
+public class BillCheckController extends BasicController {
+
+	@Resource
+	private PubStationService stationService;
+
+	@Resource
+	private BillCheckService billCheckService;
+
+	@Resource
+	private MakeMawbService makeMawbService;
+
 	@Resource
-    private PubStationService stationService;
-
-    @Resource
-    private BillCheckService billCheckService;
-
-    @Resource
-    private MakeMawbService makeMawbService;
-    
-    @Resource
-    private MakeHawbService makeHawbService;
-
-    @Resource
-    private BasicAgentService agentService;
-    
-
-    @RequestMapping(value="/list")
-    public String list(Model model) {
-    	//交运货站
-        List<PubStationEntity> stations = stationService.findAll();
-        Date date = new Date();
-        model.addAttribute("stations",stations);
-        model.addAttribute("dateModel",DateFormat.formatString(date, "yyyy-MM-dd"));
-    	return "billcheck/report"; 
-    }
-	
-
-    @RequestMapping(value="search")
-    @ResponseBody
-    public ResponseModel search(HttpServletRequest request){
-    	ResponseModel model = new ResponseModel(1, "", null);
-    	String deliveryStation = tools.RequestUtils.getQueryParam(request, "deliveryStation");
-    	int start_position = 1, end_position = 99999999;
-    	String total = request.getParameter("total");
-    	String length = request.getParameter("length");
-    	String start_time = request.getParameter("start_time");
-    	String end_time = request.getParameter("end_time");
-    	
-    	if(total != null && length != null)
-    	{
-    		int itotal = Integer.parseInt(total);
-    		int ilength = Integer.parseInt(length);
-    		start_position = (itotal-1) * ilength + 1;
-    		end_position = start_position + ilength - 1;
-    	}
-    	
-    	//System.out.println("start_position:"+start_position+" end_position:"+end_position);
-    	//System.out.println("deliveryStation:"+deliveryStation+" start:"+start_time+" end:"+end_time);
-    	List<BillCheckReturnData> bcrd = new ArrayList<BillCheckReturnData>();
-    	
-    	List<MakeMawbEntity> list1 = makeMawbService.findByDate(deliveryStation,start_time, end_time, start_position, end_position);
-    	model.setCount(makeMawbService.findByDateCount(deliveryStation, start_time, end_time));
-    	//查找分单
-    	for(int i = 0; i < list1.size(); i ++)
-    	{
-    		MakeHawbEntity mhe = makeHawbService.findByMawbNo(list1.get(i).getMawbNo());
-    		BillCheckReturnData rd = new BillCheckReturnData();
-    		rd.setMawblist(list1.get(i));
-    		rd.setHawblist(mhe);
-    		bcrd.add(rd);
-    	}
-    	model.setData(bcrd);
-    	//System.out.println("count:"+model.getCount());
-    	return model;
-    }
+	private MakeHawbService makeHawbService;
+
+	@Resource
+	private BasicAgentService agentService;
+
+	@RequestMapping(value = "/list")
+	public String list(Model model) {
+		// 交运货站
+		List<PubStationEntity> stations = stationService.findAll();
+		Date date = new Date();
+		model.addAttribute("stations", stations);
+		model.addAttribute("dateModel", DateFormat.formatString(date, "yyyy-MM-dd"));
+		return "billcheck/list";
+	}
+
+	@RequestMapping(value = "search")
+	@ResponseBody
+	public ResponseModel search(HttpServletRequest request) {
+		ResponseModel model = new ResponseModel(1, "", null);
+		String deliveryStation = tools.RequestUtils.getQueryParam(request, "deliveryStation");
+		int start_position = 1, end_position = 99999999;
+		String total = request.getParameter("total");
+		String length = request.getParameter("length");
+		String start_time = request.getParameter("start_time");
+		String end_time = request.getParameter("end_time");
+
+		if (total != null && length != null) {
+			int itotal = Integer.parseInt(total);
+			int ilength = Integer.parseInt(length);
+			start_position = (itotal - 1) * ilength + 1;
+			end_position = start_position + ilength - 1;
+		}
+
+		// System.out.println("start_position:"+start_position+"
+		// end_position:"+end_position);
+		// System.out.println("deliveryStation:"+deliveryStation+" start:"+start_time+"
+		// end:"+end_time);
+		List<BillCheckReturnData> bcrd = new ArrayList<BillCheckReturnData>();
+
+		List<MakeMawbEntity> list1 = makeMawbService.findByDate(deliveryStation, start_time, end_time, start_position,
+				end_position);
+		model.setCount(makeMawbService.findByDateCount(deliveryStation, start_time, end_time));
+		// 查找分单
+		for (int i = 0; i < list1.size(); i++) {
+			MakeHawbEntity mhe = makeHawbService.findByMawbNo(list1.get(i).getMawbNo());
+			BillCheckReturnData rd = new BillCheckReturnData();
+			rd.setMawblist(list1.get(i));
+			rd.setHawblist(mhe);
+			bcrd.add(rd);
+		}
+		model.setData(bcrd);
+		// System.out.println("count:"+model.getCount());
+		return model;
+	}
+
 	@RequestMapping("search2")
 	@ResponseBody
-	public ResponseModel search2(HttpServletRequest request){
-		
+	public ResponseModel search2(HttpServletRequest request) {
+
 		ResponseModel model = new ResponseModel(1, "", null);
 		BillCheckServiceProxy bcsp = new BillCheckServiceProxy();
 		QueryData qd = new QueryData();
 		String total = request.getParameter("total");
 		String length = request.getParameter("length");
 		DataSerieal.ModelSet(qd, request);
-		if(qd.getStart_time() == null || qd.getEnd_time() == null)
-		{
+		if (qd.getStart_time() == null || qd.getEnd_time() == null) {
 			model.setStatus(2);
 			model.setMsg("请输入日期");
 			return model;
 		}
-		if(total != null && length != null)
-		{
+		if (total != null && length != null) {
 			qd.setStart_page(Integer.parseInt(total));
 			qd.setPage_length(Integer.parseInt(length));
-			qd.setStart_position((qd.getStart_page()-1)*qd.getPage_length()+1);
-			qd.setEnd_position(qd.getStart_position()+qd.getPage_length()-1);
+			qd.setStart_position((qd.getStart_page() - 1) * qd.getPage_length() + 1);
+			qd.setEnd_position(qd.getStart_position() + qd.getPage_length() - 1);
 		}
 		System.out.println(JSONObject.toJSONString(qd));
 		try {
 			ReturnData rd = bcsp.getByQuery(qd);
-			
+
 			List<ReturnRecode> list = new ArrayList<ReturnRecode>();
 			ReturnRecode rrs[] = rd.getRecode_list();
-			for(int i = 0; i < rrs.length; i ++)
-			{
+			for (int i = 0; i < rrs.length; i++) {
 				list.add(rrs[i]);
 			}
 			model.setCount(rd.getRecode_all_count());
 			model.setData(list);
-			
+
 		} catch (RemoteException e) {
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
-		
+
 		return model;
 	}
-	/**
-	 * 销售日报
-	 * @return
-	 */
-	@RequestMapping(value="/report")
-	public String report(/*Model model,Long id,String deliveryStation,String date, */HttpServletRequest request) {
-		String start_date = request.getParameter("start_date");
-		String end_date = request.getParameter("end_date");
-		Date sd = new Date(start_date.replace('-', '/'));
-		Date ed = new Date(end_date.replace('-', '/'));
-//		System.out.println("report entry!");
-//		//交运货站
-//        List<PubStationEntity> stations = stationService.findAll();
-//        model.addAttribute("stations",stations);
-//
-//        BillCheckEntity check = null;
-//        if(id!=null){
-//            check = billCheckService.findOne(id);
-//        }else{
-//            check = billCheckService.findByStationAndDate(deliveryStation,date,SessionUtil.getUser().getId());
-//        }
-//        System.out.println("report entry 2!");
-//        if(check ==null){
-//            check = new BillCheckEntity();
-//            BasicAgentEntity agent = agentService.findOne(SessionUtil.getUser().getAgent());
-//            check.setAgent(agent.getNameCn());
-//            check.setPayDate(date);
-//            check.setDeliveryStation(deliveryStation);
-//            if(StringUtils.isNotEmpty(deliveryStation)){
-//            	//代理人
-//                BasicAgentEntity baiscAgent = agentService.findOne(SessionUtil.getUser().getAgent());
-//                Object[] obj = (Object[]) makeMawbService.countCash(deliveryStation,date, baiscAgent.getThreeCode());
-//                check.setMawbCash(obj[0]==null?0:Double.valueOf(String.valueOf(obj[0])));
-//                check.setHawbCash(obj[1]==null?0:Double.valueOf(String.valueOf(obj[1])));
-//                check.setTotalCash((obj[0]==null?0:Double.valueOf(String.valueOf(obj[0]))) + (obj[1]==null?0:Double.valueOf(String.valueOf(obj[1]))));
-//            }
-//        }
-//        System.out.println("report entry 3!");
-//        if(StringUtils.isNotEmpty(check.getPayDate())){
-//            check.setPayDate(DateFormat.formatString(check.getPayDate(), "yyyy-MM"));
-//        }else {
-//            date=DateFormat.formatString(new Date(), "yyyy-MM");
-//            check.setPayDate(date);
-//        }
-//        model.addAttribute("dateModel",check.getPayDate());
-//        model.addAttribute("check",check);
-        //System.out.println("report exit");
-		return "billcheck/report";
-	}
-
-
-    /**
-     * 保存
-     * @param check
-     * @return
-     */
-    @RequestMapping(value="/save",method = RequestMethod.POST)
-    @ResponseBody
-    public ResponseModel save(BillCheckEntity check) {
-        ResponseModel model = new ResponseModel();
-        try{
-            check = billCheckService.save(check);
-            model.setStatus(200);
-            model.setMsg(HttpJsonMsg.SUCCESS);
-            model.setData(check.getId());
-        } catch(Exception e){
-            model.setStatus(500);
-            model.setMsg(HttpJsonMsg.ERROR);
-        }
-
-        return model;
-    }
-
 
 }

 package com.agent.entity.agent;
 
-import com.agent.entity.BasicEntity;
+import java.util.Date;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 
+import com.agent.entity.IdEntity;
+
 /**
  * Created by cohesion on 2017/4/17.
  *
@@ -13,131 +15,187 @@ import javax.persistence.Table;
  */
 @Entity
 @Table(name = "BILL_CHECK")
-public class BillCheckEntity extends BasicEntity{
-
-
-    /**
-     * 交运货站
-     */
-    private String deliveryStation;
-    /**
-     * 代理人
-     */
-    private String agent;
-
-    /**
-     * 收款人
-     */
-    private String payee;
-
-    /**
-     * 付款月份
-     */
-    private String payDate;
-
-    /**
-     * 付款方式
-     */
-    private String paymentMethod;
-
-    /**
-     * 主单金额
-     */
-    private Double mawbCash;
-
-    /**
-     * 分单金额
-     */
-    private Double hawbCash;
-
-    /**
-     * 总金额
-     */
-    private Double totalCash;
-
-    /**
-     * 付款状态
-     */
-    private Integer paymentStatus = 0;
-
-    @Column(name = "AGENT")
-    public String getAgent() {
-        return agent;
-    }
-
-    public void setAgent(String agent) {
-        this.agent = agent;
-    }
-
-    @Column(name = "PAYEE")
-    public String getPayee() {
-        return payee;
-    }
-
-    public void setPayee(String payee) {
-        this.payee = payee;
-    }
-
-    @Column(name = "PAY_DATE")
-    public String getPayDate() {
-        return payDate;
-    }
-
-    public void setPayDate(String payDate) {
-        this.payDate = payDate;
-    }
-
-    @Column(name = "PAYMENT_METHOD")
-    public String getPaymentMethod() {
-        return paymentMethod;
-    }
-
-    public void setPaymentMethod(String paymentMethod) {
-        this.paymentMethod = paymentMethod;
-    }
-
-    @Column(name = "MAWB_CASH")
-    public Double getMawbCash() {
-        return mawbCash;
-    }
-
-    public void setMawbCash(Double mawbCash) {
-        this.mawbCash = mawbCash;
-    }
-
-    @Column(name = "HAWB_CASH")
-    public Double getHawbCash() {
-        return hawbCash;
-    }
-
-    public void setHawbCash(Double hawbCash) {
-        this.hawbCash = hawbCash;
-    }
-
-    @Column(name = "TOTAL_CASH")
-    public Double getTotalCash() {
-        return totalCash;
-    }
-
-    public void setTotalCash(Double totalCash) {
-        this.totalCash = totalCash;
-    }
-
-    @Column(name = "PAYMENT_STATUS")
-    public Integer getPaymentStatus() {
-        return paymentStatus;
-    }
-
-    public void setPaymentStatus(Integer paymentStatus) {
-        this.paymentStatus = paymentStatus;
-    }
-
-    @Column(name = "DELIVERY_STATION")
-    public String getDeliveryStation() {
-        return deliveryStation;
-    }
-
-    public void setDeliveryStation(String deliveryStation) {
-        this.deliveryStation = deliveryStation;
-    }
+public class BillCheckEntity extends IdEntity {
+	private Integer fid;
+
+	private String code;
+
+	private String type;
+
+	private String chgseq;
+
+	private String eiflag;
+
+	private String diflag;
+
+	private String bizope;
+
+	private String cuscode;
+
+	private String cusnm;
+
+	private String paymode;
+
+	private String cusrnm;
+
+	private String cdate;
+
+	private String station;
+
+	private String total;
+
+	/**
+	 * 创建时间
+	 */
+	private Date createDate;
+
+	/**
+	 * 修改时间
+	 */
+	private Date modifyDate;
+
+	/**
+	 * 是否删除 1删除 在里不让在修改主单号
+	 */
+	private Integer isdelete = 0;
+
+	public void setFid(Integer fid) {
+		this.fid = fid;
+	}
+
+	public int getFid() {
+		return this.fid;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getCode() {
+		return this.code;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public String getType() {
+		return this.type;
+	}
+
+	public void setChgseq(String chgseq) {
+		this.chgseq = chgseq;
+	}
+
+	public String getChgseq() {
+		return this.chgseq;
+	}
+
+	public void setEiflag(String eiflag) {
+		this.eiflag = eiflag;
+	}
+
+	public String getEiflag() {
+		return this.eiflag;
+	}
+
+	public void setDiflag(String diflag) {
+		this.diflag = diflag;
+	}
+
+	public String getDiflag() {
+		return this.diflag;
+	}
+
+	public void setBizope(String bizope) {
+		this.bizope = bizope;
+	}
+
+	public String getBizope() {
+		return this.bizope;
+	}
+
+	public void setCuscode(String cuscode) {
+		this.cuscode = cuscode;
+	}
+
+	public String getCuscode() {
+		return this.cuscode;
+	}
+
+	public void setCusnm(String cusnm) {
+		this.cusnm = cusnm;
+	}
+
+	public String getCusnm() {
+		return this.cusnm;
+	}
+
+	public void setPaymode(String paymode) {
+		this.paymode = paymode;
+	}
+
+	public String getPaymode() {
+		return this.paymode;
+	}
+
+	public void setCusrnm(String cusrnm) {
+		this.cusrnm = cusrnm;
+	}
+
+	public String getCusrnm() {
+		return this.cusrnm;
+	}
+
+	public void setCdate(String cdate) {
+		this.cdate = cdate;
+	}
+
+	public String getCdate() {
+		return this.cdate;
+	}
+
+	public String getStation() {
+		return station;
+	}
+
+	public void setStation(String station) {
+		this.station = station;
+	}
+
+	public void setIsdelete(Integer isdelete) {
+		this.isdelete = isdelete;
+	}
+
+	public String getTotal() {
+		return total;
+	}
+
+	public void setTotal(String total) {
+		this.total = total;
+	}
+
+	@Column(name = "CREATE_DATE", updatable = false)
+	public Date getCreateDate() {
+		return createDate;
+	}
+
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+
+	@Column(name = "MODIFY_DATE")
+	public Date getModifyDate() {
+		return modifyDate;
+	}
+
+	public void setModifyDate(Date modifyDate) {
+		this.modifyDate = modifyDate;
+	}
+
+	@Column(name = "IS_DELETE")
+	public Integer getIsdelete() {
+		return isdelete;
+	}
+
 }

+package com.agent.entity.agent;
+
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+import com.agent.entity.IdEntity;
+
+/**
+ * Created by cohesion on 2017/4/17.
+ *
+ * 账单核审
+ */
+@Entity
+@Table(name = "BILL_CHECK_FEE")
+public class BillCheckFeeEntity extends IdEntity {
+	private String code;
+
+	private String feecd;
+
+	private String cfeewt;
+
+	private String feewt;
+
+	private String fee;
+
+	private String rate;
+
+	private String feenm;
+
+	private String payCostFid;
+
+	/**
+	 * 创建时间
+	 */
+	private Date createDate;
+
+	/**
+	 * 修改时间
+	 */
+	private Date modifyDate;
+
+	/**
+	 * 是否删除 1删除 在里不让在修改主单号
+	 */
+	private Integer isdelete = 0;
+
+	public void setFeecd(String feecd) {
+		this.feecd = feecd;
+	}
+
+	public String getFeecd() {
+		return this.feecd;
+	}
+
+	public void setCfeewt(String cfeewt) {
+		this.cfeewt = cfeewt;
+	}
+
+	public String getCfeewt() {
+		return this.cfeewt;
+	}
+
+	public void setFeewt(String feewt) {
+		this.feewt = feewt;
+	}
+
+	public String getFeewt() {
+		return this.feewt;
+	}
+
+	public void setFee(String fee) {
+		this.fee = fee;
+	}
+
+	public String getFee() {
+		return this.fee;
+	}
+
+	public void setRate(String rate) {
+		this.rate = rate;
+	}
+
+	public String getRate() {
+		return this.rate;
+	}
+
+	public void setFeenm(String feenm) {
+		this.feenm = feenm;
+	}
+
+	public String getFeenm() {
+		return this.feenm;
+	}
+
+	public void setPayCostFid(String payCostFid) {
+		this.payCostFid = payCostFid;
+	}
+
+	public String getPayCostFid() {
+		return this.payCostFid;
+	}
+
+	public void setIsdelete(Integer isdelete) {
+		this.isdelete = isdelete;
+	}
+
+	@Column(name = "CREATE_DATE", updatable = false)
+	public Date getCreateDate() {
+		return createDate;
+	}
+
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+
+	@Column(name = "MODIFY_DATE")
+	public Date getModifyDate() {
+		return modifyDate;
+	}
+
+	public void setModifyDate(Date modifyDate) {
+		this.modifyDate = modifyDate;
+	}
+
+	@Column(name = "IS_DELETE")
+	public Integer getIsdelete() {
+		return isdelete;
+	}
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+}

@@ -289,8 +289,9 @@ public class ManifestEntity extends BasicEntity implements Serializable {
 	private Long save_time;
 	private Long USER_ID; // 报文所属的用户id
 
+
 	public String getUnlodingcode() {
-		return StringUtils.isBlank(unlodingcode)?getDestinationstation():unlodingcode;
+		return StringUtils.isBlank(unlodingcode) ? getDestinationstation() : unlodingcode;
 	}
 
 	public void setUnlodingcode(String unlodingcode) {
@@ -565,7 +566,7 @@ public class ManifestEntity extends BasicEntity implements Serializable {
 	@Column(name = "STOWAGEDATE")
 	public Date getStowagedate() {
 //		return stowagedate;
-		return new Date(System.currentTimeMillis()+6*3600);
+		return new Date(System.currentTimeMillis() + 6 * 3600);
 	}
 
 	public void setStowagedate(Date stowagedate) {
@@ -879,7 +880,7 @@ public class ManifestEntity extends BasicEntity implements Serializable {
 
 	@Column(name = "REACH_STATION")
 	public String getReach_station() {
-		return StringUtils.isBlank(reach_station)?getDestinationstation():reach_station;
+		return StringUtils.isBlank(reach_station) ? getDestinationstation() : reach_station;
 	}
 
 	public void setReach_station(String reach_station) {

 package com.agent.entity.agent;
 
+import java.io.Serializable;
 import java.util.Calendar;
 import java.util.Date;
 
@@ -17,8 +18,10 @@ import com.agent.entity.BasicEntity;
  * 预配舱单分单表
  */
 @Entity
-@Table(name = "preparesecondary")
-public class PreparesecondaryEntity extends BasicEntity {
+@Table(name = "PREPARESECONDARY")
+public class PreparesecondaryEntity extends BasicEntity  implements Serializable {
+	private static final long serialVersionUID = 1L;
+	
 	private String unlodingcode;// 卸货地代码
 	private String cnecusid;// 收货人代码
 	private String shpcusid;// 发货人代码
@@ -299,7 +302,7 @@ public class PreparesecondaryEntity extends BasicEntity {
 	private Long USER_ID;
 
 	public String getUnlodingcode() {
-		return StringUtils.isBlank(unlodingcode)?getDestinationstation():unlodingcode;
+		return StringUtils.isBlank(unlodingcode) ? getDestinationstation() : unlodingcode;
 	}
 
 	public void setUnlodingcode(String unlodingcode) {
@@ -592,7 +595,7 @@ public class PreparesecondaryEntity extends BasicEntity {
 	@Column(name = "STOWAGEDATE")
 	public Date getStowagedate() {
 //		return stowagedate;
-		return new Date(System.currentTimeMillis()+6*3600);
+		return new Date(System.currentTimeMillis() + 6 * 3600);
 	}
 
 	public void setStowagedate(Date stowagedate) {
@@ -799,7 +802,7 @@ public class PreparesecondaryEntity extends BasicEntity {
 
 	@Column(name = "SH_COUNTRY")
 	public String getSh_country() {
-		return sh_country!=null?sh_country.toUpperCase():"";
+		return sh_country != null ? sh_country.toUpperCase() : "";
 	}
 
 	public void setSh_country(String sh_country) {
@@ -916,7 +919,7 @@ public class PreparesecondaryEntity extends BasicEntity {
 
 	@Column(name = "REACH_STATION")
 	public String getReach_station() {
-		return StringUtils.isBlank(reach_station)?getDestinationstation():reach_station;
+		return StringUtils.isBlank(reach_station) ? getDestinationstation() : reach_station;
 	}
 
 	public void setReach_station(String reach_station) {

@@ -17,9 +17,9 @@ public class JgText {
 	 protected static final String APP_KEY ="267886222ecf11912a0648ac";
 	 protected static final String MASTER_SECRET = "08d9c08812997d66184d9b02";
 		
-	 public static final String TITLE = "Test from API example";
+	 public static final String TITLE = "BillTask from API example";
 	 public static final String ALERT = "我在郑州给你送信息！";
-	 public static final String MSG_CONTENT = "Test from API Example - msgContent";
+	 public static final String MSG_CONTENT = "BillTask from API Example - msgContent";
 	 public static final String REGISTRATION_ID = "0900e8d85ef";
 
 	public static void main(String[] args) {

+package com.agent.repository.agent;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+import com.agent.entity.agent.BillCheckFeeEntity;
+
+/**
+ * Created by cohesion on 2017/4/17.
+ */
+public interface BillCheckFeeRepository
+		extends PagingAndSortingRepository<BillCheckFeeEntity, Long>, JpaSpecificationExecutor<BillCheckFeeEntity> {
+	@Query(value = "SELECT * FROM BILL_CHECK_FEE WHERE CODE=?1 ORDER BY ID DESC", nativeQuery = true)
+	public List<BillCheckFeeEntity> findList(String mawbNo);
+
+	@Query(value = "SELECT * FROM BILL_CHECK_FEE WHERE CODE=?1 AND FEENM=?2 ORDER BY ID DESC", nativeQuery = true)
+	public List<BillCheckFeeEntity> exist(String mawbNo, String feenm);
+}

 package com.agent.repository.agent;
 
-import com.agent.entity.agent.BillCheckEntity;
+import java.util.List;
+
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.PagingAndSortingRepository;
 
+import com.agent.entity.agent.BillCheckEntity;
+
 /**
  * Created by cohesion on 2017/4/17.
  */
@@ -16,4 +19,10 @@ public interface BillCheckRepository extends PagingAndSortingRepository<BillChec
 
     @Query(value = "SELECT * FROM BILL_CHECK WHERE IS_DELETE = 0 AND DELIVERY_STATION IS NULL AND PAY_DATE=?1 AND CREATOR=?2 ORDER BY ID DESC",nativeQuery = true)
     public BillCheckEntity findByDate(String date,Long creator);
+    
+    @Query(value = "SELECT * FROM BILL_CHECK WHERE CODE=?1 ORDER BY ID DESC",nativeQuery = true)
+    public List<BillCheckEntity> exist(String mawbNo);
+    
+    @Query(value = "SELECT * FROM BILL_CHECK where rownum<=1 ORDER BY FID DESC",nativeQuery = true)
+    public BillCheckEntity last();
 }

+package com.agent.service.agent;
+
+import java.util.Date;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.agent.billcheck.BillCheckBean;
+import com.agent.entity.agent.BillCheckFeeEntity;
+import com.agent.repository.agent.BillCheckFeeRepository;
+import com.agent.service.BasicService;
+
+/**
+ * Created by cohesion on 2017/4/17.
+ */
+@Service("billCheckFeeService")
+public class BillCheckFeeService extends BasicService<BillCheckFeeEntity> {
+
+	@Resource
+	private BillCheckFeeRepository billCheckFeeRepository;
+
+	public List<BillCheckFeeEntity> findList(String mawbNo) {
+		List<BillCheckFeeEntity> list = billCheckFeeRepository.findList(mawbNo);
+		return list;
+	}
+
+	@Transactional
+	public BillCheckFeeEntity save(BillCheckBean bean) {
+		if (bean == null) {
+			return null;
+		}
+
+		BillCheckFeeEntity check = new BillCheckFeeEntity();
+		check.setCfeewt(bean.getCfeewt());
+		check.setCode(bean.getCode());
+		check.setCreateDate(new Date());
+		check.setFee(bean.getFee());
+		check.setFeecd(bean.getFeecd());
+		check.setFeenm(bean.getFeenm());
+		check.setFeewt(bean.getFeewt());
+		check.setPayCostFid(bean.getPayCostFid());
+		check.setRate(bean.getRate());
+		return billCheckFeeRepository.save(check);
+	}
+
+	public boolean exist(String mawbNo, String feenm) {
+		List<BillCheckFeeEntity> list = billCheckFeeRepository.exist(mawbNo, feenm);
+		return list != null && !list.isEmpty();
+	}
+}

 package com.agent.service.agent;
 
-import com.agent.entity.agent.BillCheckEntity;
-import com.agent.repository.agent.BillCheckRepository;
-import com.agent.service.BasicService;
-import com.framework.shiro.SessionUtil;
-import com.plugin.easyui.EasyPage;
+import java.util.Date;
+import java.util.List;
+
+import javax.annotation.Resource;
+
 import org.apache.commons.lang.StringUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -12,56 +12,99 @@ import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
-import java.util.Date;
+import com.agent.billcheck.BillCheckBean;
+import com.agent.entity.agent.BillCheckEntity;
+import com.agent.repository.agent.BillCheckRepository;
+import com.agent.service.BasicService;
+import com.plugin.easyui.EasyPage;
 
 /**
  * Created by cohesion on 2017/4/17.
  */
-@Service
-public class BillCheckService  extends BasicService<BillCheckEntity> {
-
-    @Resource
-    private BillCheckRepository billCheckRepository;
-
-    /**
-     * 分页查询
-     *
-     * @param pageForm 分页对象
-     * @return 包含分页信息和数据的分页对象
-     */
-    public Page<BillCheckEntity> getPage(EasyPage<BillCheckEntity> pageForm) {
-        PageRequest pageRequest = buildPageRequest(pageForm);
-        Specification<BillCheckEntity> spec = buildSpecification(pageForm);
-        Page<BillCheckEntity> page = billCheckRepository.findAll(spec, pageRequest);
-        return page;
-    }
-
-    public BillCheckEntity findByStationAndDate(String station,String date,Long creator){
-        if(StringUtils.isEmpty(station)){
-           return billCheckRepository.findByDate(date,creator);
-        }else {
-            return billCheckRepository.findByStationAndDate(station,date,creator);
-        }
-    }
-
-    public BillCheckEntity findOne(Long id){
-        return billCheckRepository.findOne(id);
-    }
-
-    @Transactional
-    public BillCheckEntity save(BillCheckEntity check){
-        if(check==null){
-            return null;
-        }
-        if(check.getId()==null) {
-            check.setCreator(SessionUtil.getUser());
-            check.setCreateDate(new Date());
-        }
-        else {
-            check.setModifier(SessionUtil.getUser());
-            check.setModifyDate(new Date());
-        }
-        return billCheckRepository.save(check);
-    }
+@Service("billCheckService")
+public class BillCheckService extends BasicService<BillCheckEntity> {
+
+	@Resource
+	private BillCheckRepository billCheckRepository;
+
+	/**
+	 * 分页查询
+	 *
+	 * @param pageForm 分页对象
+	 * @return 包含分页信息和数据的分页对象
+	 */
+	public Page<BillCheckEntity> getPage(EasyPage<BillCheckEntity> pageForm) {
+		PageRequest pageRequest = buildPageRequest(pageForm);
+		Specification<BillCheckEntity> spec = buildSpecification(pageForm);
+		Page<BillCheckEntity> page = billCheckRepository.findAll(spec, pageRequest);
+		return page;
+	}
+
+	public BillCheckEntity findByStationAndDate(String station, String date, Long creator) {
+		if (StringUtils.isEmpty(station)) {
+			return billCheckRepository.findByDate(date, creator);
+		} else {
+			return billCheckRepository.findByStationAndDate(station, date, creator);
+		}
+	}
+
+	public BillCheckEntity findOne(Long id) {
+		return billCheckRepository.findOne(id);
+	}
+
+	public BillCheckEntity last() {
+		return billCheckRepository.last();
+	}
+
+	public boolean exist(String mawbNo) {
+		List<BillCheckEntity> list = billCheckRepository.exist(mawbNo);
+		return list != null && !list.isEmpty();
+	}
+
+	public BillCheckEntity find(String mawbNo) {
+		List<BillCheckEntity> list = billCheckRepository.exist(mawbNo);
+		if (list != null && !list.isEmpty()) {
+			return list.get(0);
+		}
+
+		return null;
+	}
+
+	@Transactional
+	public BillCheckEntity save(BillCheckBean bean) {
+		if (bean == null) {
+			return null;
+		}
+
+		BillCheckEntity check = new BillCheckEntity();
+		check.setBizope(bean.getBizope());
+		check.setCdate(bean.getCdate());
+		check.setChgseq(bean.getChgseq());
+		check.setCode(bean.getCode());
+		check.setCreateDate(new Date());
+		check.setCuscode(bean.getCuscode());
+		check.setCusnm(bean.getCusnm());
+		check.setCusrnm(bean.getCusrnm());
+		check.setDiflag(bean.getDiflag());
+		check.setEiflag(bean.getEiflag());
+		check.setFid(bean.getFid());
+		check.setPaymode(bean.getPaymode());
+		check.setStation(bean.getStation());
+		check.setType(bean.getType());
+
+		return billCheckRepository.save(check);
+	}
+
+	@Transactional
+	public BillCheckEntity updateTotal(String mawbNo, String total) {
+		if (mawbNo == null || total == null) {
+			return null;
+		}
+
+		BillCheckEntity check = find(mawbNo);
+		check.setCode(mawbNo);
+		check.setTotal(total);
+
+		return billCheckRepository.save(check);
+	}
 }

@@ -98,7 +98,7 @@ import tools.Tools;
 /**
  * Created by cohesion on 2017/4/19.
  */
-@Service
+@Service("manifestService")
 public class ManifestService extends BasicService<ManifestEntity> {
 
 	@Resource
@@ -199,6 +199,15 @@ public class ManifestService extends BasicService<ManifestEntity> {
 	public List<ManifestEntity> findByManifestNo(String mawbNo) {
 		return manifestRepository.findByMawbNo(mawbNo);
 	}
+	
+	public ManifestEntity findFirst(String mawbNo) {
+		List<ManifestEntity> list =  manifestRepository.findByMawbNo(mawbNo);
+		if(list!=null&&!list.isEmpty()) {
+			return list.get(0);
+		}
+		
+		return null;
+	}
 
 	public List<ManifestEntity> queryAll() {
 		return manifestRepository.queryAll();
@@ -342,7 +351,7 @@ public class ManifestService extends BasicService<ManifestEntity> {
 		mcs.setCategory(manifest.getCategory() != null ? manifest.getCategory() : "");
 
 		ManifestConsigneeXml consignee = new ManifestConsigneeXml();
-		consignee.setName(manifest.getSh_name());
+		consignee.setName(manifest.getSh_company());
 
 		ManifestAddressXml madd = new ManifestAddressXml();
 		madd.setLine(manifest.getSh_address());

@@ -17,7 +17,8 @@ import redis.clients.jedis.Jedis;
  */
 class XmlSendTask extends Thread {
 	// 创建 缓存服务器的地址ip
-	private Jedis jedis = new Jedis("10.50.3.71", 6379);
+//	private Jedis jedis = new Jedis("10.50.3.71", 6379);
+	private Jedis jedis = new Jedis("10.50.3.84", 6379);
 
 	private String xml;
 

+package com.framework.util;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import javax.crypto.Cipher;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+
+import com.jfinal.kit.HttpKit;
+
+import sun.misc.BASE64Decoder;
+import sun.misc.BASE64Encoder;
+
+public class AesCBC {
+	/*
+	 * 已确认 加密用的Key 可以用26个字母和数字组成 此处使用AES-128-CBC加密模式，key需要为16位。
+	 */
+//	public final static String sKey = "aaaaaaaaaaaaaaaa";
+	public final static String ivParameter = "0000000000000000";
+	private static AesCBC instance = null;
+
+	// private static
+	private AesCBC() {
+
+	}
+
+	public static AesCBC getInstance() {
+		if (instance == null)
+			instance = new AesCBC();
+		return instance;
+	}
+
+	public static String getKey() {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
+		Date date = new Date();
+		String formatDate = sdf.format(date);
+		Date d = new Date(System.currentTimeMillis());
+		String key = formatDate + "owenkasduf" + (new SimpleDateFormat("MM")).format(d);
+		return key;
+	}
+
+	// 加密
+	public String encrypt(String sSrc, String encodingFormat, String sKey, String ivParameter) {
+		try {
+			Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
+			byte[] raw = sKey.getBytes();
+			SecretKeySpec skeySpec = new SecretKeySpec(raw, "AES");
+			IvParameterSpec iv = new IvParameterSpec(ivParameter.getBytes());// 使用CBC模式，需要一个向量iv，可增加加密算法的强度
+			cipher.init(Cipher.ENCRYPT_MODE, skeySpec, iv);
+//	        cipher.init(Cipher.ENCRYPT_MODE, skeySpec);
+			byte[] encrypted = cipher.doFinal(sSrc.getBytes(encodingFormat));
+			return new BASE64Encoder().encode(encrypted);// 此处使用BASE64做转码。
+		} catch (Exception e) {
+		}
+
+		return null;
+	}
+
+	// 解密
+	public String decrypt(String sSrc, String encodingFormat, String sKey, String ivParameter) {
+		try {
+			byte[] raw = sKey.getBytes("ASCII");
+			SecretKeySpec skeySpec = new SecretKeySpec(raw, "AES");
+			Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
+			IvParameterSpec iv = new IvParameterSpec(ivParameter.getBytes());
+			cipher.init(Cipher.DECRYPT_MODE, skeySpec, iv);
+//            cipher.init(Cipher.DECRYPT_MODE, skeySpec);
+			byte[] encrypted1 = new BASE64Decoder().decodeBuffer(sSrc);// 先用base64解密
+			byte[] original = cipher.doFinal(encrypted1);
+			String originalString = new String(original, encodingFormat);
+			return originalString;
+		} catch (Exception ex) {
+			return null;
+		}
+	}
+
+	public static void main(String[] args) throws Exception {
+		// 需要加密的字串
+//		String cSrc = "aqswed1234";
+//		System.out.println("加密前的字串是：" + cSrc);
+//		// 加密
+//		String enString = AesCBC.getInstance().encrypt(cSrc, "utf-8", getKey(), ivParameter);
+//		System.out.println("加密后的字串是：" + enString);
+//        BASE64Encoder encoder = new BASE64Encoder();
+//		List<NameValuePair> params = new ArrayList<NameValuePair>();
+//		params.add(new BasicNameValuePair("data", enString));
+		String params = "data=YCbPytqeduiEj0PGGIeF5Q4rgxJNd59JCtJ5duHrzN8bKvlc8wGhqVyCraamqwNCwb+eGhCBoZ3v\r\n" + 
+				"6SD39qXHKZTDCh/69wufSze7D1b9KMQ=";
+		String result = HttpKit.post("http://zzcargo.com:8080/index.php?r=api/index", params);
+		System.out.println(result);
+		// 解密
+//        String DeString = AesCBC.getInstance().decrypt(result,"utf-8",sKey,ivParameter);
+//        System.out.println("解密后的字串是：" + DeString);
+	}
+}

+package com.framework.util;
+
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParser;
+
+/**
+ * Depiction:
+ * <p>
+ * Modify:
+ * <p>
+ * Author: Kevin Lynn
+ * <p>
+ * Create Date：2018年4月23日 下午6:48:25
+ * 
+ */
+public class JsonKit {
+
+	public JsonKit() {
+	}
+
+	/**
+	 * Json数据解析
+	 * 
+	 * @param <T>
+	 * @param json
+	 *            json源串
+	 * @return List<T>
+	 */
+	public static <T> List<T> parseArray(String json, Class<T> type) {
+		List<T> list = new ArrayList<T>();
+		try {
+			Gson gson = new Gson();
+			JsonParser parser = new JsonParser();
+			JsonArray jsonarray = parser.parse(json).getAsJsonArray();
+			for (JsonElement element : jsonarray) {
+				list.add(gson.fromJson(element, type));
+			}
+		} catch (Exception e) {
+			System.err.println("JsonKit parseArray()" + e.toString());
+			System.err.println();
+		}
+		return list;
+	}
+
+	/**
+	 * Json数据解析
+	 * 
+	 * @param json
+	 *            json源串
+	 * @param cls
+	 *            存储json的实体类
+	 * @return 相应的实体类对象
+	 */
+	public static <T> T parseJson(String json, Type cls) {
+		try {
+			Gson gson = new Gson();
+			return gson.fromJson(json, cls);
+		} catch (Exception e) {
+			System.err.println(cls.getClass().getSimpleName() + " parseJson()" + e.toString());
+			System.err.println();
+		}
+		return null;
+	}
+}

@@ -4,52 +4,60 @@ import java.util.HashMap;
 import java.util.Map;
 
 import com.agent.entity.system.UserEntity;
-import com.alibaba.fastjson.JSONObject;
+import com.framework.util.AesCBC;
 
 import tools.HttpTools;
 
 public class FLogin {
+
+	public static void main(String[] args) {
+		UserEntity user = new UserEntity();
+		user.setLoginaccount("wangshan");
+		user.setPassword("123456");
+		LoginData ret = login(user);
+		System.err.println("ret-->" + ret.toJson());
+	}
+
 	public static LoginData login(UserEntity user) {
 		LoginData logindata = new LoginData();
 
 		InfoData info = new InfoData();
-		String param = "ssid=5672813&data=";
-		InterfaceData id = new InterfaceData();
-		id.setKey("owenkasduf");
+//		String param = "ssid=5672813&data=";
+		InterfaceData params = new InterfaceData();
+		params.setKey("owenkasduf");
 		// id.setUsername("wangshan");
 		// id.setPwd("123456");
-		id.setUsername(user.getLoginaccount());
-		id.setPwd(user.getPassword());
-		id.setType("2");
-		// System.out.println(Security.getKey());
+		params.setUsername(user.getLoginaccount());
+		params.setPwd(user.getPassword());
+		params.setType("2");
+
 		// 构造请求数据包(并且加密data数据)
-		String data = Security.encrypt(JSONObject.toJSONString(id), Security.getKey());
-		param = param + data;
-		// System.err.println("param-->"+param);
-		// 发送登录消息
-		// String receive =
-		// HttpRequest.sendPost("http://10.50.2.24/index.php?r=api/index", param);
-		// String receive =
-		// HttpRequest.sendPost("http://10.50.2.20/index.php?r=api/index", param);
-		// String receive =
-		// HttpRequest.sendPost("http://www.zzcargo.com/index.php?r=api/index", param);
+//		String data = Security.encrypt(JSONObject.toJSONString(id), Security.getKey());
+//		param = param + data;
+
+		String source = params.toJson();
+		System.err.println("source-->" + source);
+
+		String key = AesCBC.getKey();
+		System.err.println("key-->" + key);
+
+		String data = AesCBC.getInstance().encrypt(source, "utf-8", key, AesCBC.ivParameter);
+
+		System.err.println("参数密文:" + data);
 
 		Map<String, String> map = new HashMap<String, String>();
 		map.put("ssid", "5672813");
 		map.put("data", data);
 		String receive = HttpTools.sendPost("http://www.zzcargo.com/index.php?r=api/index", map, "UTF-8");
-		/// index.php?r=site/login
-//		 System.err.println("receive-->"+receive);
+//		String receive = HttpTools.sendPost("http://zzcargo.com:8080/index.php?r=api/index", map, "UTF-8");
 		try {
 			// 转换接收到的数据
 			FJSON.JsonToObject(logindata, receive);
 			// 验证通过
 			if (logindata.getCode() == 20000) {
 				// 对传回的数据解密
-				String raw = Security.decrypt(logindata.getInfo(), Security.getKey());
-				// show message
-//				 System.err.println("raw-->"+raw);
-
+//				String raw = Security.decrypt(logindata.getInfo(), Security.getKey());
+				String raw = AesCBC.getInstance().decrypt(logindata.getInfo(), "utf-8", key, AesCBC.ivParameter);
 				logindata.setInfo(raw);
 				// 将解密后的数据转回json
 				FJSON.JsonToObject(info, logindata.getInfo());
@@ -60,17 +68,6 @@ public class FLogin {
 			logindata.setCode(0);
 
 		}
-		// 测试的数据
-		// InfoData id = new InfoData();
-		//
-		// id.setMobile("fadf");
-		// id.setCompany_info("flasdjf");
-		// id.setQq("fasdf");
-		// id.setContact("fffffffff");
-		// id.setAddress("fafda");
-		// id.setCompany("fafdadf");
-		// logindata.setCode(20000);
-		// logindata.setInfodata(id);
 		return logindata;
 	}
 }

 package login;
 
+import com.google.gson.Gson;
+
 public class InterfaceData {
 	private String key;
 	private String username;
@@ -37,4 +39,8 @@ public class InterfaceData {
 	public void setType(String type) {
 		this.type = type;
 	}
+
+	public String toJson() {
+		return new Gson().toJson(this);
+	}
 }

 package login;
 
+import com.google.gson.Gson;
+
 public class LoginData {
 	private int code;
 	private String info;
@@ -28,5 +30,8 @@ public class LoginData {
 		this.infodata = infodata;
 	}
 	
+	public String toJson() {
+		return new Gson().toJson(this);
+	}
 	
 }

 package login;
 
-
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
@@ -10,38 +9,39 @@ import javax.crypto.spec.SecretKeySpec;
 import org.apache.commons.codec.binary.Base64;
 
 public class Security {
-	public static String getKey(){
+	public static String getKey() {
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
-	    Date date = new Date();
-	    String formatDate = sdf.format(date);
+		Date date = new Date();
+		String formatDate = sdf.format(date);
 		Date d = new Date(System.currentTimeMillis());
-		String key = formatDate+"owenkasduf"+(new SimpleDateFormat("MM")).format(d);
+		String key = formatDate + "owenkasduf" + (new SimpleDateFormat("MM")).format(d);
 		return key;
 	}
-	public static String encrypt(String input, String key){
-	    byte[] crypted = null;
-	    try{
-	    SecretKeySpec skey = new SecretKeySpec(key.getBytes(), "AES");
-	    Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
-	    cipher.init(Cipher.ENCRYPT_MODE, skey);
-	    crypted = cipher.doFinal(input.getBytes());
-	    }catch(Exception e){
-	    System.out.println(e.toString());
-	    }
-	    return new String(Base64.encodeBase64(crypted));
+
+	public static String encrypt(String input, String key) {
+		byte[] crypted = null;
+		try {
+			SecretKeySpec skey = new SecretKeySpec(key.getBytes(), "AES");
+			Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
+			cipher.init(Cipher.ENCRYPT_MODE, skey);
+			crypted = cipher.doFinal(input.getBytes());
+		} catch (Exception e) {
+			System.out.println(e.toString());
+		}
+		return new String(Base64.encodeBase64(crypted));
 	}
-	
-	public static String decrypt(String input, String key){
-	    byte[] output = null;
-	    try{
-	    SecretKeySpec skey = new SecretKeySpec(key.getBytes(), "AES");
-	    Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
-	    cipher.init(Cipher.DECRYPT_MODE, skey);
-	    output = cipher.doFinal(Base64.decodeBase64(input));
-	    }catch(Exception e){
-	    System.out.println(e.toString());
-	    }
-	    return new String(output);
+
+	public static String decrypt(String input, String key) {
+		byte[] output = null;
+		try {
+			SecretKeySpec skey = new SecretKeySpec(key.getBytes(), "AES");
+			Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
+			cipher.init(Cipher.DECRYPT_MODE, skey);
+			output = cipher.doFinal(Base64.decodeBase64(input));
+		} catch (Exception e) {
+			System.out.println(e.toString());
+		}
+		return new String(output);
 	}
 
 }

@@ -141,5 +141,7 @@
 	</bean>
 	
 	<bean id="startupListener" class="com.agent.listener.StartupListener"/>
+	
+	<bean id="SpringContextKit" class="com.agent.billcheck.SpringContextKit" scope="singleton"></bean>
 
 </beans>
\ No newline at end of file

@@ -120,4 +120,7 @@
 		</bean>
 	</mvc:interceptors>
 	
+	<!-- <context:component-scan base-package="com.agent.billcheck"/>
+	<task:annotation-driven/> -->
+	
 </beans>
\ No newline at end of file

+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%
+	String path = request.getContextPath();
+	String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort()
+			+ path + "/";
+%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+<title><spring:message code="menu.consignee_info_set" /></title>
+<script type="text/javascript" src="<%=basePath%>resource/easyui/jquery.min.js?version=${version}"></script>
+<script type="text/javascript"
+	src="<%=basePath%>resource/validate/jquery.validate.js?version=${version}"></script>
+<script type="text/javascript"
+	src="<%=basePath%>resource/validate/validate-extends.js?version=${version}"></script>
+<!-- validate 验证中英文 -->
+<script type="text/javascript"
+	src="<%=basePath %>resource/validate/jquery.validate-${pageContext.response.locale}.js?version=${version}"></script>
+<link rel="stylesheet" href="<%=basePath%>resource/layui/css/layui.css?version=${version}"
+	media="all">
+<script type="text/javascript" src="<%=basePath%>resource/layui/layui.js?version=${version}"></script>
+<script type="text/javascript" src="<%=basePath%>resource/js/tools.js?version=${version}"></script>
+</head>
+<body>
+	<div>
+		<div class="layui-row">
+			<div class="layui-col-md1">
+				<h4 style="margin-top: 10px;">交运货站:</h4>
+			</div>
+			<div class="layui-col-md2" style="margin-left: -30px;">
+				<form class="layui-form">
+					<select id="status" name="status">
+						<option value="-1">全部</option>
+						<option value="0">西货运区国内主体货站</option>
+						<option value="1">西货运区国际主体货站</option>
+						<option value="2">西货运区国际二级货站</option>
+						<option value="2">西货运区国际综保货站</option>
+						<option value="2">西货运区国际快邮货站</option>
+					</select>
+				</form>
+			</div>
+			
+			<div class="layui-col-md1">
+				<h4 style="margin-top: 10px; margin-left: 30px;">付款月份:</h4>
+			</div>
+			
+			<div class="layui-col-md2">
+				<input type="text" class="layui-input" id="start_time" name="start_time" autocomplete="off">
+			</div>
+			<div class="layui-col-md2" style="margin-left: 10px;">
+				<input type="text" class="layui-input" id="end_time" name="end_time" autocomplete="off">
+			</div>
+			<div class="layui-col-md1" style="margin-left: 10px;">
+				<button class="layui-btn layui-btn-normal" onclick="doSearch()">搜索</button>
+			</div>
+		</div>
+		<table id="data-table" class="layui-hide" lay-filter="data-table"></table>
+	</div>
+	
+	<script type="text/html" id="opt-bar">
+		<div class="layui-btn-group">
+  			<button class="layui-btn layui-btn-sm" lay-event="details">
+    			明细
+  			</button>
+		</div> 
+	</script>
+
+	<script>
+		var layer;
+		layui.use(['layer','element','laydate'], function() {
+			layer = layui.layer;
+			var element = layui.element;
+			
+			var laydate = layui.laydate;
+			laydate.render({
+				elem : '#start_time',
+				format: "yyyy-MM-dd",
+				value: new Date()
+			});
+
+			laydate.render({
+				elem : '#end_time',
+				format: "yyyy-MM-dd",
+				value: new Date()
+			});
+		});
+	
+		$(window).load(function() {
+			doSearch();
+		});
+
+		var table;
+		function doSearch() {
+			var api = "<%=basePath%>billcheck/search";
+			var start_date = $("#start_time").val();
+			var end_date = $("#end_time").val();
+			
+			layui.use('table', function() {
+				table = layui.table;
+				table.render({
+					elem : '#data-table',
+					url : api,
+					limit : 10,
+					page : true,
+					loading : true,
+					limits : [ 10, 15, 20, 25, 30, 35, 40, 45, 50 ],
+					text : {none:'暂无数据'},
+					cols : [ [ //表头
+					{
+						field : 'code',
+						title : '运单号',
+						width : 120
+					}, {
+						field : 'eiflag',
+						title : '进出港标识'
+					}, {
+						field : 'diflag',
+						title : '国际国内标识'
+					}, {
+						field : 'station',
+						title : '营业点'
+					}, {
+						field : 'cdate',
+						title : '计费时间'
+					},{
+						field : 'cusnm',
+						title : '缴费人'
+					}, {
+						field : 'paymode',
+						title : '支付方式'
+					},{
+						field : 'total',
+						title : '总计',
+						width : 100
+					},{
+						field : '',
+						title : '操作',
+						toolbar : '#opt-bar',
+						width : 80
+					} ] ]
+				});
+			});
+		}
+		
+		layui.use('table', function() {
+			var table = layui.table;
+			table.on('tool(data-table)', function(obj) {
+				var data = obj.data;
+				var layEvent = obj.event;
+				var tr = obj.tr; //获得当前行 tr 的DOM对象
+
+				if (layEvent === 'details') { 
+					//明细
+					
+				}
+			});
+		});
+		
+	</script>
+</body>
+</html>
\ No newline at end of file