zhangFan / analysis_imf · 提交

转到一个项目

作者 zhangFan
提交 7d8561e3f559f84cb0189a31ba8b91207c21243e 1 个父辈 552e1081

Docking qr code

内嵌 并排对比
正在显示 10 个修改的文件 包含 136 行增加 和 310 行删除
#登录账号
loginname = KAOR
loginname = KKW1
#登录密码
loginpass = KAOR
loginpass = KKW1
#发送报文目录,相对程序目录
readDirectory = sendDirectory
readDirectory = D:/bw/sendDirectory
#接收存储报文目录
bakDirectory = receiveDirectory
bakDirectory = D:/bw/receiveDirectory
#IMF MEAT报头配置
RCVR=
... ... @@ -13,4 +13,7 @@ TYPE=KAKO
STYP=CARM
#载重与称重的可控范围 ?%
grossWt=1%
\ No newline at end of file
grossWt=15%
#二维码存放路径，项目启动时设置，后期不能更改。
barCode = barcode/
... ...
... ... @@ -4,6 +4,7 @@ import com.sy.bwAssist.Message;
import com.sy.logic.LogicOperation;
import com.sy.model.*;
import com.sy.service.*;
import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
... ... @@ -35,6 +36,8 @@ public class AnalysisRoute {
@Autowired
private LandBusListService listService;
protected static final Logger logger = Logger.getLogger(AnalysisRoute.class);
private static AnalysisRoute route;
private static MessageAnalysis analysis = new MessageAnalysis();
... ... @@ -67,6 +70,7 @@ public class AnalysisRoute {
}else{
GatherInfo info = gatherInfoAnalysis.toJavaBean(message);
if(LogicOperation.operation(info)){
logger.info("进出站业务申请成功");
}
route.infoService.save(info);
}
... ...
... ... @@ -13,9 +13,6 @@ public class MessageAnalysis {
return getMessage(str);
}
static Message getMessage(String str) {
XStream xstream = new XStream(new DomDriver("UTF-8", new XmlFriendlyNameCoder("_-", "_")));
xstream.processAnnotations(Message.class);
... ... @@ -24,7 +21,5 @@ public class MessageAnalysis {
return msg;
}
public String getStype() {
return msg.getMeta().getSmType();
}
}
... ...
... ... @@ -63,24 +63,27 @@ public class buildBarCode {
public static Map jsonFormat(String json) {
JSONObject jsonObject = JSONObject.parseObject(json);
Object data = jsonObject.get("data");
String content = "[" + data.toString() + "]";
JSONArray jsonArray = JSONArray.parseArray(content);
Map map = JSON.parseObject(jsonArray.getString(0));
Map map =null;
if(data!=null) {
String content = "[" + data.toString() + "]";
JSONArray jsonArray = JSONArray.parseArray(content);
map= JSON.parseObject(jsonArray.getString(0));
}
return map;
}
// 生成二维码
public static String CreateBarCode(String carCode,String carColor,String mainifist) {
String json = "{\"token\":\"samples\",\"data\":{\"vehicle_no\":\""+carCode+"\",\"vehicle_no_color\":\""
+carColor+"\",\"vehicle_rela_id\":\""+mainifist+"\"}}";
String json = "{\"token\":\"samples\",\"data\":{\"vehicle_no\":\""+carCode+"\"," +
"\"vehicle_no_color\":\"黄\",\"vehicle_rela_id\":\""+mainifist+"\"}}";
String content = buildBarCode.sendData(CREATEBARCODE, json);
Map map = buildBarCode.jsonFormat(content);
return map.get("vehicle_bar_code").toString();
}
// 取消二维码
public static void cancleBarCode(String carCode,String carColor) {
String json = "{\"token\":\"samples\",\"data\":{\"vehicle_no\":\""+carCode+"\",\"vehicle_no_color\":\""+carColor+"\"}}";
public static void cancleBarCode(String frameNo) {
String json = "{\"token\":\"samples\",\"data\":{\"vehicle_no\":\""+frameNo+"\",\"vehicle_no_color\":\"黄\"}}";
buildBarCode.sendData(CANCLEBARCODE, json);
}
... ...
... ... @@ -3,6 +3,7 @@ package com.sy.logic;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.sy.crossDomain.buildBarCode;
import com.sy.model.GatherInfo;
import com.sy.model.LandBusinessTypeList;
import com.sy.model.LandRoadVe;
... ... @@ -22,6 +23,7 @@ import java.math.BigDecimal;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLConnection;
import java.text.DecimalFormat;
import java.text.NumberFormat;
import java.text.ParseException;
import java.util.List;
... ... @@ -49,6 +51,7 @@ public class LogicOperation {
private static String NORECORD = "车辆未备案";
private static String INPUTSTATION = "此车辆未做进站申请";
private static String ENTERSTATION = "此车辆未做出站申请";
private static String ISVALID = "二维码已失效或者此车辆未做出入申请";
@PostConstruct
public void init() {
... ... @@ -63,30 +66,59 @@ public class LogicOperation {
*/
public static boolean operation(GatherInfo info) {
boolean result = false;
if(info.getBarcode()==null || info.getBarcode().length()<=0 ){
return result;
}
BigDecimal grosswt = info.getGrosswt();
//转为double类型
double growssWt = grosswt.doubleValue();
String ietype = info.getIetype();
List<LandBusinessTypeList> lists = null;
String vaName = info.getVename();
if(vaName==null || vaName.length()<=0 ){
return result;
}
LandRoadVe ve = logic.veService.selectByFrameNo(vaName);
if(ve ==null) return result;
LandBusinessTypeList list = logic.listService.selectForOne(info.getVename(),info.getBarcode(),info.getAreaid
(),info.getChnlno(),info.getIetype());
double goodsWt = 0.0;
if (list.getMasterList().length() > 0) {
goodsWt = GoodsWt(list.getMasterList(), info.getIetype());
}
double selfWt = Double.parseDouble(ve.getSelfWt());
if (sendBw(info, growssWt, selfWt, goodsWt)) {
if ("I".equals(info.getIetype())) {
list.setContrastflag("已进站");
} else {
list.setContrastflag("已出站");
if("0".equals(list.getIsvalid())){
double goodsWt = 0.0;
if (list.getMasterList()!=null || list.getMasterList().length()>0 ) {
goodsWt = GoodsWt(list.getMasterList(), info.getIetype());
}
logic.listService.updateById(list);
result = true;
double selfWt = Double.parseDouble(ve.getSelfWt());
if (sendBw(info, growssWt, selfWt, goodsWt)) {
if ("I".equals(info.getIetype())) {
list.setContrastflag("已进站");
} else {
list.setContrastflag("已出站");
}
logic.listService.updateById(list);
List<LandBusinessTypeList> businessTypeLists = logic.listService.selectByBarcode(info.getBarcode());
int count = 0;
for(int i=0; i<businessTypeLists.size(); i++){
String flag1 = businessTypeLists.get(i).getContrastflag();
if(flag1 != null){
count++;
}
}
if("货物流转".equals(list.getBusinesstype())){
if(count==4){
buildBarCode.cancleBarCode(vaName);
logic.listService.updateByBarcode(info.getBarcode());
}
}else{
if(count==2){
buildBarCode.cancleBarCode(vaName);
logic.listService.updateByBarcode(info.getBarcode());
}
}
result = true;
}
}else{
CommandClient.Client(info, ISVALID);
}
return result;
}
... ... @@ -111,20 +143,15 @@ public class LogicOperation {
*/
//校验载重和称重是否在合理的范围
public static boolean checkResult(double grossWt, double wt, double goodsWt) {
DecimalFormat df=new DecimalFormat("0.00");
boolean flag = false;
double result = 0.0;
if (goodsWt > 0) {
result = (grossWt - wt) / goodsWt;
if (result > 1) {
result = result - 1;
} else {
result = 1 - result;
}
result = Double.parseDouble(df.format(Math.abs((goodsWt+wt-grossWt)/grossWt)));
} else {
result = (grossWt - wt);
result = Double.parseDouble(df.format(Math.abs((grossWt - wt)/grossWt)));
}
BigDecimal bd = new BigDecimal(result);
if (bd.setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue() <= valueDob()) {
if (result <= valueDob()) {
flag = true;
}
return flag;
... ...
... ... @@ -2,9 +2,11 @@ package com.sy.mapper;
import com.sy.model.LandBusinessTypeList;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Component;
import java.util.List;
@Component
public interface LandBusinessTypeListMapper {
int deleteByPrimaryKey(String id);
... ... @@ -17,6 +19,7 @@ public interface LandBusinessTypeListMapper {
int updateByPrimaryKeySelective(LandBusinessTypeList record);
int updateByPrimaryKey(LandBusinessTypeList record);
//根据车牌号和进出场标志查询
List<LandBusinessTypeList> selectFrameNoAndType(@Param("trailerFrameNo") String frameNo,
@Param("turnoverflag") String flag);
... ... @@ -24,4 +27,8 @@ public interface LandBusinessTypeListMapper {
LandBusinessTypeList selectForOne(@Param("trailerFrameNo") String trailerFrameNo, @Param("barcode") String barcode,
@Param("endstation") String endstation, @Param("aisle") String aisle,
@Param("turnoverflag") String turnoverflag);
List<LandBusinessTypeList> selectByBarcode(@Param("barcode")String barcode);
int updateByBarCode(@Param("barcode")String barcode);
}
\ No newline at end of file
... ...
package com.sy.model;
import java.util.Date;
public class LandBusinessTypeList {
private String id;
private String massageId;
private String trailerFrameNo;
private String trailerLicenseNo;
private String masterList;
private Date prodectTime;
private String returnmessage;
private String agentno;
private String agentname;
private String cocode;
private String drivername;
private String driverid;
private String startport;
private String endport;
private String startsatation;
private String endstation;
private String aisle;
private String businesstype;
private String turnoverflag;
private String barcode;
private String contrastflag;
private String createBy;
private Date createDate;
private String updateBy;
private Date updateDate;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id == null ? null : id.trim();
}
public String getMassageId() {
return massageId;
}
public void setMassageId(String massageId) {
this.massageId = massageId == null ? null : massageId.trim();
}
public String getTrailerFrameNo() {
return trailerFrameNo;
}
public void setTrailerFrameNo(String trailerFrameNo) {
this.trailerFrameNo = trailerFrameNo == null ? null : trailerFrameNo.trim();
}
public String getTrailerLicenseNo() {
return trailerLicenseNo;
}
public void setTrailerLicenseNo(String trailerLicenseNo) {
this.trailerLicenseNo = trailerLicenseNo == null ? null : trailerLicenseNo.trim();
}
public String getMasterList() {
return masterList;
}
public void setMasterList(String masterList) {
this.masterList = masterList == null ? null : masterList.trim();
}
public Date getProdectTime() {
return prodectTime;
}
public void setProdectTime(Date prodectTime) {
this.prodectTime = prodectTime;
}
public String getReturnmessage() {
return returnmessage;
}
public void setReturnmessage(String returnmessage) {
this.returnmessage = returnmessage == null ? null : returnmessage.trim();
}
public String getAgentno() {
return agentno;
}
public void setAgentno(String agentno) {
this.agentno = agentno == null ? null : agentno.trim();
}
public String getAgentname() {
return agentname;
}
public void setAgentname(String agentname) {
this.agentname = agentname == null ? null : agentname.trim();
}
public String getCocode() {
return cocode;
}
public void setCocode(String cocode) {
this.cocode = cocode == null ? null : cocode.trim();
}
public String getDrivername() {
return drivername;
}
public void setDrivername(String drivername) {
this.drivername = drivername == null ? null : drivername.trim();
}
public String getDriverid() {
return driverid;
}
public void setDriverid(String driverid) {
this.driverid = driverid == null ? null : driverid.trim();
}
public String getStartport() {
return startport;
}
public void setStartport(String startport) {
this.startport = startport == null ? null : startport.trim();
}
public String getEndport() {
return endport;
}
public void setEndport(String endport) {
this.endport = endport == null ? null : endport.trim();
}
public String getStartsatation() {
return startsatation;
}
public void setStartsatation(String startsatation) {
this.startsatation = startsatation == null ? null : startsatation.trim();
}
public String getEndstation() {
return endstation;
}
public void setEndstation(String endstation) {
this.endstation = endstation == null ? null : endstation.trim();
}
public String getAisle() {
return aisle;
}
public void setAisle(String aisle) {
this.aisle = aisle == null ? null : aisle.trim();
}
public String getBusinesstype() {
return businesstype;
}
public void setBusinesstype(String businesstype) {
this.businesstype = businesstype == null ? null : businesstype.trim();
}
public String getTurnoverflag() {
return turnoverflag;
}
public void setTurnoverflag(String turnoverflag) {
this.turnoverflag = turnoverflag == null ? null : turnoverflag.trim();
}
public String getBarcode() {
return barcode;
}
public void setBarcode(String barcode) {
this.barcode = barcode == null ? null : barcode.trim();
}
public String getContrastflag() {
return contrastflag;
}
public void setContrastflag(String contrastflag) {
this.contrastflag = contrastflag == null ? null : contrastflag.trim();
}
public String getCreateBy() {
return createBy;
}
public void setCreateBy(String createBy) {
this.createBy = createBy == null ? null : createBy.trim();
}
public Date getCreateDate() {
return createDate;
}
public void setCreateDate(Date createDate) {
this.createDate = createDate;
}
public String getUpdateBy() {
return updateBy;
}
public void setUpdateBy(String updateBy) {
this.updateBy = updateBy == null ? null : updateBy.trim();
}
public Date getUpdateDate() {
return updateDate;
}
public void setUpdateDate(Date updateDate) {
this.updateDate = updateDate;
}
}
\ No newline at end of file
... ... @@ -14,4 +14,8 @@ public interface LandBusListService {
int saveList(LandBusinessTypeList list);
LandBusinessTypeList selectForOne(String frameNo, String barcode, String station, String aisle, String flag);
List<LandBusinessTypeList> selectByBarcode(String barcode);
int updateByBarcode(String barcode);
}
... ...
... ... @@ -53,4 +53,20 @@ public class LandBusListServiceImpl implements LandBusListService {
}
return list;
}
@Override
public List<LandBusinessTypeList> selectByBarcode(String barcode){
List<LandBusinessTypeList> list= null;
try{
list = listMapper.selectByBarcode(barcode);
}catch (Exception e){
System.out.println(e.getMessage());
}
return list;
}
@Override
public int updateByBarcode(String barcode) {
return listMapper.updateByBarCode(barcode);
}
}
... ...
... ... @@ -8,7 +8,7 @@
<result column="TRAILER_LICENSE_NO" jdbcType="VARCHAR" property="trailerLicenseNo" />
<result column="MASTER_LIST" jdbcType="VARCHAR" property="masterList" />
<result column="PRODECT_TIME" jdbcType="TIMESTAMP" property="prodectTime" />
<result column="RETURNMESSAGE" jdbcType="VARCHAR" property="returnmessage" />
<result column="IS_DELETE" jdbcType="VARCHAR" property="isDelete" />
<result column="AGENTNO" jdbcType="VARCHAR" property="agentno" />
<result column="AGENTNAME" jdbcType="VARCHAR" property="agentname" />
<result column="COCODE" jdbcType="VARCHAR" property="cocode" />
... ... @@ -27,12 +27,13 @@
<result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate" />
<result column="UPDATE_BY" jdbcType="VARCHAR" property="updateBy" />
<result column="UPDATE_DATE" jdbcType="TIMESTAMP" property="updateDate" />
<result column="ISVALID" jdbcType="VARCHAR" property="isvalid" />
</resultMap>
<sql id="Base_Column_List">
id, MASSAGE_ID, TRAILER_FRAME_NO, TRAILER_LICENSE_NO, MASTER_LIST, PRODECT_TIME,
RETURNMESSAGE, AGENTNO, AGENTNAME, COCODE, DRIVERNAME, DRIVERID, STARTPORT, ENDPORT,
IS_DELETE, AGENTNO, AGENTNAME, COCODE, DRIVERNAME, DRIVERID, STARTPORT, ENDPORT,
STARTSATATION, ENDSTATION, AISLE, BUSINESSTYPE, TURNOVERFLAG, BARCODE, CONTRASTFLAG,
CREATE_BY, CREATE_DATE, UPDATE_BY, UPDATE_DATE
CREATE_BY, CREATE_DATE, UPDATE_BY, UPDATE_DATE, ISVALID
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
select
... ... @@ -58,29 +59,40 @@
and AISLE = #{aisle,jdbcType=VARCHAR}
and TURNOVERFLAG = #{turnoverflag,jdbcType=VARCHAR}
</select>
<select id="selectByBarcode" parameterType="java.lang.String" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from land_businesstype_list
where BARCODE = #{barcode,jdbcType=VARCHAR}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.String">
delete from land_businesstype_list
where id = #{id,jdbcType=VARCHAR}
</delete>
<update id="updateByBarCode" parameterType="java.lang.String">
update land_businesstype_list set ISVALID = "1" where BARCODE=#{barcode,jdbcType=VARCHAR};
</update>
<insert id="insert" parameterType="com.sy.model.LandBusinessTypeList">
insert into land_businesstype_list (id, MASSAGE_ID, TRAILER_FRAME_NO,
TRAILER_LICENSE_NO, MASTER_LIST, PRODECT_TIME,
RETURNMESSAGE, AGENTNO, AGENTNAME,
IS_DELETE, AGENTNO, AGENTNAME,
COCODE, DRIVERNAME, DRIVERID,
STARTPORT, ENDPORT, STARTSATATION,
ENDSTATION, AISLE, BUSINESSTYPE,
TURNOVERFLAG, BARCODE, CONTRASTFLAG,
CREATE_BY, CREATE_DATE, UPDATE_BY,
UPDATE_DATE)
UPDATE_DATE, ISVALID)
values (#{id,jdbcType=VARCHAR}, #{massageId,jdbcType=VARCHAR}, #{trailerFrameNo,jdbcType=VARCHAR},
#{trailerLicenseNo,jdbcType=VARCHAR}, #{masterList,jdbcType=VARCHAR}, #{prodectTime,jdbcType=TIMESTAMP},
#{returnmessage,jdbcType=VARCHAR}, #{agentno,jdbcType=VARCHAR}, #{agentname,jdbcType=VARCHAR},
#{isDelete,jdbcType=VARCHAR}, #{agentno,jdbcType=VARCHAR}, #{agentname,jdbcType=VARCHAR},
#{cocode,jdbcType=VARCHAR}, #{drivername,jdbcType=VARCHAR}, #{driverid,jdbcType=VARCHAR},
#{startport,jdbcType=VARCHAR}, #{endport,jdbcType=VARCHAR}, #{startsatation,jdbcType=VARCHAR},
#{endstation,jdbcType=VARCHAR}, #{aisle,jdbcType=VARCHAR}, #{businesstype,jdbcType=VARCHAR},
#{turnoverflag,jdbcType=VARCHAR}, #{barcode,jdbcType=VARCHAR}, #{contrastflag,jdbcType=VARCHAR},
#{createBy,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR},
#{updateDate,jdbcType=TIMESTAMP})
#{updateDate,jdbcType=TIMESTAMP}, #{isvalid,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" parameterType="com.sy.model.LandBusinessTypeList">
insert into land_businesstype_list
... ... @@ -103,8 +115,8 @@
<if test="prodectTime != null">
PRODECT_TIME,
</if>
<if test="returnmessage != null">
RETURNMESSAGE,
<if test="isDelete != null">
IS_DELETE,
</if>
<if test="agentno != null">
AGENTNO,
... ... @@ -160,6 +172,9 @@
<if test="updateDate != null">
UPDATE_DATE,
</if>
<if test="isvalid != null">
ISVALID,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
... ... @@ -180,8 +195,8 @@
<if test="prodectTime != null">
#{prodectTime,jdbcType=TIMESTAMP},
</if>
<if test="returnmessage != null">
#{returnmessage,jdbcType=VARCHAR},
<if test="isDelete != null">
#{isDelete,jdbcType=VARCHAR},
</if>
<if test="agentno != null">
#{agentno,jdbcType=VARCHAR},
... ... @@ -237,6 +252,9 @@
<if test="updateDate != null">
#{updateDate,jdbcType=TIMESTAMP},
</if>
<if test="isvalid != null">
#{isvalid,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.sy.model.LandBusinessTypeList">
... ... @@ -257,8 +275,8 @@
<if test="prodectTime != null">
PRODECT_TIME = #{prodectTime,jdbcType=TIMESTAMP},
</if>
<if test="returnmessage != null">
RETURNMESSAGE = #{returnmessage,jdbcType=VARCHAR},
<if test="isDelete != null">
IS_DELETE = #{isDelete,jdbcType=VARCHAR},
</if>
<if test="agentno != null">
AGENTNO = #{agentno,jdbcType=VARCHAR},
... ... @@ -314,6 +332,9 @@
<if test="updateDate != null">
UPDATE_DATE = #{updateDate,jdbcType=TIMESTAMP},
</if>
<if test="isvalid != null">
ISVALID = #{isvalid,jdbcType=VARCHAR},
</if>
</set>
where id = #{id,jdbcType=VARCHAR}
</update>
... ... @@ -324,7 +345,7 @@
TRAILER_LICENSE_NO = #{trailerLicenseNo,jdbcType=VARCHAR},
MASTER_LIST = #{masterList,jdbcType=VARCHAR},
PRODECT_TIME = #{prodectTime,jdbcType=TIMESTAMP},
RETURNMESSAGE = #{returnmessage,jdbcType=VARCHAR},
IS_DELETE = #{isDelete,jdbcType=VARCHAR},
AGENTNO = #{agentno,jdbcType=VARCHAR},
AGENTNAME = #{agentname,jdbcType=VARCHAR},
COCODE = #{cocode,jdbcType=VARCHAR},
... ... @@ -342,7 +363,8 @@
CREATE_BY = #{createBy,jdbcType=VARCHAR},
CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
UPDATE_BY = #{updateBy,jdbcType=VARCHAR},
UPDATE_DATE = #{updateDate,jdbcType=TIMESTAMP}
UPDATE_DATE = #{updateDate,jdbcType=TIMESTAMP},
ISVALID = #{isvalid,jdbcType=VARCHAR}
where id = #{id,jdbcType=VARCHAR}
</update>
</mapper>
\ No newline at end of file
... ...