Skip to content

A
api
Commit 253abd22 by luoh
Options

油量接口，字段添加

parent 52fed1eb
Showing with 104 additions and 60 deletions
src/com/ejweb/modules/airport/entity/OilAnalysisEntity.java
......@@ -44,30 +44,37 @@ public class OilAnalysisEntity {
private String dispatcherName; // 签派人
@ExcelField(title="总油量", type=0, align=1, sort=38 )
private String totalOil; // 总油量
@ExcelField(title="起飞额外油量", type=0, align=1, sort=39 )
private String extraOilFuelTakeoff; // 起飞额外油量
@ExcelField(title="起飞额外油量原因", type=0, align=1, sort=40 )
@ExcelField(title="总油量(KGS)", type=0, align=1, sort=38 )
private Integer totalOilKGS; // 总油量
@ExcelField(title="总油量(LBS)", type=0, align=1, sort=39 )
private Integer totalOilLBS; // 总油量
@ExcelField(title="起飞额外油量", type=0, align=1, sort=40 )
private Integer extraOilFuelTakeoff; // 起飞额外油量
@ExcelField(title="起飞额外油量原因", type=0, align=1, sort=41 )
private String extraOilFuelTakeoffReason; // 起飞额外油量原因
@ExcelField(title="到达额外油量", type=0, align=1, sort=41 )
private String extraOilFuelArr; // 到达额外油量
@ExcelField(title="到达额外油量原因", type=0, align=1, sort=42 )
@ExcelField(title="到达额外油量", type=0, align=1, sort=42 )
private Integer extraOilFuelArr; // 到达额外油量
@ExcelField(title="到达额外油量原因", type=0, align=1, sort=43 )
private String extraOilFuelArrReason; // 到达额外油量原因
@ExcelField(title="航路额外油量", type=0, align=1, sort=43 )
private String extraOilFuelFlight; // 航路额外油量
@ExcelField(title="航路额外油量原因", type=0, align=1, sort=44 )
@ExcelField(title="航路额外油量", type=0, align=1, sort=44 )
private Integer extraOilFuelFlight; // 航路额外油量
@ExcelField(title="航路额外油量原因", type=0, align=1, sort=45)
private String extraOilFuelFlightReason; // 航路额外油量原因
@ExcelField(title="其他额外油量", type=0, align=1, sort=45 )
private String extraOilFuelOther; // 其他额外油量
@ExcelField(title="其他额外油量原因", type=0, align=1, sort=46 )
@ExcelField(title="其他额外油量", type=0, align=1, sort=46 )
private Integer extraOilFuelOther; // 其他额外油量
@ExcelField(title="其他额外油量原因", type=0, align=1, sort=47 )
private String extraOilFuelOtherReason; // 起飞额外油量原因
@ExcelField(title="数据更新时间", type=0, align=1, sort=47 )
@ExcelField(title="数据更新时间", type=0, align=1, sort=48 )
private String updateDate; // 数据更新时间
private String extraOilFuelReason; // 额外油加注原因
private String totalOil; // 总油量
public String getDispatcherAccount() {
......@@ -190,35 +197,35 @@ public class OilAnalysisEntity {
this.extraOilFuelReason = extraOilFuelReason;
}
public String getExtraOilFuelTakeoff() {
public Integer getExtraOilFuelTakeoff() {
return extraOilFuelTakeoff;
}
public void setExtraOilFuelTakeoff(String extraOilFuelTakeoff) {
public void setExtraOilFuelTakeoff(Integer extraOilFuelTakeoff) {
this.extraOilFuelTakeoff = extraOilFuelTakeoff;
}
public String getExtraOilFuelArr() {
public Integer getExtraOilFuelArr() {
return extraOilFuelArr;
}
public void setExtraOilFuelArr(String extraOilFuelArr) {
public void setExtraOilFuelArr(Integer extraOilFuelArr) {
this.extraOilFuelArr = extraOilFuelArr;
}
public String getExtraOilFuelFlight() {
public Integer getExtraOilFuelFlight() {
return extraOilFuelFlight;
}
public void setExtraOilFuelFlight(String extraOilFuelFlight) {
public void setExtraOilFuelFlight(Integer extraOilFuelFlight) {
this.extraOilFuelFlight = extraOilFuelFlight;
}
public String getExtraOilFuelOther() {
public Integer getExtraOilFuelOther() {
return extraOilFuelOther;
}
public void setExtraOilFuelOther(String extraOilFuelOther) {
public void setExtraOilFuelOther(Integer extraOilFuelOther) {
this.extraOilFuelOther = extraOilFuelOther;
}
......@@ -246,4 +253,21 @@ public class OilAnalysisEntity {
public void setUpdateDate(String updateDate) {
this.updateDate = updateDate;
}
public Integer getTotalOilKGS() {
return totalOilKGS;
}
public void setTotalOilKGS(Integer totalOilKGS) {
this.totalOilKGS = totalOilKGS;
}
public Integer getTotalOilLBS() {
return totalOilLBS;
}
public void setTotalOilLBS(Integer totalOilLBS) {
this.totalOilLBS = totalOilLBS;
}
}
src/com/ejweb/modules/airport/service/OilAnalysisService.java
......@@ -11,7 +11,10 @@ import org.springframework.util.StringUtils;
import com.ejweb.core.base.PageEntity;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;import java.util.Collections;
import com.github.pagehelper.PageInfo;
import sun.security.util.ArrayUtil;
import java.util.Collections;
import java.util.List;
@Service
......@@ -20,20 +23,17 @@ public class OilAnalysisService extends BaseService<OilAnalysisDao> {
@Autowired
protected OilAnalysisDao oilAnalysisDao;
public PageEntity <OilAnalysisEntity> getAnalysisData (OilAnalysisBean bean ,Boolean isPage) {
public PageEntity<OilAnalysisEntity> getAnalysisData(OilAnalysisBean bean, Boolean isPage) {
if (isPage == true)
{
if (isPage == true) {
PageHelper.startPage(bean.getPageNo(), bean.getPageSize());
}
//派遣员条件为账号和名字
if ( ! StringUtils.isEmpty(bean.getDispatcher()) )
{
if (bean.getDispatcher().matches("[\u4E00-\u9FA5]+"))
{
if (!StringUtils.isEmpty(bean.getDispatcher())) {
if (bean.getDispatcher().matches("[\u4E00-\u9FA5]+")) {
//内容是中文
bean.setDispatcherZH(bean.getDispatcher());
}else {
} else {
//内容包含非中文
bean.setDispatcherENG(bean.getDispatcher());
}
......@@ -41,67 +41,87 @@ public class OilAnalysisService extends BaseService<OilAnalysisDao> {
PageInfo<OilAnalysisEntity> pageInfo = null;
List <OilAnalysisEntity> oilAnalysisEntityList = oilAnalysisDao.getOilAnalysisData(bean);
List<OilAnalysisEntity> oilAnalysisEntityList = oilAnalysisDao.getOilAnalysisData(bean);
for (OilAnalysisEntity oilAnalysisEntity : oilAnalysisEntityList)
{
for (OilAnalysisEntity oilAnalysisEntity : oilAnalysisEntityList) {
int index = oilAnalysisEntityList.indexOf(oilAnalysisEntity);
oilAnalysisEntity.setNo(index+1);
String oilFuelReason = oilAnalysisEntity.getExtraOilFuelReason();
if (!StringUtils.isEmpty(oilFuelReason))
oilAnalysisEntity.setNo(index + 1);
String totalOil = oilAnalysisEntity.getTotalOil();
String[] oilArr = totalOil.split("/");
if (oilArr != null && oilArr.length == 2) {
String strKGS = oilArr[0];
String strLBS = oilArr[1];
if (strKGS.length() == 0)
{
String[] arr = oilFuelReason.split("\\|");
for (int i = 0;i < arr.length;i++)
strKGS = "0";
}
if (strLBS.length() == 0)
{
String arrTemp = arr[i];
strKGS = "0";
}
oilAnalysisEntity.setTotalOilKGS(Integer.valueOf(strKGS.replaceAll("KGS","")));
oilAnalysisEntity.setTotalOilLBS(Integer.valueOf(strLBS.replaceAll("LBS","")));
}
String oilFuelReason = oilAnalysisEntity.getExtraOilFuelReason();
if (!StringUtils.isEmpty(oilFuelReason)) {
String[] arr = oilFuelReason.split("\\|");
for (int i = 0; i < arr.length; i++) {
String arrTemp = arr[i];
String oilNum = "";
String oilReason = "";
String[] reasonArr = arrTemp.split(":");
if (arrTemp.indexOf(":") > 1)
{
if (reasonArr.length == 1)
{
if (arrTemp.indexOf(":") > 1) {
if (reasonArr.length == 1) {
//只有前面
oilNum = reasonArr[0];
oilReason = "";
}else if (reasonArr.length == 2){
} else if (reasonArr.length == 2) {
//前后都有
oilNum = reasonArr[0];
oilReason = reasonArr[1];
}
}else {
if (reasonArr.length == 1)
{
} else {
if (reasonArr.length == 1) {
//只有后面
oilNum = "";
oilReason = reasonArr[1];
}
}
switch (i){
case 0 :
if (oilNum.length() == 0)
{
oilNum = "0";
}
switch (i) {
case 0:
//起飞油量及原因
oilAnalysisEntity.setExtraOilFuelTakeoff(oilNum);
oilAnalysisEntity.setExtraOilFuelTakeoff(Integer.valueOf(oilNum));
oilAnalysisEntity.setExtraOilFuelTakeoffReason(oilReason);
break;
case 1 :
case 1:
//到达额外油量及原因
oilAnalysisEntity.setExtraOilFuelArr(oilNum);
oilAnalysisEntity.setExtraOilFuelArr(Integer.valueOf(oilNum));
oilAnalysisEntity.setExtraOilFuelArrReason(oilReason);
break;
case 2 :
case 2:
//航路额外油量及原因
oilAnalysisEntity.setExtraOilFuelFlight(oilNum);
oilAnalysisEntity.setExtraOilFuelFlight(Integer.valueOf(oilNum));
oilAnalysisEntity.setExtraOilFuelFlightReason(oilReason);
break;
case 3 :
case 3:
//其他额外油量及原因
oilAnalysisEntity.setExtraOilFuelOther(oilNum);
oilAnalysisEntity.setExtraOilFuelOther(Integer.valueOf(oilNum));
oilAnalysisEntity.setExtraOilFuelOtherReason(oilReason);
break;
default :
default:
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment