新舱单辅助管理-统一认证实体优化

@@ -37,12 +37,12 @@ spring:
   #eureka主机名，会在控制页面中显示
   #DEV环境关闭注册。
     features:
-      enabled: true
+      enabled: false
     discovery:
-      enabled: true
+      enabled: false
     service-registry:
       auto-registration:
-        enabled: true
+        enabled: false
 
   datasource:
         type: com.alibaba.druid.pool.DruidDataSource

@@ -79,6 +79,11 @@
             <artifactId>pagehelper-spring-boot-starter</artifactId>
             <version>1.2.5</version>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.51</version>
+        </dependency>
         <!--&lt;!&ndash; mysql&ndash;&gt;-->
         <!--<dependency>-->
             <!--<groupId>mysql</groupId>-->

@@ -4,13 +4,13 @@ package com.tianbo.analysis.controller;
 import com.tianbo.analysis.model.FFMInfo;
 import com.tianbo.analysis.model.ResultJson;
 import com.tianbo.analysis.service.FFMResolve;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Map;
-
 @RestController
 @RequestMapping("/ffm")
+@Slf4j
 public class FFMController {
 
     @Autowired

+package com.tianbo.analysis.controller;
+
+
+import com.tianbo.analysis.dao.ORIGINMANIFESTMASTERMapper;
+import com.tianbo.analysis.model.ResultJson;
+import com.tianbo.analysis.model.SENDLOG;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 新舱单统计分析接口
+ * 航班日期/航班号
+ * 航班数量
+ * 主单单数
+ * 分单单数
+ * 舱单总件数/重量
+ * 理货总件数/重量
+ * 进出港分开
+ * 理货/与原始航班日期不对称
+ * 原始对应理货完毕配色
+ * 运单放行统计及配色
+ */
+
+/**
+ * 转运统计
+ */
+
+/**
+ * 关区统计
+ */
+
+@RestController
+@RequestMapping("/static")
+public class StatisticsController {
+
+    @Resource
+    ORIGINMANIFESTMASTERMapper originmanifestmasterMapper;
+
+    @RequestMapping("/import")
+    public ResultJson getById(@RequestParam(value = "startDate",required = true) String startDate,
+                              @RequestParam(value = "endDate",required = true) String endDate){
+
+        return new ResultJson<>("200","success",originmanifestmasterMapper.statics(startDate,endDate));
+    }
+}

 package com.tianbo.analysis.dao;
 
 import com.tianbo.analysis.model.ORIGINMANIFESTMASTER;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public interface ORIGINMANIFESTMASTERMapper {
     int insert(ORIGINMANIFESTMASTER record);
@@ -12,4 +15,6 @@ public interface ORIGINMANIFESTMASTERMapper {
     int changeFlightDate(HashMap map);
 
     ORIGINMANIFESTMASTER selectByAHBA(ORIGINMANIFESTMASTER record);
-}
\ No newline at end of file
+
+    List<Map> statics(@Param("startDate") String var1, @Param("endDate")String var2);
+}

@@ -72,6 +72,7 @@ public class FFMInfo implements Serializable {
 
     //报文内容
     public String text;
+    public Object tests;
     public List<String> lineList;
     public String order;
     public String planeNo;

@@ -8,61 +8,61 @@ import lombok.Data;
 @Data
 public class UserData {
 
-    private String USER_ID;
+    public String USER_ID;
 
-    private String USER_NAME;
+    public String USER_NAME;
 
-    private String USER_NO;
+    public String USER_NO;
 
-    private String MOBILE;
+    public String MOBILE;
 
-    private String IDCARD_NO;
+    public String IDCARD_NO;
 
-    private String COUNTRY;
+    public String COUNTRY;
 
-    private String SEX;
+    public String SEX;
 
-    private String NATIONALITY;
+    public String NATIONALITY;
 
-    private String OFFICE_PHONE;
+    public String OFFICE_PHONE;
 
-    private String OFFICE_ADDRESS;
+    public String OFFICE_ADDRESS;
 
-    private String EMAIL;
+    public String EMAIL;
 
-    private String JOB_LEVEL;
+    public String JOB_LEVEL;
 
-    private String JOB_TITLE;
+    public String JOB_TITLE;
 
-    private String JOB_TYPE;
+    public String JOB_TYPE;
 
-    private String JOB_STATUS;
+    public String JOB_STATUS;
 
-    private String JOB_POSITION;
+    public String JOB_POSITION;
 
-    private String SECRET_LEVEL;
+    public String SECRET_LEVEL;
 
-    private String USER_POST;
+    public String USER_POST;
 
-    private String USER_JOB_ID;
+    public String USER_JOB_ID;
 
-    private String ORG_ID;
+    public String ORG_ID;
 
-    private String USER_TITLE;
+    public String USER_TITLE;
 
-    private String LOGIN_NAME;
+    public String LOGIN_NAME;
 
-    private String SHOW_ORDER;
+    public String SHOW_ORDER;
 
-    private String REMARK;
+    public String REMARK;
 
-    private String NAIL_ID;
+    public String NAIL_ID;
 
-    private String PK_PSNDOC;
+    public String PK_PSNDOC;
 
-    private String PWD;
+    public String PWD;
 
-    private String PWD_ENCRYPT;
+    public String PWD_ENCRYPT;
 
-    private String UPDATE_TIME;
+    public String UPDATE_TIME;
 }

@@ -51,37 +51,37 @@
     AUTOID, WAYBILLNOMASTER, FLIGHTNO, FLIGHT_DATE
   </sql>
   <insert id="insert" parameterType="com.tianbo.analysis.model.ORIGINMANIFESTMASTER" >
-    insert into ORIGINMANIFESTMASTER (AUTOID, WAYBILLNOMASTER, SEGMENT, 
-      ORIGINATINGSTATION, DESTINATIONSTATION, 
-      TOTALWEIGHT, TOTALPIECE, MANIFESTTOTALPIECE, 
-      MANIFESTTOTALWEIGHT, FLIGHTNO, PRODUCTNAME, 
-      CUSTOMSSTATUS, CARRIER1, ARRIVALSTATION1, 
-      CARRIER2, ARRIVALSTATION2, CARRIER3, 
-      ARRIVALSTATION3, PAYMODE, SPECIALGOODSCODE, 
-      CUSTOMSCODE, SHIPPERNAME, SHIPPERADDRESS, 
-      CONSIGNEENAME, CONSIGNEEADDRESS, RECEIPTINFORMATION, 
-      CREATEDATE, FLIGHT_DATE, STATUS, 
-      ISBATCH, ORIGINATINGSTATION_BILL, DESTINATIONSTATION_BILL, 
-      REPORTORDER, ISLAST, SHIPPER_CODE, 
-      SHIPPER_COUNTRYCODE, SHIPPER_PHONE, SHIPPER_FAX, 
-      CONSIGNEE_CODE, CONSIGNEE_COUNTRYCODE, CONSIGNEE_FAX, 
-      SPECIFIC_CONSIGNEENAME, SPECIFIC_CONSIGNEE_PHONE, 
+    insert into ORIGINMANIFESTMASTER (AUTOID, WAYBILLNOMASTER, SEGMENT,
+      ORIGINATINGSTATION, DESTINATIONSTATION,
+      TOTALWEIGHT, TOTALPIECE, MANIFESTTOTALPIECE,
+      MANIFESTTOTALWEIGHT, FLIGHTNO, PRODUCTNAME,
+      CUSTOMSSTATUS, CARRIER1, ARRIVALSTATION1,
+      CARRIER2, ARRIVALSTATION2, CARRIER3,
+      ARRIVALSTATION3, PAYMODE, SPECIALGOODSCODE,
+      CUSTOMSCODE, SHIPPERNAME, SHIPPERADDRESS,
+      CONSIGNEENAME, CONSIGNEEADDRESS, RECEIPTINFORMATION,
+      CREATEDATE, FLIGHT_DATE, STATUS,
+      ISBATCH, ORIGINATINGSTATION_BILL, DESTINATIONSTATION_BILL,
+      REPORTORDER, ISLAST, SHIPPER_CODE,
+      SHIPPER_COUNTRYCODE, SHIPPER_PHONE, SHIPPER_FAX,
+      CONSIGNEE_CODE, CONSIGNEE_COUNTRYCODE, CONSIGNEE_FAX,
+      SPECIFIC_CONSIGNEENAME, SPECIFIC_CONSIGNEE_PHONE,
       CONSIGNEE_PHONE)
-    values (#{autoid,jdbcType=VARCHAR}, #{waybillnomaster,jdbcType=VARCHAR}, #{segment,jdbcType=VARCHAR}, 
-      #{originatingstation,jdbcType=VARCHAR}, #{destinationstation,jdbcType=VARCHAR}, 
-      #{totalweight,jdbcType=VARCHAR}, #{totalpiece,jdbcType=VARCHAR}, #{manifesttotalpiece,jdbcType=VARCHAR}, 
-      #{manifesttotalweight,jdbcType=VARCHAR}, #{flightno,jdbcType=VARCHAR}, #{productname,jdbcType=VARCHAR}, 
-      #{customsstatus,jdbcType=VARCHAR}, #{carrier1,jdbcType=VARCHAR}, #{arrivalstation1,jdbcType=VARCHAR}, 
-      #{carrier2,jdbcType=VARCHAR}, #{arrivalstation2,jdbcType=VARCHAR}, #{carrier3,jdbcType=VARCHAR}, 
-      #{arrivalstation3,jdbcType=VARCHAR}, #{paymode,jdbcType=VARCHAR}, #{specialgoodscode,jdbcType=VARCHAR}, 
-      #{customscode,jdbcType=VARCHAR}, #{shippername,jdbcType=VARCHAR}, #{shipperaddress,jdbcType=VARCHAR}, 
-      #{consigneename,jdbcType=VARCHAR}, #{consigneeaddress,jdbcType=VARCHAR}, #{receiptinformation,jdbcType=VARCHAR}, 
-      #{createdate,jdbcType=TIMESTAMP}, #{flightDate,jdbcType=TIMESTAMP}, #{status,jdbcType=VARCHAR}, 
-      #{isbatch,jdbcType=VARCHAR}, #{originatingstationBill,jdbcType=VARCHAR}, #{destinationstationBill,jdbcType=VARCHAR}, 
-      #{reportorder,jdbcType=VARCHAR}, #{islast,jdbcType=VARCHAR}, #{shipperCode,jdbcType=VARCHAR}, 
-      #{shipperCountrycode,jdbcType=VARCHAR}, #{shipperPhone,jdbcType=VARCHAR}, #{shipperFax,jdbcType=VARCHAR}, 
-      #{consigneeCode,jdbcType=VARCHAR}, #{consigneeCountrycode,jdbcType=VARCHAR}, #{consigneeFax,jdbcType=VARCHAR}, 
-      #{specificConsigneename,jdbcType=VARCHAR}, #{specificConsigneePhone,jdbcType=VARCHAR}, 
+    values (#{autoid,jdbcType=VARCHAR}, #{waybillnomaster,jdbcType=VARCHAR}, #{segment,jdbcType=VARCHAR},
+      #{originatingstation,jdbcType=VARCHAR}, #{destinationstation,jdbcType=VARCHAR},
+      #{totalweight,jdbcType=VARCHAR}, #{totalpiece,jdbcType=VARCHAR}, #{manifesttotalpiece,jdbcType=VARCHAR},
+      #{manifesttotalweight,jdbcType=VARCHAR}, #{flightno,jdbcType=VARCHAR}, #{productname,jdbcType=VARCHAR},
+      #{customsstatus,jdbcType=VARCHAR}, #{carrier1,jdbcType=VARCHAR}, #{arrivalstation1,jdbcType=VARCHAR},
+      #{carrier2,jdbcType=VARCHAR}, #{arrivalstation2,jdbcType=VARCHAR}, #{carrier3,jdbcType=VARCHAR},
+      #{arrivalstation3,jdbcType=VARCHAR}, #{paymode,jdbcType=VARCHAR}, #{specialgoodscode,jdbcType=VARCHAR},
+      #{customscode,jdbcType=VARCHAR}, #{shippername,jdbcType=VARCHAR}, #{shipperaddress,jdbcType=VARCHAR},
+      #{consigneename,jdbcType=VARCHAR}, #{consigneeaddress,jdbcType=VARCHAR}, #{receiptinformation,jdbcType=VARCHAR},
+      #{createdate,jdbcType=TIMESTAMP}, #{flightDate,jdbcType=TIMESTAMP}, #{status,jdbcType=VARCHAR},
+      #{isbatch,jdbcType=VARCHAR}, #{originatingstationBill,jdbcType=VARCHAR}, #{destinationstationBill,jdbcType=VARCHAR},
+      #{reportorder,jdbcType=VARCHAR}, #{islast,jdbcType=VARCHAR}, #{shipperCode,jdbcType=VARCHAR},
+      #{shipperCountrycode,jdbcType=VARCHAR}, #{shipperPhone,jdbcType=VARCHAR}, #{shipperFax,jdbcType=VARCHAR},
+      #{consigneeCode,jdbcType=VARCHAR}, #{consigneeCountrycode,jdbcType=VARCHAR}, #{consigneeFax,jdbcType=VARCHAR},
+      #{specificConsigneename,jdbcType=VARCHAR}, #{specificConsigneePhone,jdbcType=VARCHAR},
       #{consigneePhone,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.tianbo.analysis.model.ORIGINMANIFESTMASTER" >
@@ -375,4 +375,36 @@
     AND
         WAYBILLNOMASTER = #{waybillnomaster,jdbcType=VARCHAR}
   </select>
-</mapper>
\ No newline at end of file
+
+  <select id="statics" resultType="map">
+    SELECT
+	FLIGHTNO,
+	ORIGINATINGSTATION,
+	DESTINATIONSTATION,
+	count( WAYBILLNOMASTER ) AS waybillTotal,
+	SUM( MANIFESTTOTALPIECE ) AS piece,
+	SUM( MANIFESTTOTALWEIGHT ) AS weight,
+	(SELECT
+	count(AUTOID)
+FROM
+	ORIGINMANIFESTSECONDARY
+WHERE
+	ORIGINMANIFESTMASTERAUTOID IN (
+	SELECT
+		AUTOID
+	FROM
+		ORIGINMANIFESTMASTER
+	WHERE
+		FLIGHT_DATE between TO_DATE( #{startDate,jdbcType=VARCHAR}, 'yyyy-MM-dd' ) and TO_DATE( #{endDate,jdbcType=VARCHAR}, 'yyyy-MM-dd' )
+	)) as awbhTotal
+FROM
+	ORIGINMANIFESTMASTER
+WHERE
+	DESTINATIONSTATION = 'CGO'
+	AND FLIGHT_DATE  between TO_DATE( #{startDate,jdbcType=VARCHAR}, 'yyyy-MM-dd' ) and TO_DATE( #{endDate,jdbcType=VARCHAR}, 'yyyy-MM-dd' )
+GROUP BY
+	FLIGHTNO,
+	ORIGINATINGSTATION,
+	DESTINATIONSTATION
+  </select>
+</mapper>