kakoIMF check some message

zhangFan
src/main/java/com/sy/logic/LogicOperation.java
src/main/java/com/sy/mapper/LandBusinessTypeListMapper.java
src/main/java/com/sy/model/LandBusinessTypeList.java
src/main/java/com/sy/service/LandBusListService.java
src/main/java/com/sy/service/impl/LandBusListServiceImpl.java
src/main/resources/mapping/LandBusinessTypeListMapper.xml
--- a/src/main/java/com/sy/logic/LogicOperation.java
查看文件 @552e108
+++ b/src/main/java/com/sy/logic/LogicOperation.java
查看文件 @552e108
@@ -3,7 +3,6 @@ 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;
@@ -11,7 +10,6 @@ import com.sy.service.LandBusListService;
 import com.sy.service.LandRoadVeService;
 import com.sy.socket.CommandClient;
 import com.sy.utils.FileTool;
-import com.sy.utils.UUIDCreate;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -26,7 +24,6 @@ import java.net.URL;
 import java.net.URLConnection;
 import java.text.NumberFormat;
 import java.text.ParseException;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -74,54 +71,21 @@ public class LogicOperation {
         String vaName = info.getVename();
         LandRoadVe ve = logic.veService.selectByFrameNo(vaName);
         if(ve ==null) return result;
-        if ("E".equals(ietype)) {
-            ietype = "出场站";
-            lists = logic.listService.selectByFrameNoAndType(info.getVename(), ietype);
-            for (LandBusinessTypeList list : lists) {
-                //查询是否做了出场申请
-                if (list.getContrastflag() == null || list.getContrastflag() == "" || list.getContrastflag().length() <= 0) {
-                    //判断载货重量是否符合所设定的范围
-                    double goodsWt = 0.0;
-                    if (list.getMasterList().length() > 0) {
-                        goodsWt = GoodsWt(list.getMasterList(), "I");
-                    }
-                    double selfWt = Double.parseDouble(ve.getSelfWt());
-                    if (sendBw(info, growssWt, selfWt, goodsWt)) {
-                        list.setContrastflag("已出站");
-                        logic.listService.updateById(list);
-                        if ("货物流转".equals(list.getBusinesstype()) | "分拨分流".equals(list.getBusinesstype())) {
-                            if (list.getMasterList().length() > 0) {
-                                createTypeList(list);
-                            }
-                        }
-                        result = true;
-                    }
-                } else {
-                    CommandClient.Client(info, ENTERSTATION);
-                }
-            }
-        } else {
-            ietype = "进场站";
-            lists = logic.listService.selectByFrameNoAndType(info.getVename(), ietype);
-            for (LandBusinessTypeList list : lists) {
-                //查询是否做了出场申请
-                if (list.getContrastflag() == null || list.getContrastflag() == "" || list.getContrastflag().length
-                        () <= 0) {
-                    //判断载货重量是否符合所设定的范围
-                    double goodsWt = 0.0;
-                    if(list.getMasterList().length() > 0){
-                        goodsWt = GoodsWt(list.getMasterList(), "E");
-                    }
-                    double selfWt = Double.parseDouble(ve.getSelfWt());
-                    if (sendBw(info, growssWt, selfWt, goodsWt)) {
-                        list.setContrastflag("已进站");
-                        logic.listService.updateById(list);
-                        result = true;
-                    }
-                } else {
-                    CommandClient.Client(info, INPUTSTATION);
-                }
+        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("已出站");
             }
+            logic.listService.updateById(list);
+            result = true;
         }
         return result;
     }
@@ -219,36 +183,6 @@ public class LogicOperation {
         return bg;
     }
-    /**
-     * 分拨或者流转业务生成新的进站申请
-     */
-    public static void createTypeList(LandBusinessTypeList list) {
-        LandBusinessTypeList typeList = new LandBusinessTypeList();
-        typeList.setId(UUIDCreate.getUUID());
-        typeList.setAgentname(list.getAgentname());
-        typeList.setAgentno(list.getAgentno());
-        typeList.setAisle("1号卡口-进");
-        typeList.setCreateBy(list.getCreateBy());
-        typeList.setUpdateBy(list.getUpdateBy());
-        typeList.setCreateDate(new Date());
-        typeList.setUpdateDate(new Date());
-        typeList.setCocode(list.getCocode());
-        typeList.setDriverid(list.getDriverid());
-        typeList.setDrivername(list.getDrivername());
-        typeList.setStartport(list.getEndport());
-        typeList.setStartsatation(list.getEndstation());
-        typeList.setEndport(list.getStartport());
-        typeList.setEndstation(list.getStartsatation());
-        typeList.setTrailerFrameNo(list.getTrailerFrameNo());
-        typeList.setTrailerLicenseNo(list.getTrailerLicenseNo());
-        typeList.setTurnoverflag("进场站");
-        typeList.setProdectTime(new Date());
-        typeList.setMasterList(list.getMasterList());
-        typeList.setBusinesstype(list.getBusinesstype());
-        String barCode = buildBarCode.CreateBarCode(list.getTrailerFrameNo(),"",list.getMasterList());
-        typeList.setBarCode(barCode);
-        logic.listService.saveList(typeList);
-    }
     /**
      * 校验重量并发送报文
--- a/src/main/java/com/sy/mapper/LandBusinessTypeListMapper.java
查看文件 @552e108
+++ b/src/main/java/com/sy/mapper/LandBusinessTypeListMapper.java
查看文件 @552e108
@@ -2,10 +2,9 @@ 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);
@@ -21,4 +20,8 @@ public interface LandBusinessTypeListMapper {
     //根据车牌号和进出场标志查询
     List<LandBusinessTypeList> selectFrameNoAndType(@Param("trailerFrameNo") String frameNo,
                                                     @Param("turnoverflag") String flag);
+
+    LandBusinessTypeList selectForOne(@Param("trailerFrameNo") String trailerFrameNo, @Param("barcode") String barcode,
+                                      @Param("endstation") String endstation, @Param("aisle") String aisle,
+                                      @Param("turnoverflag") String turnoverflag);
 }
--- a/src/main/java/com/sy/model/LandBusinessTypeList.java
查看文件 @552e108
+++ b/src/main/java/com/sy/model/LandBusinessTypeList.java
查看文件 @552e108
@@ -41,6 +41,8 @@ public class LandBusinessTypeList {
     private String turnoverflag;
+    private String barcode;
+
     private String contrastflag;
     private String createBy;
@@ -51,8 +53,6 @@ public class LandBusinessTypeList {
     private Date updateDate;
-    private String barCode;
-
     public String getId() {
         return id;
     }
@@ -205,6 +205,14 @@ public class LandBusinessTypeList {
         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;
     }
@@ -244,12 +252,4 @@ public class LandBusinessTypeList {
     public void setUpdateDate(Date updateDate) {
         this.updateDate = updateDate;
     }
-
-    public String getBarCode() {
-        return barCode;
-    }
-
-    public void setBarCode(String barCode) {
-        this.barCode = barCode;
-    }
 }
--- a/src/main/java/com/sy/service/LandBusListService.java
查看文件 @552e108
+++ b/src/main/java/com/sy/service/LandBusListService.java
查看文件 @552e108
@@ -12,4 +12,6 @@ public interface LandBusListService {
     int updateById(LandBusinessTypeList list);
     int saveList(LandBusinessTypeList list);
+
+    LandBusinessTypeList selectForOne(String frameNo, String barcode, String station, String aisle, String flag);
 }
--- a/src/main/java/com/sy/service/impl/LandBusListServiceImpl.java
查看文件 @552e108
+++ b/src/main/java/com/sy/service/impl/LandBusListServiceImpl.java
查看文件 @552e108
@@ -42,4 +42,15 @@ public class LandBusListServiceImpl implements LandBusListService {
     public int saveList(LandBusinessTypeList list) {
         return listMapper.insert(list);
     }
+
+    @Override
+    public LandBusinessTypeList selectForOne(String frameNo, String barcode, String station, String aisle, String flag) {
+        LandBusinessTypeList list= null;
+        try{
+            list = listMapper.selectForOne(frameNo,barcode,station,aisle,flag);
+        }catch (Exception e){
+            System.out.println(e.getMessage());
+        }
+        return list;
+    }
 }
--- a/src/main/resources/mapping/LandBusinessTypeListMapper.xml
查看文件 @552e108
+++ b/src/main/resources/mapping/LandBusinessTypeListMapper.xml
查看文件 @552e108
@@ -21,6 +21,7 @@
     <result column="AISLE" jdbcType="VARCHAR" property="aisle" />
     <result column="BUSINESSTYPE" jdbcType="VARCHAR" property="businesstype" />
     <result column="TURNOVERFLAG" jdbcType="VARCHAR" property="turnoverflag" />
+    <result column="BARCODE" jdbcType="VARCHAR" property="barcode" />
     <result column="CONTRASTFLAG" jdbcType="VARCHAR" property="contrastflag" />
     <result column="CREATE_BY" jdbcType="VARCHAR" property="createBy" />
     <result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate" />
@@ -30,8 +31,8 @@
   <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, 
-    STARTSATATION, ENDSTATION, AISLE, BUSINESSTYPE, TURNOVERFLAG, CONTRASTFLAG, CREATE_BY, 
-    CREATE_DATE, UPDATE_BY, UPDATE_DATE
+    STARTSATATION, ENDSTATION, AISLE, BUSINESSTYPE, TURNOVERFLAG, BARCODE, CONTRASTFLAG, 
+    CREATE_BY, CREATE_DATE, UPDATE_BY, UPDATE_DATE
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
     select 
@@ -39,7 +40,6 @@
     from land_businesstype_list
     where id = #{id,jdbcType=VARCHAR}
   </select>
-
   <select id="selectFrameNoAndType" parameterType="java.lang.String" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />
@@ -47,6 +47,17 @@
     where TRAILER_FRAME_NO = #{trailerFrameNo,jdbcType=VARCHAR}
     and TURNOVERFLAG = #{turnoverflag,jdbcType=VARCHAR}
   </select>
+
+  <select id="selectForOne" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from land_businesstype_list
+    where TRAILER_FRAME_NO = #{trailerFrameNo,jdbcType=VARCHAR}
+    and BARCODE = #{barcode,jdbcType=VARCHAR}
+    and ENDSTATION = #{endstation,jdbcType=VARCHAR}
+    and AISLE = #{aisle,jdbcType=VARCHAR}
+    and TURNOVERFLAG = #{turnoverflag,jdbcType=VARCHAR}
+  </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
     delete from land_businesstype_list
     where id = #{id,jdbcType=VARCHAR}
@@ -58,18 +69,18 @@
       COCODE, DRIVERNAME, DRIVERID, 
       STARTPORT, ENDPORT, STARTSATATION, 
       ENDSTATION, AISLE, BUSINESSTYPE, 
-      TURNOVERFLAG, CONTRASTFLAG, CREATE_BY, 
-      CREATE_DATE, UPDATE_BY, UPDATE_DATE
-      )
+      TURNOVERFLAG, BARCODE, CONTRASTFLAG, 
+      CREATE_BY, CREATE_DATE, UPDATE_BY, 
+      UPDATE_DATE)
     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}, 
       #{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}, #{contrastflag,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, 
-      #{createDate,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateDate,jdbcType=TIMESTAMP}
-      )
+      #{turnoverflag,jdbcType=VARCHAR}, #{barcode,jdbcType=VARCHAR}, #{contrastflag,jdbcType=VARCHAR}, 
+      #{createBy,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, 
+      #{updateDate,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.sy.model.LandBusinessTypeList">
     insert into land_businesstype_list
@@ -131,6 +142,9 @@
       <if test="turnoverflag != null">
         TURNOVERFLAG,
       </if>
+      <if test="barcode != null">
+        BARCODE,
+      </if>
       <if test="contrastflag != null">
         CONTRASTFLAG,
       </if>
@@ -205,6 +219,9 @@
       <if test="turnoverflag != null">
         #{turnoverflag,jdbcType=VARCHAR},
       </if>
+      <if test="barcode != null">
+        #{barcode,jdbcType=VARCHAR},
+      </if>
       <if test="contrastflag != null">
         #{contrastflag,jdbcType=VARCHAR},
       </if>
@@ -279,6 +296,9 @@
       <if test="turnoverflag != null">
         TURNOVERFLAG = #{turnoverflag,jdbcType=VARCHAR},
       </if>
+      <if test="barcode != null">
+        BARCODE = #{barcode,jdbcType=VARCHAR},
+      </if>
       <if test="contrastflag != null">
         CONTRASTFLAG = #{contrastflag,jdbcType=VARCHAR},
       </if>
@@ -317,6 +337,7 @@
       AISLE = #{aisle,jdbcType=VARCHAR},
       BUSINESSTYPE = #{businesstype,jdbcType=VARCHAR},
       TURNOVERFLAG = #{turnoverflag,jdbcType=VARCHAR},
+      BARCODE = #{barcode,jdbcType=VARCHAR},
       CONTRASTFLAG = #{contrastflag,jdbcType=VARCHAR},
       CREATE_BY = #{createBy,jdbcType=VARCHAR},
       CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},