查询油量分析数据（未完成）

resources/mapper/modules/airport/OilAnalysisDao.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ejweb.modules.airport.dao.OilAnalysisDao">
+   <select id="getOilAnalysisData" resultType="com.ejweb.modules.airport.entity.OilAnalysisEntity">
+     select sta.std,
+            sta.flight_no,
+            sta.ac_no,
+            sta.dispatcher_name,
+            sta.total_oil,
+            sta.extra_oil_fuel_reason,
+            airArr.airport_name as arrAirPortName,
+            airdep.airport_name as depAirPortName,
+            acType.flight_no as acTypeName
+
+     from foc_flight_dynamics_sta sta
+     left join foc_airports airArr on airArr.airport_iata = #{arrIata}
+     left join foc_airports airdep on airArr.airport_iata = #{depIata}
+     left join foc_ac_type acType on acType.flight_no = #{flightNo}
+     where 1=1
+       <if test="#{std} !=null and #{std} !=''">
+           and sta.std = #{std}
+       </if>
+
+       <if test="#{flightNo} !=null and #{flightNo} !=''">
+           and sta.flight_no = #{flightNo}
+       </if>
+
+       <if test="#{dispatcher} !=null and #{dispatcher} !=''">
+           and sta.dispatcher_name = #{dispatcher}
+       </if>
+
+       <if test="#{dispatcher} !=null and sta.flight_no!=''">
+           and sta.flight_no = #{dispatcher}
+       </if>
+
+       <if test="#{mintotalOil} !=null and #{mintotalOil}!=''">
+           and sta.total_oil >= #{mintotalOil}
+       </if>
+
+       <if test="#{maxtotalOil} !=null and #{maxtotalOil}!=''">
+           and sta.total_oil <![CDATA[ >= ]]> #{maxtotalOil}
+       </if>
+
+
+   </select>
+
+</mapper>
\ No newline at end of file

src/com/ejweb/modules/airport/api/AirportController.java

@@ -26,7 +26,7 @@ import java.util.Map;
 
 /**
  * 三字码列表接口
- * 
+ *
  * @team IT Team
  * @author renmb
  * @version 1.0

src/com/ejweb/modules/airport/api/OilAnalysisController.java

@@ -12,6 +12,7 @@ import com.ejweb.modules.airport.service.OilAnalysisService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
 
@@ -22,15 +23,24 @@ public class OilAnalysisController {
     @Autowired
     private OilAnalysisService oilAnalysisService;
 
+    @ResponseBody
+    @RequestMapping(value = "/oilAnalysis")
     public ResponseBean getOilAnalysisData(RequestBean requestBean)
     {
+        //todo:  2、返回数据判空  3、机型链表查询  4、剩余油量数据分析 5、生成表格导出
         ResponseBean responseBean = new ResponseBean();
         OilAnalysisBean bean = requestBean.getObjectBean(OilAnalysisBean.class);
-        OilAnalysisEntity oilAnalysisEntity = oilAnalysisService.getAnalysisData(bean);
-        responseBean.setData(oilAnalysisEntity);
-        responseBean.setMessage(GConstants.OK);
-        responseBean.setStatus(ErrorCode.STATUS_CODE_2000);
 
+        List <OilAnalysisEntity> oilAnalysisEntity = oilAnalysisService.getAnalysisData(bean);
+        if (oilAnalysisEntity == null)
+        {
+            responseBean.setMessage("接口调用失败");
+            responseBean.setStatus(ErrorCode.STATUS_CODE_4001);
+        }else {
+            responseBean.setData(oilAnalysisEntity);
+            responseBean.setMessage(GConstants.OK);
+            responseBean.setStatus(ErrorCode.STATUS_CODE_2000);
+        }
         return responseBean;
     }
 

src/com/ejweb/modules/airport/bean/OilAnalysisBean.java

@@ -11,26 +11,65 @@ import com.ejweb.core.base.GenericBean;
  * @time 2020年12月10日
  */
 public class OilAnalysisBean extends GenericBean {
-    //起飞时间
-    private String depTime;
+
+    //最低起飞时间
+    private String minDepTime;
+    //最大起飞时间
+    private String maxDepTime;
     //航班号
     private String flightNo;
     //起飞机场三字码
     private String depIata;
     //目的机场三字码
     private String arrIata;
-    //签派员
-    private String Dispatcher;
-    //总油量
-    private String TotalOil;
+    //签派员d
+    private String dispatcher;
+    //最低总油量
+    private Integer mintotalOil;
+    //最高总油量
+    private Integer maxtotalOil;
+
+
+    public String getMinDepTime() {
+        return minDepTime;
+    }
+
+    public void setMinDepTime(String minDepTime) {
+        this.minDepTime = minDepTime;
+    }
+
+    public String getMaxDepTime() {
+        return maxDepTime;
+    }
 
+    public void setMaxDepTime(String maxDepTime) {
+        this.maxDepTime = maxDepTime;
+    }
+
+
+
+    public Integer getMintotalOil() {
+        return mintotalOil;
+    }
+
+    public void setMintotalOil(Integer mintotalOil) {
+        this.mintotalOil = mintotalOil;
+    }
 
-    public String getDepTime() {
-        return depTime;
+    public Integer getMaxtotalOil() {
+        return maxtotalOil;
     }
 
-    public void setDepTime(String depTime) {
-        this.depTime = depTime;
+    public void setMaxtotalOil(Integer maxtotalOil) {
+        this.maxtotalOil = maxtotalOil;
+    }
+
+    public String getDispatcher() {
+        return dispatcher;
+    }
+
+    public void setDispatcher(String dispatcher) {
+        this.dispatcher = dispatcher;
     }
 
     public String getFlightNo() {
@@ -58,19 +97,5 @@ public class OilAnalysisBean extends GenericBean {
         this.arrIata = arrIata;
     }
 
-    public String getDispatcher() {
-        return Dispatcher;
-    }
-
-    public void setDispatcher(String dispatcher) {
-        Dispatcher = dispatcher;
-    }
 
-    public String getTotalOil() {
-        return TotalOil;
-    }
-
-    public void setTotalOil(String totalOil) {
-        TotalOil = totalOil;
-    }
 }

src/com/ejweb/modules/airport/dao/OilAnalysisDao.java

@@ -10,5 +10,5 @@ import java.util.List;
 
 public interface OilAnalysisDao extends BaseDao {
     // 查询油量分析数据
-    public OilAnalysisEntity getOilAnalysisData(OilAnalysisBean bean);
+    List<OilAnalysisEntity> getOilAnalysisData(OilAnalysisBean bean);
 }

src/com/ejweb/modules/airport/entity/OilAnalysisEntity.java

@@ -14,111 +14,138 @@ import com.ejweb.core.base.BaseEntity;
 public class OilAnalysisEntity extends BaseEntity {
 
     private String  std;                      // 计划起飞时间
-    private String  flight_no;                // 航班号
-    private String  ac_no;                    // 飞机号
-    private String  dep_iata_id;              // 起飞机场三字码
-    private String  arr_iata_id;              // 落地机场三字码
-    private String  dispatcher_name;          // 签派人
-    private Integer total_oil;                // 总油量
-    private String  extra_oil_fuel_reason;    // 额外油加注原因
-    private String  extra_oil_fuel_takeoff;   // 起飞额外油量
-    private String  extra_oil_fuel_arr;       // 到达额外油量
-    private String  extra_oil_fuel_flight;    // 航路额外油量
-    private String  extra_oil_fuel_other;     // 起飞额外油量
+    private String  flightNo;                 // 航班号
+    private String  acNo;                     // 飞机号
+    private String  depIataId;                // 起飞机场三字码
+    private String  arrIataId;                // 落地机场三字码
+    private String  dispatcherName;           // 签派人
+    private Integer totalOil;                 // 总油量
+    private String  extraOilFuelReason;       // 额外油加注原因
+    private String  extraOilFuelTakeoff;      // 起飞额外油量
+    private String  extraOilFuelArrrr;        // 到达额外油量
+    private String  extraOilFuelFlight;       // 航路额外油量
+    private String  extraOilFuelOther;        // 起飞额外油量
+    private String  depAirPortName;           // 起飞机场中文名称
+    private String  arrAirPortName;           // 落地机场中文名称
+    private String  acTypeName;               // 机型
 
+    public String getAcTypeName() {
+        return acTypeName;
+    }
+
+    public void setAcTypeName(String acTypeName) {
+        this.acTypeName = acTypeName;
+    }
 
     public String getStd() {
         return std;
     }
+
     public void setStd(String std) {
         this.std = std;
     }
 
-    public String getFlight_no() {
-        return flight_no;
+    public String getFlightNo() {
+        return flightNo;
+    }
+
+    public void setFlightNo(String flightNo) {
+        this.flightNo = flightNo;
+    }
+
+    public String getAcNo() {
+        return acNo;
+    }
+
+    public void setAcNo(String acNo) {
+        this.acNo = acNo;
+    }
+
+    public String getDepIataId() {
+        return depIataId;
     }
 
-    public void setFlight_no(String flight_no) {
-        this.flight_no = flight_no;
+    public void setDepIataId(String depIataId) {
+        this.depIataId = depIataId;
     }
 
-    public String getAc_no() {
-        return ac_no;
+    public String getArrIataId() {
+        return arrIataId;
     }
 
-    public void setAc_no(String ac_no) {
-        this.ac_no = ac_no;
+    public void setArrIataId(String arrIataId) {
+        this.arrIataId = arrIataId;
     }
 
-    public String getDep_iata_id() {
-        return dep_iata_id;
+    public String getDispatcherName() {
+        return dispatcherName;
     }
 
-    public void setDep_iata_id(String dep_iata_id) {
-        this.dep_iata_id = dep_iata_id;
+    public void setDispatcherName(String dispatcherName) {
+        this.dispatcherName = dispatcherName;
     }
 
-    public String getArr_iata_id() {
-        return arr_iata_id;
+    public Integer getTotalOil() {
+        return totalOil;
     }
 
-    public void setArr_iata_id(String arr_iata_id) {
-        this.arr_iata_id = arr_iata_id;
+    public void setTotalOil(Integer totalOil) {
+        this.totalOil = totalOil;
     }
 
-    public String getDispatcher_name() {
-        return dispatcher_name;
+    public String getExtraOilFuelReason() {
+        return extraOilFuelReason;
     }
 
-    public void setDispatcher_name(String dispatcher_name) {
-        this.dispatcher_name = dispatcher_name;
+    public void setExtraOilFuelReason(String extraOilFuelReason) {
+        this.extraOilFuelReason = extraOilFuelReason;
     }
 
-    public Integer getTotal_oil() {
-        return total_oil;
+    public String getExtraOilFuelTakeoff() {
+        return extraOilFuelTakeoff;
     }
 
-    public void setTotal_oil(Integer total_oil) {
-        this.total_oil = total_oil;
+    public void setExtraOilFuelTakeoff(String extraOilFuelTakeoff) {
+        this.extraOilFuelTakeoff = extraOilFuelTakeoff;
     }
 
-    public String getExtra_oil_fuel_reason() {
-        return extra_oil_fuel_reason;
+    public String getExtraOilFuelArrrr() {
+        return extraOilFuelArrrr;
     }
 
-    public void setExtra_oil_fuel_reason(String extra_oil_fuel_reason) {
-        this.extra_oil_fuel_reason = extra_oil_fuel_reason;
+    public void setExtraOilFuelArrrr(String extraOilFuelArrrr) {
+        this.extraOilFuelArrrr = extraOilFuelArrrr;
     }
 
-    public String getExtra_oil_fuel_takeoff() {
-        return extra_oil_fuel_takeoff;
+    public String getExtraOilFuelFlight() {
+        return extraOilFuelFlight;
     }
 
-    public void setExtra_oil_fuel_takeoff(String extra_oil_fuel_takeoff) {
-        this.extra_oil_fuel_takeoff = extra_oil_fuel_takeoff;
+    public void setExtraOilFuelFlight(String extraOilFuelFlight) {
+        this.extraOilFuelFlight = extraOilFuelFlight;
     }
 
-    public String getExtra_oil_fuel_arr() {
-        return extra_oil_fuel_arr;
+    public String getExtraOilFuelOther() {
+        return extraOilFuelOther;
     }
 
-    public void setExtra_oil_fuel_arr(String extra_oil_fuel_arr) {
-        this.extra_oil_fuel_arr = extra_oil_fuel_arr;
+    public void setExtraOilFuelOther(String extraOilFuelOther) {
+        this.extraOilFuelOther = extraOilFuelOther;
     }
 
-    public String getExtra_oil_fuel_flight() {
-        return extra_oil_fuel_flight;
+    public String getDepAirPortName() {
+        return depAirPortName;
     }
 
-    public void setExtra_oil_fuel_flight(String extra_oil_fuel_flight) {
-        this.extra_oil_fuel_flight = extra_oil_fuel_flight;
+    public void setDepAirPortName(String depAirPortName) {
+        this.depAirPortName = depAirPortName;
     }
 
-    public String getExtra_oil_fuel_other() {
-        return extra_oil_fuel_other;
+    public String getArrAirPortName() {
+        return arrAirPortName;
     }
 
-    public void setExtra_oil_fuel_other(String extra_oil_fuel_other) {
-        this.extra_oil_fuel_other = extra_oil_fuel_other;
+    public void setArrAirPortName(String arrAirPortName) {
+        this.arrAirPortName = arrAirPortName;
     }
 }

src/com/ejweb/modules/airport/service/OilAnalysisService.java

@@ -2,19 +2,25 @@ package com.ejweb.modules.airport.service;
 
 import com.ejweb.core.base.BaseService;
 import com.ejweb.modules.airport.bean.OilAnalysisBean;
-import com.ejweb.modules.airport.dao.AirportDao;
 import com.ejweb.modules.airport.dao.OilAnalysisDao;
 import com.ejweb.modules.airport.entity.OilAnalysisEntity;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BeanPropertyBindingResult;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.ObjectError;
+
+import java.util.List;
 
 public class OilAnalysisService extends BaseService<OilAnalysisDao> {
 
     @Autowired
     protected OilAnalysisDao oilAnalysisDao;
 
-    public OilAnalysisEntity getAnalysisData (OilAnalysisBean bean)
+    public List <OilAnalysisEntity> getAnalysisData (OilAnalysisBean bean)
     {
-        OilAnalysisEntity oilAnalysisEntity = oilAnalysisDao.getOilAnalysisData(bean);
+        List <OilAnalysisEntity> oilAnalysisEntity = oilAnalysisDao.getOilAnalysisData(bean);
+        //拆分原因数据
+
         return oilAnalysisEntity;
     }
 }