朱兆平 / agent · 提交

转到一个项目

作者 shenhailong
提交 4a376da5d3192692e323316dd4057a548e92af6f 1 个父辈 15155c57

添加用户新增 用户删除功能 修改安检航空性质类型 远程接口调用后添加报文发送

内嵌 并排对比
正在显示 32 个修改的文件 包含 326 行增加 和 272 行删除
... ... @@ -30,7 +30,7 @@
<commons-lang3.version>3.4</commons-lang3.version>
<commons-fileupload.version>1.3.1</commons-fileupload.version>
<commons-codec.version>1.10</commons-codec.version>
<shiro.version>1.4.0</shiro.version>
<shiro.version>1.5.2</shiro.version>
<cxf.version>2.7.5</cxf.version>
<patchca.version>0.5.0</patchca.version>
<jxl.version>2.6.12</jxl.version>
... ... @@ -561,6 +561,12 @@
</configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
</plugin>
<!-- Maven 打包插件 <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId>
<version>3.1.0</version> <configuration> <archive> <addMavenDescriptor>false</addMavenDescriptor>
</archive> <webResources> <resource> <directory>src/main/resoreces/conf/${package.environment}</directory>
... ...
... ... @@ -3,7 +3,6 @@ package com.agent.controller.agent;
import com.agent.controller.BasicController;
import com.agent.entity.Constant;
import com.agent.entity.agent.*;
import com.agent.entity.system.PermissionEntity;
import com.agent.entity.system.UserEntity;
import com.agent.service.agent.*;
import com.agent.service.system.*;
... ... @@ -29,7 +28,6 @@ import com.plugin.easyui.DataGrid;
import com.plugin.easyui.EasyPage;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.poi.ss.formula.functions.T;
import org.apache.shiro.SecurityUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
... ... @@ -1415,6 +1413,20 @@ public class ManifestController extends BasicController {
manifest.setDe_remarks("");
manifestService.save(manifest);
// 生成报文并且发送
String ndlrPath = MessageKit.getMessagePath(MessageType.NDLR);
String dlcPath = MessageKit.getMessagePath(MessageType.DLCF);
String sliPath = MessageKit.getMessagePath(MessageType.SLI);
manifest.setAgentcompany(getAgent().getNameCn());
manifest.setAgentman(getAgent().getThreeCode());
manifest.setAgentcompanycode(getAgent().getThreeCode());
new XmlBuildTask(manifestService.sendNDLRXml(manifest), ndlrPath).perform();
new XmlBuildTask(manifestService.sendDLCFXml(manifest), dlcPath).perform();
new XmlBuildTask(FSXmlKit.sliXml(manifest, getAgent()), sliPath).perform();
model.setData(manifest);
model.setStatus(200);
model.setMsg(HttpJsonMsg.SUCCESS);
... ... @@ -1497,6 +1509,18 @@ public class ManifestController extends BasicController {
}else {
PreparesecondaryEntity save = preparesecondaryServer.save(pe);
// 生成报文并且发送
String ndlrPath = MessageKit.getMessagePath(MessageType.NDLR);
String dlcPath = MessageKit.getMessagePath(MessageType.DLCF);
String fhlPath = MessageKit.getMessagePath(MessageType.FHL);
pe.setAgentcompany(getAgent().getNameCn());
pe.setAgentman(getAgent().getNameCn());
pe.setAgentcompanycode(getAgent().getThreeCode());
new XmlBuildTask(manifestService.presenddlcfNdlrXml(pe), ndlrPath).perform();
new XmlBuildTask(manifestService.presenddlcfdlcfXml(pe), dlcPath).perform();
new XmlBuildTask(FSXmlKit.fhlXml(pe, getAgent()), fhlPath).perform();
model.setData(save);
model.setStatus(200);
model.setMsg(HttpJsonMsg.SUCCESS);
... ...
... ... @@ -158,12 +158,7 @@ public class SecurityDeclarationController {
ResponseModel model = new ResponseModel();
//货物性质（类型）
String one = request.getParameter("one");
String two = request.getParameter("two");
String three = request.getParameter("three");
String four = request.getParameter("four");
String type = cargoType(one, two, three, four);
String type = request.getParameter("dept");
//航空货物托运人名称
String cargoShipperName = request.getParameter("sd_cargo_shipper_name");
... ... @@ -308,12 +303,8 @@ public class SecurityDeclarationController {
* 安检申报
*/
//货物性质（类型）
String one = request.getParameter("one");
String two = request.getParameter("two");
String three = request.getParameter("three");
String four = request.getParameter("four");
String type = cargoType(one, two, three, four);
String type = request.getParameter("dept");
//航空货物托运人名称
String cargoShipperName = request.getParameter("sd_cargo_shipper_name");
... ... @@ -587,12 +578,7 @@ public class SecurityDeclarationController {
* 安检申报
*/
//货物性质（类型）
String one = request.getParameter("one");
String two = request.getParameter("two");
String three = request.getParameter("three");
String four = request.getParameter("four");
String type = cargoType(one, two, three, four);
String type = request.getParameter("dept");
//航空货物托运人名称
String cargoShipperName = request.getParameter("sd_cargo_shipper_name");
... ... @@ -780,25 +766,4 @@ public class SecurityDeclarationController {
return "declaration/print";
}
public String cargoType(String one, String two, String three, String four){
String type = "";
//货物性质
if (!StringUtils.isBlank(one)){
type = one;
}
if (!StringUtils.isBlank(two)){
type = two;
}
if (!StringUtils.isBlank(three)){
type = three;
}
if (!StringUtils.isBlank(four)){
type = four;
}
return type;
}
}
... ...
package com.agent.controller.system;
import com.agent.service.system.FilghtDateService;
import com.agent.util.ExcelExportUtil;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
import java.util.List;
import java.util.Map;
@RequestMapping(value = "/filghtdate")
@RestController
public class FilghtDateController{
@Autowired
private FilghtDateService filghtDateService;
@RequestMapping(value = "/list")
public String filghtList(){
return "system/user/filghtdateconut";
}
/**
* 航班日期统计 导出excel
* @param filghtdate1
* @param filghtdate2
* @return
*/
@RequestMapping(value = "/filghtCount")
@ResponseBody
public void filghtcount(HttpServletRequest request, HttpServletResponse response, String filghtdate1, String filghtdate2) {
// 获取数据
List<Map<String, Object>> filghtcount = filghtDateService.filghtcount(filghtdate1, filghtdate2);
//excel标题
String[] title = {"运单号", "航空托运人名称", "航空销售代理人名称", "航协编号", "航空公司运输证明", "运输条件鉴定书","承运人",
"航班号", "航班日期","航班起始站","航班目的站","运单件数","运单重量","操作时间","关区","预配品名","收货人公司",
"收货人地址","收货人城市","收货人国家","收货人电话","收货人名称","发货人名称","发货人地址","发货人城市","发货人国家",
"发货人电话","发货人名称","海关回执状态","海关回执信息","发货人编码","收货人编码","货物品名","二级类名称","一级类名称",
"代理人三字码","代理人全称","代理人类别","代理联系人","代理联系人电话"};
//excel文件名
String fileName = "测试" + System.currentTimeMillis() + ".xls";
//sheet名
String sheetName = "测试统计";
String[][] content = new String[0][];
/**
* 可能空指针异常
*/
for (int i = 0; i < filghtcount.size(); i++) {
content = new String[title.length][];
Map<String, Object> map = filghtcount.get(i);
content[i][0] = map.get("SD_WAYBILL").toString();
content[i][1] = map.get("SD_CARGO_SHIPPER_NAME").toString();
content[i][2] = map.get("SD_CARGO_AGENT_NAME").toString();
content[i][3] = map.get("SD_IATA_NUMBER").toString();
content[i][4] = map.get("SD_TRANSPORT_CERTIFICATE").toString();
content[i][5] = map.get("SD_TRANSPORTATION_PROVE").toString();
content[i][6] = map.get("CARRIER").toString();
content[i][7] = map.get("FLIGHTNO").toString();
content[i][8] = map.get("FLIGHTDATE").toString();
content[i][9] = map.get("ORIGINATINGSTATION").toString();
content[i][10] = map.get("DESTINATIONSTATION").toString();
content[i][11] = map.get("TOTALPIECE").toString();
content[i][12] = map.get("TOTALWEIGHT").toString();
content[i][13] = map.get("STOWAGEDATE").toString();
content[i][14] = map.get("CUSTOMSCODE").toString();
content[i][15] = map.get("SH_COMPANY").toString();
content[i][16] = map.get("SH_ADDRESS").toString();
content[i][17] = map.get("SH_CITY").toString();
content[i][18] = map.get("SH_COUNTRY").toString();
content[i][19] = map.get("SH_TELEPHONE").toString();
content[i][20] = map.get("SH_NAME").toString();
content[i][21] = map.get("CO_COMPANY").toString();
content[i][22] = map.get("CO_ADDRESS").toString();
content[i][23] = map.get("CO_CITY").toString();
content[i][24] = map.get("CO_COUNTRY").toString();
content[i][25] = map.get("CO_TELEPHONE").toString();
content[i][26] = map.get("CO_NAME").toString();
content[i][27] = map.get("RESPONSE_CODE").toString();
content[i][28] = map.get("RESPONSE_TEXT").toString();
content[i][29] = map.get("SHPCUSID").toString();
content[i][30] = map.get("CNECUSID").toString();
content[i][31] = map.get("SD_CARGO_NAME").toString();
content[i][32] = map.get("TWO_TYPE_NAME").toString();
content[i][33] = map.get("TYPE_NAME").toString();
content[i][34] = map.get("FOR_SHORT").toString();
content[i][35] = map.get("FULL_NAME").toString();
content[i][36] = map.get("THE_SHIPPER_TYPE").toString();
content[i][37] = map.get("CONTACTS").toString();
content[i][38] = map.get("PHONE").toString();
}
//创建HSSFWorkbook
HSSFWorkbook wb = ExcelExportUtil.getHSSFWorkbook(sheetName, title, content, null);
//响应到客户端
try {
this.setResponseHeader(response, fileName);
OutputStream os = response.getOutputStream();
wb.write(os);
os.flush();
os.close();
}catch (Exception e){
e.printStackTrace();
}
}
//发送响应流方法
public void setResponseHeader(HttpServletResponse response, String fileName) {
try {
try {
fileName = new String(fileName.getBytes(),"ISO8859-1");
} catch (UnsupportedEncodingException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
response.setContentType("application/octet-stream;charset=ISO8859-1");
response.setHeader("Content-Disposition", "attachment;filename="+ fileName);
response.addHeader("Pargam", "no-cache");
response.addHeader("Cache-Control", "no-cache");
} catch (Exception ex) {
ex.printStackTrace();
}
}
}
//package com.agent.controller.system;
//
//import com.agent.service.system.FilghtDateService;
//import com.agent.util.ExcelExportUtil;
//import org.apache.poi.hssf.usermodel.HSSFWorkbook;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.web.bind.annotation.RequestMapping;
//import org.springframework.web.bind.annotation.ResponseBody;
//import org.springframework.web.bind.annotation.RestController;
//
//import javax.servlet.http.HttpServletRequest;
//import javax.servlet.http.HttpServletResponse;
//import java.io.OutputStream;
//import java.io.UnsupportedEncodingException;
//import java.util.List;
//import java.util.Map;
//
//@RequestMapping(value = "/filghtdate")
//@RestController
//public class FilghtDateController{
//
// @Autowired
// private FilghtDateService filghtDateService;
//
// @RequestMapping(value = "/list")
// public String filghtList(){
// return "system/user/filghtdateconut";
// }
//
// /**
// * 航班日期统计 导出excel
// * @param filghtdate1
// * @param filghtdate2
// * @return
// */
// @RequestMapping(value = "/filghtCount")
// @ResponseBody
// public void filghtcount(HttpServletRequest request, HttpServletResponse response, String filghtdate1, String filghtdate2) {
//
// // 获取数据
// List<Map<String, Object>> filghtcount = filghtDateService.filghtcount(filghtdate1, filghtdate2);
//
// //excel标题
// String[] title = {"运单号", "航空托运人名称", "航空销售代理人名称", "航协编号", "航空公司运输证明", "运输条件鉴定书","承运人",
// "航班号", "航班日期","航班起始站","航班目的站","运单件数","运单重量","操作时间","关区","预配品名","收货人公司",
// "收货人地址","收货人城市","收货人国家","收货人电话","收货人名称","发货人名称","发货人地址","发货人城市","发货人国家",
// "发货人电话","发货人名称","海关回执状态","海关回执信息","发货人编码","收货人编码","货物品名","二级类名称","一级类名称",
// "代理人三字码","代理人全称","代理人类别","代理联系人","代理联系人电话"};
//
// //excel文件名
// String fileName = "测试" + System.currentTimeMillis() + ".xls";
// //sheet名
// String sheetName = "测试统计";
//
// String[][] content = new String[0][];
// /**
// * 可能空指针异常
// */
// for (int i = 0; i < filghtcount.size(); i++) {
// content = new String[title.length][];
// Map<String, Object> map = filghtcount.get(i);
//
// content[i][0] = map.get("SD_WAYBILL").toString();
// content[i][1] = map.get("SD_CARGO_SHIPPER_NAME").toString();
// content[i][2] = map.get("SD_CARGO_AGENT_NAME").toString();
// content[i][3] = map.get("SD_IATA_NUMBER").toString();
// content[i][4] = map.get("SD_TRANSPORT_CERTIFICATE").toString();
// content[i][5] = map.get("SD_TRANSPORTATION_PROVE").toString();
// content[i][6] = map.get("CARRIER").toString();
// content[i][7] = map.get("FLIGHTNO").toString();
// content[i][8] = map.get("FLIGHTDATE").toString();
// content[i][9] = map.get("ORIGINATINGSTATION").toString();
// content[i][10] = map.get("DESTINATIONSTATION").toString();
// content[i][11] = map.get("TOTALPIECE").toString();
// content[i][12] = map.get("TOTALWEIGHT").toString();
// content[i][13] = map.get("STOWAGEDATE").toString();
// content[i][14] = map.get("CUSTOMSCODE").toString();
// content[i][15] = map.get("SH_COMPANY").toString();
// content[i][16] = map.get("SH_ADDRESS").toString();
// content[i][17] = map.get("SH_CITY").toString();
// content[i][18] = map.get("SH_COUNTRY").toString();
// content[i][19] = map.get("SH_TELEPHONE").toString();
// content[i][20] = map.get("SH_NAME").toString();
// content[i][21] = map.get("CO_COMPANY").toString();
// content[i][22] = map.get("CO_ADDRESS").toString();
// content[i][23] = map.get("CO_CITY").toString();
// content[i][24] = map.get("CO_COUNTRY").toString();
// content[i][25] = map.get("CO_TELEPHONE").toString();
// content[i][26] = map.get("CO_NAME").toString();
// content[i][27] = map.get("RESPONSE_CODE").toString();
// content[i][28] = map.get("RESPONSE_TEXT").toString();
// content[i][29] = map.get("SHPCUSID").toString();
// content[i][30] = map.get("CNECUSID").toString();
// content[i][31] = map.get("SD_CARGO_NAME").toString();
// content[i][32] = map.get("TWO_TYPE_NAME").toString();
// content[i][33] = map.get("TYPE_NAME").toString();
// content[i][34] = map.get("FOR_SHORT").toString();
// content[i][35] = map.get("FULL_NAME").toString();
// content[i][36] = map.get("THE_SHIPPER_TYPE").toString();
// content[i][37] = map.get("CONTACTS").toString();
// content[i][38] = map.get("PHONE").toString();
//
// }
// //创建HSSFWorkbook
//
// HSSFWorkbook wb = ExcelExportUtil.getHSSFWorkbook(sheetName, title, content, null);
// //响应到客户端
// try {
// this.setResponseHeader(response, fileName);
// OutputStream os = response.getOutputStream();
// wb.write(os);
// os.flush();
// os.close();
// }catch (Exception e){
// e.printStackTrace();
// }
// }
//
//
// //发送响应流方法
// public void setResponseHeader(HttpServletResponse response, String fileName) {
// try {
// try {
// fileName = new String(fileName.getBytes(),"ISO8859-1");
// } catch (UnsupportedEncodingException e) {
// // TODO Auto-generated catch block
// e.printStackTrace();
// }
// response.setContentType("application/octet-stream;charset=ISO8859-1");
// response.setHeader("Content-Disposition", "attachment;filename="+ fileName);
// response.addHeader("Pargam", "no-cache");
// response.addHeader("Cache-Control", "no-cache");
// } catch (Exception ex) {
// ex.printStackTrace();
// }
// }
//
//}
... ...
package com.agent.repository.system;
import org.springframework.data.jpa.repository.Query;
import java.util.List;
import java.util.Map;
public interface FilghtDateRepository {
@Query(value = "SELECT SD.SD_WAYBILL , SD.SD_CARGO_SHIPPER_NAME , SD.SD_CARGO_AGENT_NAME , SD.SD_IATA_NUMBER , SD.SD_TRANSPORT_CERTIFICATE , SD.SD_TRANSPORTATION_PROVE , MF.CARRIER , MF.FLIGHTNO , MF.FLIGHTDATE , MF.ORIGINATINGSTATION , MF.DESTINATIONSTATION , MF.TOTALPIECE , MF.TOTALWEIGHT , MF.STOWAGEDATE , MF.CUSTOMSCODE , MF.PRODUCTNAME , MF.SH_COMPANY , MF.SH_ADDRESS , MF.SH_CITY , MF.SH_COUNTRY , MF.SH_TELEPHONE , MF.SH_NAME , MF.CO_COMPANY , MF.CO_ADDRESS , MF.CO_CITY , MF.CO_COUNTRY , MF.CO_TELEPHONE , MF.CO_NAME , MF.RESPONSE_CODE , MF.RESPONSE_TEXT , MF.SHPCUSID , MF.CNECUSID , SCN.SD_CARGO_NAME , twoType.TWO_TYPE_NAME , bigType.TYPE_NAME , HSI.FOR_SHORT , HSI.FULL_NAME , HSI.THE_SHIPPER_TYPE , HSI.CONTACTS, HSI.PHONE FROM SECURITY_DECLARATION SD LEFT JOIN MANIFEST MF ON MF.WAYBILLNOMASTER = SD.SD_WAYBILL LEFT JOIN SD_CARGO_NAME SCN ON SCN.SD_WAYBILL = SD.SD_WAYBILL LEFT JOIN SD_TWO_TYPE twoType ON twoType.CARGO_NAME = SCN.SD_CARGO_NAME LEFT JOIN SD_BIG_TYPE bigType on bigType.ID = twoType.BIG_TYPE_ID LEFT JOIN HZ_WAYBILL_INFO HWI ON hwi.WAYBILL_ID = MF.WAYBILLNOMASTER LEFT JOIN HZ_SHIPPER_INFORMATION HSI ON HWI.HZINFOR_ID = HSI.ID WHERE trunc( MF.FLIGHTDATE ) BETWEEN to_date( MF.FLIGHTDATE=?1, 'yyyy-mm-dd' ) AND to_date(MF.FLIGHTDATE=?2,'yyyy-mm-dd') ORDER BY MF.FLIGHTDATE", nativeQuery = true)
List<Map<String, Object>>filghtdateCount(String filghtdate1, String filghtdate2);
}
//package com.agent.repository.system;
//
//import org.springframework.data.jpa.repository.Query;
//
//import java.util.List;
//import java.util.Map;
//
//public interface FilghtDateRepository {
//
//
// @Query(value = "SELECT SD.SD_WAYBILL , SD.SD_CARGO_SHIPPER_NAME , SD.SD_CARGO_AGENT_NAME , SD.SD_IATA_NUMBER , SD.SD_TRANSPORT_CERTIFICATE , SD.SD_TRANSPORTATION_PROVE , MF.CARRIER , MF.FLIGHTNO , MF.FLIGHTDATE , MF.ORIGINATINGSTATION , MF.DESTINATIONSTATION , MF.TOTALPIECE , MF.TOTALWEIGHT , MF.STOWAGEDATE , MF.CUSTOMSCODE , MF.PRODUCTNAME , MF.SH_COMPANY , MF.SH_ADDRESS , MF.SH_CITY , MF.SH_COUNTRY , MF.SH_TELEPHONE , MF.SH_NAME , MF.CO_COMPANY , MF.CO_ADDRESS , MF.CO_CITY , MF.CO_COUNTRY , MF.CO_TELEPHONE , MF.CO_NAME , MF.RESPONSE_CODE , MF.RESPONSE_TEXT , MF.SHPCUSID , MF.CNECUSID , SCN.SD_CARGO_NAME , twoType.TWO_TYPE_NAME , bigType.TYPE_NAME , HSI.FOR_SHORT , HSI.FULL_NAME , HSI.THE_SHIPPER_TYPE , HSI.CONTACTS, HSI.PHONE FROM SECURITY_DECLARATION SD LEFT JOIN MANIFEST MF ON MF.WAYBILLNOMASTER = SD.SD_WAYBILL LEFT JOIN SD_CARGO_NAME SCN ON SCN.SD_WAYBILL = SD.SD_WAYBILL LEFT JOIN SD_TWO_TYPE twoType ON twoType.CARGO_NAME = SCN.SD_CARGO_NAME LEFT JOIN SD_BIG_TYPE bigType on bigType.ID = twoType.BIG_TYPE_ID LEFT JOIN HZ_WAYBILL_INFO HWI ON hwi.WAYBILL_ID = MF.WAYBILLNOMASTER LEFT JOIN HZ_SHIPPER_INFORMATION HSI ON HWI.HZINFOR_ID = HSI.ID WHERE trunc( MF.FLIGHTDATE ) BETWEEN to_date( MF.FLIGHTDATE=?1, 'yyyy-mm-dd' ) AND to_date(MF.FLIGHTDATE=?2,'yyyy-mm-dd') ORDER BY MF.FLIGHTDATE", nativeQuery = true)
// List<Map<String, Object>>filghtdateCount(String filghtdate1, String filghtdate2);
//}
... ...
package com.agent.service.system;
import com.agent.repository.system.FilghtDateRepository;
import com.agent.vo.ResponseModel;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
@Service
public class FilghtDateService {
@Resource
private FilghtDateRepository filghtDateRepository;
public List<Map<String, Object>> filghtcount(String filghtdate1, String filghtdate2){
return filghtDateRepository.filghtdateCount(filghtdate1, filghtdate2);
}
}
//package com.agent.service.system;
//
//import com.agent.repository.system.FilghtDateRepository;
//import com.agent.vo.ResponseModel;
//import org.springframework.stereotype.Service;
//
//import javax.annotation.Resource;
//import java.util.List;
//import java.util.Map;
//
//@Service
//public class FilghtDateService {
//
// @Resource
// private FilghtDateRepository filghtDateRepository;
//
// public List<Map<String, Object>> filghtcount(String filghtdate1, String filghtdate2){
//
// return filghtDateRepository.filghtdateCount(filghtdate1, filghtdate2);
//
// }
//
//}
... ...
... ... @@ -136,7 +136,7 @@ public class SecurityDeclarationService extends BasicService<SecurityManifestEnt
SecurityDeclarationXml sdXml = new SecurityDeclarationXml();
sdXml.setCargoAgentName(sdVo.getSd_cargo_agent_name());
sdXml.setCargoName(sdVo.getSd_cargo_name());
sdXml.setCargoType(sdVo.getSd_cargo_type().substring(0, sdVo.getSd_cargo_type().length()-1));
sdXml.setCargoType(sdVo.getSd_cargo_type());
sdXml.setShipperName(sdVo.getSd_cargo_shipper_name());
sdXml.setIataNo(sdVo.getSd_iata_number());
sdXml.setPiece(sdVo.getTotalpiece());
... ...
... ... @@ -65,7 +65,7 @@ public class ExcelUtil {
if (xssfCell == null) {
rowList.add("");
} else {
xssfCell.setCellType(Cell.CELL_TYPE_STRING);
// xssfCell.setCellType(Cell.CELL_TYPE_STRING);
rowList.add(String.valueOf(xssfCell.getStringCellValue()));
}
}
... ... @@ -156,7 +156,7 @@ public class ExcelUtil {
} finally {
try {
if ( wb != null) {
wb.close();
// wb.close();
}
if (input != null) {
input.close();
... ...
... ... @@ -132,7 +132,7 @@ public class Excel {
if (colorMap != null && (colorMap.get(text.toString()) != null)) {
style.setFillForegroundColor((short) colorMap.get(text.toString()));
style.setFillPattern(CellStyle.SOLID_FOREGROUND);
// style.setFillPattern(CellStyle.SOLID_FOREGROUND);
}
style.setFont(font);
cell.setCellStyle(style);
... ... @@ -263,7 +263,7 @@ public class Excel {
style.setFont(font);
if (colorMap != null && (colorMap.get(text.toString()) != null)) {
style.setFillForegroundColor((short) colorMap.get(text.toString()));
style.setFillPattern(CellStyle.SOLID_FOREGROUND);
// style.setFillPattern(CellStyle.SOLID_FOREGROUND);
}
cell.setCellStyle(style);
}
... ...
... ... @@ -63,4 +63,5 @@ public class ExcelLogs {
this.logList = logList;
}
}
... ...
... ... @@ -358,7 +358,7 @@ public class ExcelUtils {
style.setFont(font);
if (colorMap != null && (colorMap.get(text.toString()) != null)) {
style.setFillForegroundColor((short) colorMap.get(text.toString()));
style.setFillPattern(CellStyle.SOLID_FOREGROUND);
// style.setFillPattern(CellStyle.SOLID_FOREGROUND);
}
cell.setCellStyle(style);
}
... ... @@ -531,7 +531,7 @@ public class ExcelUtils {
if (colorMap != null && (colorMap.get(text.toString()) != null)) {
style.setFillForegroundColor((short) colorMap.get(text.toString()));
style.setFillPattern(CellStyle.SOLID_FOREGROUND);
// style.setFillPattern(CellStyle.SOLID_FOREGROUND);
}
style.setFont(font);
cell.setCellStyle(style);
... ... @@ -1549,7 +1549,7 @@ public class ExcelUtils {
/**
* 个人加,返回路径
*
* @param fileType
// * @param fileType
* @param headers
* @param excels
* @param request
... ... @@ -1867,9 +1867,9 @@ public class ExcelUtils {
//添加路径
/**
*
* @param filetype
// * @param filetype
* @param headers
* @param excelList
// * @param excelList
* @param request
* @param response
* @param filename 文件目录
... ...
... ... @@ -10,7 +10,7 @@
<File name="log" fileName="target/vss.log" append="false">
<PatternLayout pattern="%d{HH:mm:ss} %-5level %class{36} %L %M - %msg%xEx%n" />
</File>
<RollingFile name="RollingFile" fileName="/home/agent/tomcat/logs/agent.log"
<RollingFile name="RollingFile" fileName="logs/agent.log"
filePattern="/home/agent/tomcat/logs/$${date:yyyy-MM}/agent-%d{MM-dd-yyyy}-%i.log.gz">
<PatternLayout
pattern="%d{yyyy.MM.dd 'at' HH:mm:ss z} %-5level %class{36} %L %M - %msg%xEx%n" />
... ...
不能预览此文件类型
... ... @@ -60,18 +60,25 @@
</td>
<td class="kv-content">
<label>
<input id="one" name="one" type="radio" ${fn:contains(type, 1)?"checked":""} value="1" >普通货物
</label>
<label>
<input id="two" name="one" type="radio" ${fn:contains(type, 2)?"checked":""} value="2">特种货物
</label>
<label>
<input id="three" name="one" type="radio" ${fn:contains(type, 3)?"checked":""} value="3">危险品
</label>
<label>
<input id="four" name="one" type="radio" ${fn:contains(type, 4)?"checked":""} value="4">航空快件
</label>
<select id="cc" class="easyui-combobox" name="dept" style="width:200px;">
<option value="A" <c:if test="${'A' eq type}">selected</c:if>>普通货物</option>
<option value="B" <c:if test="${'B' eq type}">selected</c:if>>特种货物</option>
<option value="C" <c:if test="${'C' eq type}">selected</c:if>>危险品</option>
<option value="D" <c:if test="${'D' eq type}">selected</c:if>>航空快件</option>
<option value="C1" <c:if test="${'C1' eq type}">selected</c:if>>爆炸物</option>
<option value="C2" <c:if test="${'C2' eq type}">selected</c:if>>压缩气体和液化气体</option>
<option value="C3" <c:if test="${'C3' eq type}">selected</c:if>>易燃液体</option>
<option value="C4" <c:if test="${'C4' eq type}">selected</c:if>>易燃固体、自燃物品、遇湿易燃物品</option>
<option value="C5" <c:if test="${'C5' eq type}">selected</c:if>>氧化物和有机过氧化物</option>
<option value="C6" <c:if test="${'C6' eq type}">selected</c:if>>毒性物质和感染性物质</option>
<option value="C7" <c:if test="${'C7' eq type}">selected</c:if>>放射性物质</option>
<option value="C8" <c:if test="${'C8' eq type}">selected</c:if>>腐蚀品</option>
<option value="C9" <c:if test="${'C9' eq type}">selected</c:if>>杂项危险品-ELI/RLI：锂离子电池（与设备放于同一包装/已安装于设备中）</option>
<option value="C10" <c:if test="${'C10' eq type}">selected</c:if>>杂项危险品-ELM/RLM：锂金属电池（与设备放于同一包装/已安装于设备中）</option>
<option value="C11" <c:if test="${'C11' eq type}">selected</c:if>>杂项危险品-RBI/EBI：锂离子电池</option>
<option value="C12" <c:if test="${'C12' eq type}">selected</c:if>>杂项危险品-RBM/EBM：锂金属电池</option>
<option value="C13" <c:if test="${'C13' eq type}">selected</c:if>>杂项危险品-其他杂项危险品</option>
</select>
</td>
</tr>
<tr>
... ... @@ -209,7 +216,7 @@
layer = layui.layer;
});
var selectFals = false;
var selectFals = true;
function submit(){
layerIndex = parent.layer.load(1, {
shade: [0.6,'#000000'] //0.1透明度
... ...
... ... @@ -70,18 +70,37 @@
</td>
<td class="kv-content">
<label>
<input id="one" name="one" type="radio" value="1" checked>普通货物
</label>
<label>
<input id="two" name="one" type="radio" value="2">特种货物
</label>
<label>
<input id="three" name="one" type="radio" value="3">危险品
</label>
<label>
<input id="four" name="one" type="radio" value="4">航空快件
</label>
<%-- <label>--%>
<%-- <input id="one" name="one" type="radio" value="1" checked>普通货物--%>
<%-- </label>--%>
<%-- <label>--%>
<%-- <input id="two" name="one" type="radio" value="2">特种货物--%>
<%-- </label>--%>
<%-- <label>--%>
<%-- <input id="three" name="one" type="radio" value="3">危险品--%>
<%-- </label>--%>
<%-- <label>--%>
<%-- <input id="four" name="one" type="radio" value="4">航空快件--%>
<%-- </label>--%>
<select id="cc" class="easyui-combobox" name="dept" style="width:200px;">
<option value="A">普通货物</option>
<option value="B">特种货物</option>
<option value="C">危险品</option>
<option value="D">航空快件</option>
<option value="C1">爆炸物</option>
<option value="C2">压缩气体和液化气体</option>
<option value="C3">易燃液体</option>
<option value="C4">易燃固体、自燃物品、遇湿易燃物品</option>
<option value="C5">氧化物和有机过氧化物</option>
<option value="C6">毒性物质和感染性物质</option>
<option value="C7">放射性物质</option>
<option value="C8">腐蚀品</option>
<option value="C9">杂项危险品-ELI/RLI：锂离子电池（与设备放于同一包装/已安装于设备中）</option>
<option value="C10">杂项危险品-ELM/RLM：锂金属电池（与设备放于同一包装/已安装于设备中）</option>
<option value="C11">杂项危险品-RBI/EBI：锂离子电池</option>
<option value="C12">杂项危险品-RBM/EBM：锂金属电池</option>
<option value="C13">杂项危险品-其他杂项危险品</option>
</select>
</td>
</tr>
<tr>
... ... @@ -233,7 +252,7 @@
})
}
}
var selectFals = false;
var selectFals = true;
//发送报文并且保存
function savesend(){
var isValid = $("#form").valid();
... ...
... ... @@ -57,10 +57,23 @@
<p><button style="width: 100px; height: 35px" id="sa" onclick="print_page();" href="javascript:void(0);">确定打印</button></p>
<p style="line-height:25pt; margin:0pt 0pt 10pt; orphans:0; widows:0">
<span style="font-family:宋体; font-size:12pt">航空货物性质：
普通货物<input id="one" type="checkbox" name="one" ${fn:contains(type, 1)?"checked":""} value="1">&nbsp;&nbsp;&nbsp;&nbsp;
特种货物<input id="two" type="checkbox" name="two" ${fn:contains(type, 2)?"checked":""} value="2">&nbsp;&nbsp;&nbsp;&nbsp;
危险品<input id="three" type="checkbox" name="three" ${fn:contains(type, 3)?"checked":""} value="3">&nbsp;&nbsp;&nbsp;&nbsp;
航空快件<input id="four" type="checkbox" name="four" ${fn:contains(type, 4)?"checked":""} value="4">
普通货物<input id="one" type="checkbox" name="one" ${fn:contains(type, 'A')?"checked":""} value="A">&nbsp;&nbsp;&nbsp;&nbsp;
特种货物<input id="two" type="checkbox" name="two" ${fn:contains(type, 'B')?"checked":""} value="B">&nbsp;&nbsp;&nbsp;&nbsp;
危险品<input id="three" type="checkbox" name="three" ${fn:contains(type, 'C')?"checked":""}
${fn:contains(type, 'C1')?"checked":""}
${fn:contains(type, 'C2')?"checked":""}
${fn:contains(type, 'C3')?"checked":""}
${fn:contains(type, 'C4')?"checked":""}
${fn:contains(type, 'C5')?"checked":""}
${fn:contains(type, 'C6')?"checked":""}
${fn:contains(type, 'C7')?"checked":""}
${fn:contains(type, 'C8')?"checked":""}
${fn:contains(type, 'C9')?"checked":""}
${fn:contains(type, 'C10')?"checked":""}
${fn:contains(type, 'C11')?"checked":""}
${fn:contains(type, 'C12')?"checked":""}
${fn:contains(type, 'C13')?"checked":""}value="C">&nbsp;&nbsp;&nbsp;&nbsp;
航空快件<input id="four" type="checkbox" name="four" ${fn:contains(type, 'D')?"checked":""} value="D">
</span>
</p>
<p style="line-height:0pt; margin:0pt 0pt 10pt; orphans:0; widows:0">
... ...
... ... @@ -62,18 +62,37 @@
</td>
<td class="kv-content">
<label>
<input id="one" name="one" type="radio" value="1" checked>普通货物
</label>
<label>
<input id="two" name="one" type="radio" value="2">特种货物
</label>
<label>
<input id="three" name="one" type="radio" value="3">危险品
</label>
<label>
<input id="four" name="one" type="radio" value="4">航空快件
</label>
<%-- <label>--%>
<%-- <input id="one" name="one" type="radio" value="1" checked>普通货物--%>
<%-- </label>--%>
<%-- <label>--%>
<%-- <input id="two" name="one" type="radio" value="2">特种货物--%>
<%-- </label>--%>
<%-- <label>--%>
<%-- <input id="three" name="one" type="radio" value="3">危险品--%>
<%-- </label>--%>
<%-- <label>--%>
<%-- <input id="four" name="one" type="radio" value="4">航空快件--%>
<%-- </label>--%>
<select id="cc" class="easyui-combobox" name="dept" style="width:200px;">
<option value="A">普通货物</option>
<option value="B">特种货物</option>
<option value="C">危险品</option>
<option value="D">航空快件</option>
<option value="C1">爆炸物</option>
<option value="C2">压缩气体和液化气体</option>
<option value="C3">易燃液体</option>
<option value="C4">易燃固体、自燃物品、遇湿易燃物品</option>
<option value="C5">氧化物和有机过氧化物</option>
<option value="C6">毒性物质和感染性物质</option>
<option value="C7">放射性物质</option>
<option value="C8">腐蚀品</option>
<option value="C9">杂项危险品-ELI/RLI：锂离子电池（与设备放于同一包装/已安装于设备中）</option>
<option value="C10">杂项危险品-ELM/RLM：锂金属电池（与设备放于同一包装/已安装于设备中）</option>
<option value="C11">杂项危险品-RBI/EBI：锂离子电池</option>
<option value="C12">杂项危险品-RBM/EBM：锂金属电池</option>
<option value="C13">杂项危险品-其他杂项危险品</option>
</select>
</td>
</tr>
... ... @@ -180,7 +199,7 @@
layer = layui.layer;
});
var selectFals = false;
var selectFals = true;
function submit(){
layerIndex = parent.layer.load(1, {
shade: [0.6,'#000000'] //0.1透明度
... ...
... ... @@ -50,8 +50,8 @@
<td class="kcontent"><input type="text" name="search_LIKE_mobile"></td>
<td class="kbutton">
<a href="javascript:doSearch()" class="easyui-linkbutton" iconCls="icon-search" data-options="selected:true"><spring:message code="opt.search" /></a>
<%-- <a href="javascript:editRow()" class="easyui-linkbutton" style="background:#18A197;color:#FFF;border: 1px solid #18A197;" iconCls="icon-add"><spring:message code="opt.add" /></a>
<a href="javascript:doDelete()" class="easyui-linkbutton" style="background:red;color:#FFF;border: 1px solid red" iconCls="icon-no"><spring:message code="opt.delete" /></a> --%>
<a href="javascript:editRow()" class="easyui-linkbutton" style="background:#18A197;color:#FFF;border: 1px solid #18A197;" iconCls="icon-add"><spring:message code="opt.add" /></a>
<a href="javascript:doDelete()" class="easyui-linkbutton" style="background:red;color:#FFF;border: 1px solid red" iconCls="icon-no"><spring:message code="opt.delete" /></a>
</td>
</tr>
</table>
... ...
... ... @@ -9,7 +9,7 @@
<File name="log" fileName="target/vss.log" append="false">
<PatternLayout pattern="%d{HH:mm:ss} %-5level %class{36} %L %M - %msg%xEx%n"/>
</File>
<RollingFile name="RollingFile" fileName="/logs/agent.log" filePattern="/logs/$${date:yyyy-MM}/agent-%d{MM-dd-yyyy}-%i.log.gz">
<RollingFile name="RollingFile" fileName="logs/agent.log" filePattern="/logs/$${date:yyyy-MM}/agent-%d{MM-dd-yyyy}-%i.log.gz">
<PatternLayout pattern="%d{yyyy.MM.dd 'at' HH:mm:ss z} %-5level %class{36} %L %M - %msg%xEx%n"/>
<SizeBasedTriggeringPolicy size="50 MB" />
</RollingFile>
... ...