wlxxpt / customAnalysis · 提交

转到一个项目

作者 shenhailong
提交 69ff95671bbe3a4a5cf4a6bf1a2d9cb1ba62ab9d 1 个父辈 e11cc93b

删除多余字段 

修改接口接参方式
优化分单挂载代码
内嵌 并排对比
正在显示 5 个修改的文件 包含 71 行增加 和 59 行删除
... ... @@ -5,10 +5,16 @@ import com.tianbo.analysis.model.Originmanifestsecondary;
import com.tianbo.analysis.model.ResultJson;
import com.tianbo.analysis.service.NmmsImportService;
import com.tianbo.analysis.service.OriginService;
import com.tianbo.util.Date.DateUtil;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.thymeleaf.util.DateUtils;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
/**
... ... @@ -28,42 +34,46 @@ public class NmmsImportController {
NmmsImportService nmmsImportService;
/**
* awbhIds[] 分单id
* 批量删除
* @param originmanifestsecondary
* @param awbhIds
* @return
*/
@ApiOperation(value = "批量删除")
@PostMapping(value = "/imp_removes")
@ResponseBody
public ResultJson antivirus_log_remove(@RequestBody Originmanifestsecondary originmanifestsecondary){
public ResultJson antivirus_log_remove(@RequestParam(value ="awbhIds", required= true) String awbhIds){
int r = 0;
if(originmanifestsecondary != null){
if (originmanifestsecondary.getAwbhIds().contains(",")){
String[] split = originmanifestsecondary.getAwbhIds().split(",");
for (int i=0; i< split.length; i++){
r += originService.deleteAwbh(split[i]);
}
if (awbhIds.contains(",")){
String[] split = awbhIds.split(",");
for (int i=0; i< split.length; i++){
r += originService.deleteAwbh(split[i]);
}
}else {
r += originService.deleteAwbh(awbhIds);
}
return r > 0 ? new ResultJson("200", "批量删除成功")
: new ResultJson("201", "批量删除失败");
}
/**
* awbhIds[] 分单id
* flightDate 航班日期
* flightno 航班号
* @param originmanifestmaster
* 分单挂载主单
* @param awbhIds
* @param flightNo
* @param flightDate
* @return
*/
@ApiOperation(value = "分单批量挂载")
@PostMapping(value = "/mountAwbh")
@ResponseBody
public ResultJson antivirus_log_remove(@RequestBody ORIGINMANIFESTMASTER originmanifestmaster){
public ResultJson antivirus_log_remove(@RequestParam(value ="awbhIds", required= true) String awbhIds,
@RequestParam(value ="flightNo", required= true) String flightNo,
@RequestParam(value ="flightDate", required= true) String flightDate) throws ParseException {
ORIGINMANIFESTMASTER originmanifestmaster = new ORIGINMANIFESTMASTER();
originmanifestmaster.setAwbhIds(awbhIds);
originmanifestmaster.setFlightno(flightNo);
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
Date parse = simpleDateFormat.parse(flightDate);
originmanifestmaster.setFlightDate(parse);
return nmmsImportService.mountAwbh(originmanifestmaster) > 0 ? new ResultJson("200", "分单挂载成功")
: new ResultJson("201", "分单挂载失败");
}
... ...
... ... @@ -24,7 +24,7 @@ public interface ORIGINMANIFESTMASTERMapper {
@Param("flightDate")String var3
);
ORIGINMANIFESTMASTER findAwba(@Param("waybillnomaster") String var1,
ORIGINMANIFESTMASTER findAwba(@Param("awba") String var1,
@Param("flightNo")String var2,
@Param("flightDate") Date var3
);
... ...
... ... @@ -95,16 +95,6 @@ public class Originmanifestsecondary {
//报文结束标识
private static String END_WORD= "=";
private String awbhIds;
public String getAwbhIds() {
return awbhIds;
}
public void setAwbhIds(String awbhIds) {
this.awbhIds = awbhIds;
}
public String getAutoid() {
return autoid;
}
... ...
... ... @@ -9,6 +9,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
/**
... ... @@ -26,38 +27,49 @@ public class NmmsImportServiceImpl implements NmmsImportService{
@Autowired
ORIGINMANIFESTMASTERMapper originmanifestmasterMapper;
@Override
public int mountAwbh(ORIGINMANIFESTMASTER master) {
int w = 0;
try {
String awba = "";
if(master != null){
if (master.getAwbhIds().contains(",")){
String[] split = master.getAwbhIds().split(",");
// 查询该分单绑定的主单id
for (int i=0; i< split.length; i++){
Originmanifestsecondary originmanifestsecondary = originmanifestsecondaryMapper.findAwba(split[i]);
log.info("查询的主单id:{}", originmanifestsecondary);
if (originmanifestsecondary != null){
awba = originmanifestsecondary.getWaybillnomaster();
// 查询需要挂载的主单id
ORIGINMANIFESTMASTER originmanifestmaster = originmanifestmasterMapper.findAwba(awba, master.getFlightno(), master.getFlightDate());
// 修改分单表 所绑定的主单id
if (originmanifestmaster!=null){
log.info("挂载主单的id:{}", originmanifestmaster);
log.info("修改分单数据参数:{}", split, originmanifestmaster.getAutoid());
w = originmanifestsecondaryMapper.updateMasterAutoId(split[i], originmanifestmaster.getAutoid());
log.info("修改后的状态:{}", w);
}
@Override
public int mountAwbh(ORIGINMANIFESTMASTER master) {
int w = 0;
String awba = "";
try {
if (master.getAwbhIds().contains(",")){
String[] split = master.getAwbhIds().split(",");
// 查询该分单绑定的主单id
for (int i=0; i< split.length; i++){
w = mountAwbhBreakUp(master.getAwbhIds(), master.getFlightno(), master.getFlightDate());
}
}else {
w = mountAwbhBreakUp(master.getAwbhIds(), master.getFlightno(), master.getFlightDate());
}
return w;
}catch (Exception e){
e.printStackTrace();
return w;
}
}
return w;
}catch (Exception e){
e.printStackTrace();
return w;
private int mountAwbhBreakUp(String awbh, String flightNo, Date flightDate){
int w = 0;
String awba = "";
// 查询需要挂载的主单号
Originmanifestsecondary originmanifestsecondary = originmanifestsecondaryMapper.findAwba(awbh);
log.info("查询的主单id:{}", originmanifestsecondary);
if (originmanifestsecondary != null){
awba = originmanifestsecondary.getWaybillnomaster();
// 通过主单号 航班号 航班日期 查询相对应的主单id
ORIGINMANIFESTMASTER originmanifestmaster = originmanifestmasterMapper.findAwba(awba, flightNo, flightDate);
// 修改分单表 所绑定的主单id
if (originmanifestmaster!=null){
log.info("挂载主单的id:{}", originmanifestmaster);
log.info("修改分单数据参数:{}", awbh, originmanifestmaster.getAutoid());
w = originmanifestsecondaryMapper.updateMasterAutoId(awbh, originmanifestmaster.getAutoid());
log.info("修改后的状态:{}", w);
}
}
return w;
}
}
... ...
... ... @@ -487,12 +487,12 @@ GROUP BY
messagetype ASC
</select>
<select id="findAwba" parameterType="java.lang.String" resultMap="BaseResultMap">
<select id="findAwba" parameterType="java.util.Map" resultMap="BaseResultMap">
select * from ORIGINMANIFESTMASTER
where
WAYBILLNOMASTER = #{waybillnomaster,jdbcType=VARCHAR}
WAYBILLNOMASTER = #{awba,jdbcType=VARCHAR}
and FLIGHTNO = #{flightNo,jdbcType=VARCHAR}
and flight_date = TO_DATE( #{flightDate ,jdbcType=DATE}, 'yyyy-MM-dd' )
and FLIGHT_DATE = #{flightDate ,jdbcType=DATE}
</select>
<select id="searchSec" parameterType="string" resultMap="BaseResultMap">
... ...