Skip to content

A
api
Commit 357bdcec by 罗胜
Options

2024-5-30 

修改及额外油结论
parent be65cb50
Showing with 583 additions and 53 deletions
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">
<insert id="addExtraOilReasonRule">
insert into foc_extra_oil_rule (reason,upper_limit,lower_limit,type,create_by,create_time,update_by,update_time,has_delete)
values (#{bean.reason},#{bean.upperLimit},#{bean.lowerLimit},#{bean.type},#{bean.userCode},now(),#{bean.userCode},now(),0)
</insert>
<update id="update" parameterType="com.ejweb.modules.airport.bean.OilAnalysisUpdateBean">
update foc_flight_dynamics_sta set create_date=now()
......@@ -31,6 +35,23 @@
</choose>
</update>
<update id="updateExtraOilReasonRule">
update foc_extra_oil_rule
set reason = #{bean.reason},
upper_limit= #{bean.upperLimit},
lower_limit= #{bean.lowerLimit},
type = #{bean.type},
update_by= #{bean.userCode},
update_time=NOW()
where id = #{bean.id}
</update>
<update id="deleteRuleById">
update foc_extra_oil_rule
set has_delete=1
where id = #{id}
</update>
<select id="getExcelOilAnalysisData1" resultType="com.ejweb.modules.airport.entity.OilAnalysisEntity">
select DATE_FORMAT(sta.std, '%Y/%m/%d %H:%i')as std,
DATE_FORMAT(sta.std, '%Y/%m/%d %H:%i:%s')as stdExcel,
......@@ -550,6 +571,28 @@
select ac_type,left_over_oil_target from foc_left_over_oil_target where year=YEAR(now()) group by ac_type,month
</select>
<select id="getExtraOilRuleById" resultType="com.ejweb.modules.airport.entity.ExtraOilRuleEntity">
select a.id,reason,upper_limit,lower_limit,type,case type WHEN 0 then '精确' when 1 THEN '模糊' end as typeName,
b.`name`,DATE_FORMAT(update_time, '%Y/%m/%d %H:%i')as update_time
from foc_extra_oil_rule a left join sys_user b on a.update_by=b.id
where a.id=#{id} and a.has_delete=0
</select>
<select id="getExtraOilRulePage" resultType="com.ejweb.modules.airport.entity.ExtraOilRuleEntity">
select a.id,
reason,
upper_limit,
lower_limit,
type,
case type WHEN 0 then '精确' when 1 THEN '模糊' end as typeName,
b.`name` as updateUser,
DATE_FORMAT(update_time, '%Y/%m/%d %H:%i') as update_time
from foc_extra_oil_rule a
left join sys_user b on a.update_by = b.id
where a.has_delete = 0
order by a.update_time desc
</select>
<!--已不用-->
<!--
......
src/com/ejweb/core/api/RequestBean.java
package com.ejweb.core.api;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ClassUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.parser.Feature;
import com.ejweb.core.exception.CommonException;
import com.ejweb.modules.airport.service.StatisticalService;
import com.ejweb.modules.user.bean.LoginBean;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.apache.poi.util.SystemOutLogger;
import org.hibernate.validator.constraints.NotEmpty;
import org.springframework.validation.BindingResult;
import org.springframework.validation.ObjectError;
import org.subethamail.smtp.server.CommandException;
import java.lang.reflect.Type;
import java.util.List;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
/**
* 所有的接口请求实体类
......@@ -63,8 +62,7 @@ public class RequestBean {
* @param clazz
* @return
*/
public <T> T getObjectBean(Class<T> clazz){
public <T> T getObjectBean(Type clazz){
if(content == null)
return null;
try {
......@@ -81,13 +79,11 @@ public class RequestBean {
}
}
Class<Type> aClass = ClassUtil.getClass(clazz);
System.out.println("aClass = " + aClass);
Class<?> aClass1 = ClassUtil.getClassLoader().loadClass(clazz.getTypeName());
System.out.println("clazz.getTypeName() = " + clazz.getTypeName());
String str = JSONObject.toJSONString(jsonObject);
return BeanUtil.toBean(jsonObject,clazz);
try {
return JSON.parseObject(this.content, clazz, new Feature[0]);
} catch (Exception e) {
return (T) jsonObject;
}
}catch (CommonException e){
throw new CommonException("sort参数有sql注入风险");
} catch (Exception e) {
......@@ -97,6 +93,19 @@ public class RequestBean {
return null;
}
public static void main(String[] args) {
RequestBean requestBean = new RequestBean();
LoginBean loginBean = new LoginBean();
loginBean.setLoginName("544");
requestBean.setContent(JSONObject.toJSONString(loginBean));
System.out.println(LoginBean.class.getTypeName());
LoginBean objectBean = requestBean.getObjectBean(LoginBean.class);
System.out.println(objectBean);
JSONObject loginName = new JSONObject().fluentPut("loginName", "123");
Type type=LoginBean.class;
BeanUtil.copyProperties(loginName,type);
}
/**
* 是否含有sql注入，返回true表示含有
......
src/com/ejweb/modules/airport/api/OilAnalysisController.java
package com.ejweb.modules.airport.api;
import cn.hutool.core.util.ObjUtil;
import com.ejweb.core.api.RequestBean;
import com.ejweb.core.api.ResponseBean;
import com.ejweb.core.base.PageEntity;
......@@ -8,11 +9,11 @@ import com.ejweb.core.conf.ErrorCode;
import com.ejweb.core.conf.GConstants;
import com.ejweb.core.utils.excel.ExportExcel;
import com.ejweb.modules.airport.bean.*;
import com.ejweb.modules.airport.entity.ExtraOilRuleEntity;
import com.ejweb.modules.airport.entity.OilAnalysisEntity;
import com.ejweb.modules.airport.entity.OilTargetEntity;
import com.ejweb.modules.airport.entity.ResidualOilSummaryEntity;
import com.ejweb.modules.airport.service.OilAnalysisService;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
......@@ -194,4 +195,127 @@ public class OilAnalysisController {
responseBean.setStatus(ErrorCode.STATUS_CODE_2000);
return responseBean;
}
/**
* 添加额外油原因规则
* @param requestBean
* @return
*/
@RequestMapping(value = "/addExtraOilReasonRule")
@ResponseBody
public ResponseBean addExtraOilReasonRule(RequestBean requestBean) {
ResponseBean responseBean = new ResponseBean();
AddExtraOilReasonRuleRequestBean bean = requestBean.getObjectBean(AddExtraOilReasonRuleRequestBean.class);
if(StringUtils.isBlank(bean.getReason())){
responseBean.setMessage("额外油原因不能为空!");
responseBean.setStatus(ErrorCode.STATUS_CODE_4001);
return responseBean;
}else if(StringUtils.isBlank(bean.getUserCode())){
responseBean.setMessage("操作人id不能为空!");
responseBean.setStatus(ErrorCode.STATUS_CODE_4001);
return responseBean;
}
oilAnalysisService.addExtraOilReasonRule(bean);
responseBean.setMessage(GConstants.OK);
responseBean.setStatus(ErrorCode.STATUS_CODE_2000);
return responseBean;
}
/**
* 修改额外油原因规则
* @param requestBean
* @return
*/
@RequestMapping(value = "/updateExtraOilReasonRule")
@ResponseBody
public ResponseBean updateExtraOilReasonRule(RequestBean requestBean){
ResponseBean responseBean = new ResponseBean();
UpdateExtraOilReasonRuleRequestBean bean = requestBean.getObjectBean(UpdateExtraOilReasonRuleRequestBean.class);
if(ObjUtil.isNull(bean.getId())){
responseBean.setMessage("id不能为空!");
responseBean.setStatus(ErrorCode.STATUS_CODE_4001);
return responseBean;
}
if(StringUtils.isBlank(bean.getReason())){
responseBean.setMessage("额外油原因不能为空!");
responseBean.setStatus(ErrorCode.STATUS_CODE_4001);
return responseBean;
}
if(StringUtils.isBlank(bean.getReason())){
responseBean.setMessage("额外油原因不能为空!");
responseBean.setStatus(ErrorCode.STATUS_CODE_4001);
return responseBean;
}else if(StringUtils.isBlank(bean.getUserCode())){
responseBean.setMessage("操作人id不能为空!");
responseBean.setStatus(ErrorCode.STATUS_CODE_4001);
return responseBean;
}
try {
oilAnalysisService.updateExtraOilReasonRule(bean);
responseBean.setMessage(GConstants.OK);
responseBean.setStatus(ErrorCode.STATUS_CODE_2000);
return responseBean;
} catch (Exception e) {
responseBean.setMessage(e.getMessage());
responseBean.setStatus(ErrorCode.STATUS_CODE_4001);
return responseBean;
}
}
/**
* 额外油原因规则分页
* @param requestBean
* @return
*/
@RequestMapping(value = "/rulePage")
@ResponseBody
public ResponseBean rulePage(RequestBean requestBean){
ResponseBean responseBean = new ResponseBean();
ExtraOilRulePageBean bean = requestBean.getObjectBean(ExtraOilRulePageBean.class);
PageEntity<ExtraOilRuleEntity> list = oilAnalysisService.extraOilRulePage(bean, true);
if (list == null) {
responseBean.setMessage(GConstants.EMPTY);
responseBean.setStatus(ErrorCode.STATUS_CODE_2001);
return responseBean;
} else {
responseBean.setData(list);
responseBean.setMessage(GConstants.OK);
responseBean.setStatus(ErrorCode.STATUS_CODE_2000);
}
return responseBean;
}
@RequestMapping(value = "/extraOilRuleExport")
public ResponseBean extraOilRuleExport(RequestBean requestBean, HttpServletResponse response) {
ResponseBean responseBean = new ResponseBean();
ExtraOilRulePageBean bean = requestBean.getObjectBean(ExtraOilRulePageBean.class);
PageEntity<ExtraOilRuleEntity> page = oilAnalysisService.extraOilRulePage(bean, false);
List<ExtraOilRuleEntity> list = new ArrayList<>();
if (page != null) {
list = page.getList();
}
//自定义导出序号
String fileName = "额外油原因规则.xlsx";
try {
new ExportExcel("额外油原因规则", ExtraOilRuleEntity.class).setDataList(list).write(response, fileName).dispose();
// new ExportExcel("油量分析统计（油量单位：KGS）", OilAnalysisEntity.class).setDataList(list).writeFile("D:\\"+fileName).dispose();
} catch (IOException e) {
responseBean.setMessage("导出数据失败" + e.getMessage());
return responseBean;
}
return responseBean;
}
@RequestMapping(value = "/deleteRule")
@ResponseBody
public ResponseBean deleteRule(RequestBean requestBean){
ResponseBean responseBean = new ResponseBean();
ExtraOilRuleDeleteBean bean = requestBean.getObjectBean(ExtraOilRuleDeleteBean.class);
oilAnalysisService.deleteRuleById(bean.getId());
responseBean.setMessage(GConstants.OK);
responseBean.setStatus(ErrorCode.STATUS_CODE_2000);
return responseBean;
}
}
src/com/ejweb/modules/airport/api/StatisticalController.java
......@@ -20,8 +20,6 @@ import com.ejweb.modules.airport.entity.StatisticalEntity;
import com.ejweb.modules.airport.entity.StatisticalImportEntity;
import com.ejweb.modules.airport.entity.StatisticalListEntity;
import com.ejweb.modules.airport.service.StatisticalService;
import com.ejweb.modules.crew.scores.bean.MainBean;
import com.ejweb.modules.crew.scores.entity.MainEntity;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
......@@ -36,7 +34,6 @@ import org.springframework.web.multipart.commons.CommonsMultipartFile;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
......
src/com/ejweb/modules/airport/bean/AddExtraOilReasonRuleRequestBean.java 0 → 100644
package com.ejweb.modules.airport.bean;
import com.ejweb.core.base.GenericBean;
public class AddExtraOilReasonRuleRequestBean extends GenericBean {
/**
* 额外油原因
*/
private String reason;
/**
* 上限(00:00)
*/
private String upperLimit;
/**
* 下限(00:00)
*/
private String lowerLimit;
/**
* 匹配方式(0.精确,1模糊)
*/
private Integer type;
/**
* 用户id
*/
private String userCode;
public String getReason() {
return reason;
}
public void setReason(String reason) {
this.reason = reason;
}
public String getUpperLimit() {
return upperLimit;
}
public void setUpperLimit(String upperLimit) {
this.upperLimit = upperLimit;
}
public String getLowerLimit() {
return lowerLimit;
}
public void setLowerLimit(String lowerLimit) {
this.lowerLimit = lowerLimit;
}
public Integer getType() {
return type;
}
public void setType(Integer type) {
this.type = type;
}
public String getUserCode() {
return userCode;
}
public void setUserCode(String userCode) {
this.userCode = userCode;
}
}
src/com/ejweb/modules/airport/bean/ExtraOilRuleDeleteBean.java 0 → 100644
package com.ejweb.modules.airport.bean;
import com.ejweb.core.base.GenericBean;
import com.ejweb.core.conf.GConstants;
import javax.validation.constraints.Min;
/**
* 额外有规则删除
*
* @author luoh
* @version 1.0
* @team suzhou
* @time 2020年12月10日
*/
public class ExtraOilRuleDeleteBean extends GenericBean {
private Integer id;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
}
src/com/ejweb/modules/airport/bean/ExtraOilRulePageBean.java 0 → 100644
package com.ejweb.modules.airport.bean;
import com.ejweb.core.base.GenericBean;
import com.ejweb.core.conf.GConstants;
import javax.validation.constraints.Min;
/**
* 额外有规则分页参数
*
* @author luoh
* @version 1.0
* @team suzhou
* @time 2020年12月10日
*/
public class ExtraOilRulePageBean extends GenericBean {
@Min(value=1, message="pageNo必须大于等于1")
private int pageNo=1;//第几页
@Min(value=1, message="pageSize必须大于等于1")
private int pageSize= GConstants.PAGE_SIZE;//每页条数
public int getPageNo() {
return pageNo;
}
public void setPageNo(int pageNo) {
this.pageNo = pageNo;
}
public int getPageSize() {
return pageSize;
}
public void setPageSize(int pageSize) {
this.pageSize = pageSize;
}
}
src/com/ejweb/modules/airport/bean/UpdateExtraOilReasonRuleRequestBean.java 0 → 100644
package com.ejweb.modules.airport.bean;
import com.ejweb.core.base.GenericBean;
public class UpdateExtraOilReasonRuleRequestBean extends GenericBean {
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
private Integer id;
/**
* 额外油原因
*/
private String reason;
/**
* 上限(00:00)
*/
private String upperLimit;
/**
* 下限(00:00)
*/
private String lowerLimit;
/**
* 匹配方式(0.精确,1模糊)
*/
private Integer type;
private String userCode;
public String getReason() {
return reason;
}
public void setReason(String reason) {
this.reason = reason;
}
public String getUpperLimit() {
return upperLimit;
}
public void setUpperLimit(String upperLimit) {
this.upperLimit = upperLimit;
}
public String getLowerLimit() {
return lowerLimit;
}
public void setLowerLimit(String lowerLimit) {
this.lowerLimit = lowerLimit;
}
public Integer getType() {
return type;
}
public void setType(Integer type) {
this.type = type;
}
public String getUserCode() {
return userCode;
}
public void setUserCode(String userCode) {
this.userCode = userCode;
}
}
src/com/ejweb/modules/airport/dao/OilAnalysisDao.java
package com.ejweb.modules.airport.dao;
import com.ejweb.core.base.BaseDao;
import com.ejweb.modules.airport.bean.OilAnalysisBean;
import com.ejweb.modules.airport.bean.OilAnalysisUpdateBean;
import com.ejweb.modules.airport.bean.OilBatchUpdateBean;
import com.ejweb.modules.airport.bean.*;
import com.ejweb.modules.airport.entity.ExtraOilRuleEntity;
import com.ejweb.modules.airport.entity.OilAnalysisEntity;
import com.ejweb.modules.airport.entity.OilTargetEntity;
import com.ejweb.modules.airport.entity.ResidualOilSummaryEntity;
......@@ -32,4 +31,16 @@ public interface OilAnalysisDao extends BaseDao {
List<OilTargetEntity> selectNowYearTarget();
void updateRemarkAndConclusion(@Param("bean") OilBatchUpdateBean bean,@Param("conclusion") String conclusion);
// 添加额外油论证
void addExtraOilReasonRule(@Param("bean")AddExtraOilReasonRuleRequestBean bean);
ExtraOilRuleEntity getExtraOilRuleById(@Param("id") Integer id);
void updateExtraOilReasonRule(@Param("bean") UpdateExtraOilReasonRuleRequestBean bean);
List<ExtraOilRuleEntity> getExtraOilRulePage();
void deleteRuleById(@Param("id") Integer id);
}
src/com/ejweb/modules/airport/entity/ExtraOilRuleEntity.java 0 → 100644
package com.ejweb.modules.airport.entity;
import com.ejweb.core.utils.excel.annotation.ExcelField;
import java.util.Date;
public class ExtraOilRuleEntity {
private Integer id;
/**
* 额外油原因
*/
@ExcelField(title = "额外油原因", type = 0, align = 1, sort = 1)
private String reason;
/**
* 上限(00:00)
*/
@ExcelField(title = "上限", type = 0, align = 1, sort = 2)
private String upperLimit;
/**
* 下限(00:00)
*/
@ExcelField(title = "下限", type = 0, align = 1, sort = 3)
private String lowerLimit;
@ExcelField(title = "匹配方式", type = 0, align = 1, sort = 4)
private String typeName;
/**
* 匹配方式(0.精确,1模糊)
*/
private Integer type;
/**
* 更新人
*/
@ExcelField(title = "更新人", type = 0, align = 1, sort = 5)
private String updateUser;
/**
* 更新时间
*/
@ExcelField(title = "更新时间", type = 0, align = 1, sort = 6)
private String updateTime;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getReason() {
return reason;
}
public void setReason(String reason) {
this.reason = reason;
}
public String getUpperLimit() {
return upperLimit;
}
public void setUpperLimit(String upperLimit) {
this.upperLimit = upperLimit;
}
public String getLowerLimit() {
return lowerLimit;
}
public void setLowerLimit(String lowerLimit) {
this.lowerLimit = lowerLimit;
}
public Integer getType() {
return type;
}
public void setType(Integer type) {
this.type = type;
}
public String getUpdateUser() {
return updateUser;
}
public void setUpdateUser(String updateUser) {
this.updateUser = updateUser;
}
public String getUpdateTime() {
return updateTime;
}
public void setUpdateTime(String updateTime) {
this.updateTime = updateTime;
}
public String getTypeName() {
return typeName;
}
public void setTypeName(String typeName) {
this.typeName = typeName;
}
}
src/com/ejweb/modules/airport/service/OilAnalysisService.java
package com.ejweb.modules.airport.service;
import cn.hutool.core.util.ObjUtil;
import com.ejweb.core.base.BaseService;
import com.ejweb.core.base.PageEntity;
import com.ejweb.modules.airport.bean.ExtraOilReasonBean;
import com.ejweb.modules.airport.bean.OilAnalysisBean;
import com.ejweb.modules.airport.bean.OilAnalysisUpdateBean;
import com.ejweb.modules.airport.bean.OilBatchUpdateBean;
import com.ejweb.modules.airport.bean.*;
import com.ejweb.modules.airport.dao.LeftOverOilDao;
import com.ejweb.modules.airport.dao.OilAnalysisDao;
import com.ejweb.modules.airport.entity.ExtraOilRuleEntity;
import com.ejweb.modules.airport.entity.OilAnalysisEntity;
import com.ejweb.modules.airport.entity.OilTargetEntity;
import com.ejweb.modules.airport.entity.ResidualOilSummaryEntity;
......@@ -292,4 +291,41 @@ public class OilAnalysisService extends BaseService<OilAnalysisDao> {
oilAnalysisDao.updateRemarkAndConclusion(bean,bean.getConclusion());
}
public void addExtraOilReasonRule(AddExtraOilReasonRuleRequestBean bean) {
oilAnalysisDao.addExtraOilReasonRule(bean);
}
public void updateExtraOilReasonRule(UpdateExtraOilReasonRuleRequestBean bean) {
ExtraOilRuleEntity entity = oilAnalysisDao.getExtraOilRuleById(bean.getId());
if (ObjUtil.isNull(entity)) {
throw new RuntimeException("数据不存在或已删除!");
}
oilAnalysisDao.updateExtraOilReasonRule(bean);
}
public PageEntity<ExtraOilRuleEntity> extraOilRulePage(ExtraOilRulePageBean bean, Boolean isPage) {
if (isPage) {
PageHelper.startPage(bean.getPageNo(), bean.getPageSize());
}
List<ExtraOilRuleEntity> list = oilAnalysisDao.getExtraOilRulePage();
if (list == null || list.size() == 0) {
return null;
}
PageInfo<ExtraOilRuleEntity> pageInfo = new PageInfo<ExtraOilRuleEntity>(list);
if (pageInfo.getPages() < bean.getPageNo()) {// 页码大于总页数，则返回NULL
return null;
}
PageEntity<ExtraOilRuleEntity> page = new PageEntity<ExtraOilRuleEntity>();
page.setPageNo(pageInfo.getPageNum());
page.setPageSize(pageInfo.getPageSize());
page.setCount(pageInfo.getTotal());
page.setTotalPage(pageInfo.getPages());
page.setList(pageInfo.getList());
return page;
}
public void deleteRuleById(Integer id) {
oilAnalysisDao.deleteRuleById(id);
}
}
src/com/ejweb/modules/call/api/CallHelpController.java
......@@ -3,7 +3,6 @@
*/
package com.ejweb.modules.call.api;
import java.util.ArrayList;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -17,7 +16,6 @@ import com.ejweb.core.conf.ErrorCode;
import com.ejweb.core.conf.GConstants;
import com.ejweb.modules.call.entity.CallHelpListEntity;
import com.ejweb.modules.call.service.CallHelpService;
import com.sun.org.apache.bcel.internal.generic.I2F;
/**
* 机组转单申请电话列表接口
......
src/com/ejweb/modules/failuredict/api/FailureDictController.java
......@@ -2,23 +2,17 @@ package com.ejweb.modules.failuredict.api;
import com.ejweb.core.api.RequestBean;
import com.ejweb.core.api.ResponseBean;
import com.ejweb.core.base.GenericBean;
import com.ejweb.core.conf.ErrorCode;
import com.ejweb.core.conf.GConstants;
import com.ejweb.modules.dict.bean.DictBean;
import com.ejweb.modules.dict.entity.DictListEntity;
import com.ejweb.modules.failuredict.bean.*;
import com.ejweb.modules.failuredict.entity.FailureDictEntity;
import com.ejweb.modules.failuredict.entity.FailureDictSearchEntity;
import com.ejweb.modules.failuredict.service.FailureDictService;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
import java.util.List;
......
src/com/ejweb/modules/im/api/HuaweiInterfaceController.java
......@@ -16,7 +16,6 @@ import com.ejweb.core.api.ResponseBean;
import com.ejweb.core.conf.ErrorCode;
import com.ejweb.core.conf.GConstants;
import com.ejweb.core.util.Util;
import com.ejweb.modules.flight.entity.FlightDynamicListEntity;
import com.ejweb.modules.flight.entity.FlightingListEntity;
import com.ejweb.modules.flight.service.FlightService;
import com.ejweb.modules.im.bean.AccountDetailBean;
......
src/com/ejweb/modules/im/api/ImGroupController.java
......@@ -35,7 +35,6 @@ import com.ejweb.modules.im.entity.GroupUserListEntity;
import com.ejweb.modules.im.entity.HuaweiUserStatEntity;
import com.ejweb.modules.im.service.HuaweiInterfaseService;
import com.ejweb.modules.im.service.ImGroupService;
import com.ejweb.modules.user.entity.UserListEntity;
import com.ejweb.modules.user.service.ChatRecordsService;
/**
......
src/com/ejweb/modules/im/api/ImSearchController.java
......@@ -12,7 +12,6 @@ import com.ejweb.modules.contact.service.SeatService;
import com.ejweb.modules.flight.bean.AirCarrierListBean;
import com.ejweb.modules.flight.bean.FlightListBean;
import com.ejweb.modules.flight.entity.AirCarrierListEntity;
import com.ejweb.modules.flight.entity.FlightDynamicListEntity;
import com.ejweb.modules.flight.entity.FlightPageEntity;
import com.ejweb.modules.flight.service.AirCarrierService;
import com.ejweb.modules.flight.service.FlightService;
......
src/com/ejweb/modules/message/api/ShortMessageController.java
......@@ -24,12 +24,10 @@ import com.ejweb.core.util.IdWorker;
import com.ejweb.core.util.Util;
import com.ejweb.modules.message.bean.ShortMsgBean;
import com.ejweb.modules.message.bean.ShortMsgListBean;
import com.ejweb.modules.message.entity.ShortMsgUserListEntity;
import com.ejweb.modules.message.entity.SmsRecordEntity;
import com.ejweb.modules.message.service.ShortMessageService;
import com.ejweb.modules.user.bean.ChatRecordsSaveBean;
import com.ejweb.modules.user.service.ChatRecordsService;
import com.sun.org.apache.bcel.internal.generic.NEW;
/**
*
......
src/com/ejweb/modules/route/api/RouteVerifyController.java
......@@ -53,8 +53,8 @@ public class RouteVerifyController {
public ResponseBean getRiskAssessmentList(RequestBean requestBean) {
PageEntity<AirlineVerifyEntity> list = null;
ResponseBean responseBean = new ResponseBean();
LOG.info("getRiskAssessmentList" + requestBean);
AirlineVerifyBean bean = requestBean.getObjectBean(AirlineVerifyBean.class);
// AirlineVerifyBean bean = requestBean.getObjectBean(AirlineVerifyBean.class);
AirlineVerifyBean bean = JSONObject.parseObject(requestBean.getContent(),AirlineVerifyBean.class);
String message = airlineVerifyService.validate(bean);
if (message == null) {// 通过参数校验
list = airlineVerifyService.getRiskAssessmentList(bean);
......@@ -167,7 +167,7 @@ public class RouteVerifyController {
@RequestMapping(value = "/updateStatus")
public ResponseBean updateStatus(RequestBean requestBean) {
ResponseBean responseBean = new ResponseBean();
// VerifyUpdateBean bean = requestBean.getObjectBean(VerifyUpdateBean.class);
VerifyUpdateBean bean = JSONObject.parseObject(requestBean.getContent(), VerifyUpdateBean.class);
String message = routeVerifyService.validate(bean);
......@@ -203,6 +203,7 @@ public class RouteVerifyController {
LOG.info("参数:" + requestBean);
System.out.println("requestBean = " + requestBean);
ResponseBean responseBean = new ResponseBean();
// RouteVerifyBean bean = requestBean.getObjectBean(RouteVerifyBean.class);
RouteVerifyBean bean = JSONObject.parseObject(requestBean.getContent(), RouteVerifyBean.class);
String message = routeVerifyService.validate(bean);
......
src/com/ejweb/modules/sailing/service/SailingCommandService.java
......@@ -347,8 +347,8 @@ public class SailingCommandService extends CurdService<SailingCommandDao, Sailin
sb.append("</b>").append(vertype).append("任务，请各部门按照《航线工作检查单》完成相关工作，如有问题请及时反馈至首都航空运行控制部组织协调中心。</p>");
sb.append("<p style=\"text-align:right\">运行控制部组织协调中心</p><p style=\"text-align:right\">电话：010-69615154</p></td></tr>");
sb.append("<tr style=\"text-align:center;background-color:#e5e5e5;\"><td colspan=\"3\">编写</td><td colspan=\"2\">审核</td><td colspan=\"3\">批准</td></tr>");
sb.append("<tr style=\"text-align:center;\"><td colspan=\"3\">组织协调单元</td><td colspan=\"2\"><textarea style=\"width:100%\" rows=\"1\">万宇</textarea><td colspan=\"3\"><textarea style=\"width:100%\" rows=\"1\">梁广义</textarea></td></tr>");
sb.append("<tr style=\"text-align:center;\"><td colspan=\"2\">公司主管领导</td><td colspan=\"6\"><textarea style=\"width:100%\" rows=\"1\">刘桃林</textarea></td></tr>");
sb.append("<tr style=\"text-align:center;\"><td colspan=\"3\">组织协调单元</td><td colspan=\"2\"><textarea style=\"width:100%\" rows=\"1\">赵世泽</textarea><td colspan=\"3\"><textarea style=\"width:100%\" rows=\"1\">周亮</textarea></td></tr>");
sb.append("<tr style=\"text-align:center;\"><td colspan=\"2\">公司主管领导</td><td colspan=\"6\"><textarea style=\"width:100%\" rows=\"1\">李大兴</textarea></td></tr>");
sb.append("<tr><td>类别</td><td>要求执行</td><td colspan=\"2\">要求修改程序</td><td colspan=\"3\">要求提供反馈</td><td>其他</td></tr>");
sb.append("<tr><td>本指令发至</td><td colspan=\"7\">公司各部门。</td></tr>");
sb.append("<tr><td>抄送至</td><td colspan=\"7\">公司分管领导。</td></tr>");
......
src/com/ejweb/modules/user/api/UserController.java
......@@ -6,7 +6,6 @@ import com.ejweb.core.api.RequestBean;
import com.ejweb.core.api.ResponseBean;
import com.ejweb.core.conf.ErrorCode;
import com.ejweb.core.conf.GConstants;
import com.ejweb.core.exception.CommonException;
import com.ejweb.core.fetcher.FetchEntity;
import com.ejweb.core.fetcher.HCFetcher;
import com.ejweb.core.util.IdWorker;
......@@ -23,7 +22,6 @@ import com.ejweb.modules.user.entity.*;
import com.ejweb.modules.user.service.UserService;
import com.ejweb.modules.user.utils.DtoaUtils;
import com.jdair.util.http.client.HTTPClientUtil;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.apache.poi.hssf.usermodel.*;
......@@ -34,12 +32,7 @@ import org.springframework.util.CollectionUtils;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.subethamail.smtp.server.CommandException;
import sun.misc.BASE64Decoder;
import javax.crypto.Cipher;
import javax.crypto.KeyGenerator;
import javax.crypto.spec.SecretKeySpec;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
......
src/com/ejweb/modules/verify/api/ConditionController.java
......@@ -10,9 +10,7 @@ import com.ejweb.core.conf.ErrorCode;
import com.ejweb.core.conf.GConstants;
import com.ejweb.core.utils.excel.ExportExcel;
import com.ejweb.modules.verify.bean.*;
import com.ejweb.modules.verify.entity.ConditionDetailEntity;
import com.ejweb.modules.verify.entity.ConditionEntity;
import com.ejweb.modules.verify.entity.VerifyFeedbackEntity;
import com.ejweb.modules.verify.service.AirlineVerifyService;
import com.ejweb.modules.verify.service.ConditionService;
import org.apache.commons.lang3.StringUtils;
......
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