0809

src/main/java/com/yxproject/start/api/ReadExcelApi.java

@@ -145,12 +145,12 @@ public class ReadExcelApi {
                                     }
                                     if (isGAT.equals("true") || isGAT.equals("TRUE")) {
                                         personPostEntity.setWaybillNumber((String) list2.get(17));
-//                                        personPostEntity.setBackWaybillNumber((String) list2.get(1));
+                                        personPostEntity.setBackWaybillNumber("");
                                         personPostEntity.setOrderNumber((String) list2.get(0));
                                         personPostEntity.setCreateDate((String) list2.get(30));
-//                                        personPostEntity.setOpenid((String) list2.get(4));
-//                                        personPostEntity.setWcPlayOrderNumber((String) list2.get(5));
-//                                        personPostEntity.setPlayState((String) list2.get(6));
+                                        personPostEntity.setOpenid("");
+                                        personPostEntity.setWcPlayOrderNumber("");
+                                        personPostEntity.setPlayState("");
                                         personPostEntity.setOrderState((String) list2.get(4));
                                         personPostEntity.setApplicantName((String) list2.get(47));
                                         if ("".equals(replaceDate((String)list2.get(48)))){
@@ -165,20 +165,20 @@ public class ReadExcelApi {
                                         personPostEntity.setRecipientPhone((String) list2.get(25));
                                         personPostEntity.setRecipientAddress((String) list2.get(26) + list2.get(27)
                                                 + list2.get(28) + list2.get(29));
-//                                        personPostEntity.setOrderBlankNumber("");
+                                        personPostEntity.setOrderBlankNumber("");
                                         personPostEntity.setGetToProvince((String) list2.get(26));
                                         personPostEntity.setGetToCity((String) list2.get(27));
                                         personPostEntity.setGetToCounty((String) list2.get(28));
                                         personPostEntity.setBusinessType((String) list2.get(1));
                                         //todo 格口信息
-//                                        personPostEntity.setLatticeMouthInformation((String) list2.get(21));
+                                        personPostEntity.setLatticeMouthInformation("");
                                         //内件性质
-//                                        personPostEntity.setNatureOfTheInternal((String) list2.get(22));
+                                        personPostEntity.setNatureOfTheInternal("");
                                         //内件信息
-//                                        personPostEntity.setNatureOfTheInformation((String) list2.get(23));
+                                        personPostEntity.setNatureOfTheInformation("");
                                         personPostEntity.setFirstWhite((String) list2.get(46));
                                         personPostEntity.setFileId(fileNameDicEntity.getFileId());
-//                                        personPostEntity.setGk(gkMap);
+                                        personPostEntity.setGk(0L);
                                     } else {
                                         personPostEntity.setWaybillNumber((String) list2.get(0));
                                         personPostEntity.setBackWaybillNumber((String) list2.get(1));

src/main/java/com/yxproject/start/api/ReadXmlApi.java

@@ -37,11 +37,15 @@ import java.util.*;
 @RestController
 @RequestMapping("importXML")
 public class ReadXmlApi {
-    @Autowired
-    private ImportXmlService importXmlService;
+
+    private final ImportXmlService importXmlService;
 
     Logger logger = Logger.getLogger(ReadXmlApi.class);
 
+    public ReadXmlApi(ImportXmlService importXmlService) {
+        this.importXmlService = importXmlService;
+    }
+
     /**
      * 导入检测XML
      *
@@ -49,13 +53,11 @@ public class ReadXmlApi {
      * @param requ 获得请求
      * @return 成功返回 上传完成 失败返回 异常信息
      */
-
     @RequestMapping("getXMLToCheck")
     @Consumes(MediaType.MULTIPART_FORM_DATA)
     @Produces(MediaType.APPLICATION_JSON)
     @Transactional(rollbackFor = Exception.class)
     public Map<String,Object> getXMLToCheck(@Context HttpServletResponse resp, HttpServletRequest requ) {
-        YXJSONResponse yxresp = new YXJSONResponse();
         Map<String,Object> map = new HashMap<>();
         List<String> errList = new ArrayList<>();
         String remoteAddr = requ.getRemoteAddr();
@@ -74,7 +76,7 @@ public class ReadXmlApi {
         // 将普通属性存入map中，之后调用
         Date date = new Date();
         try {
-            //将当前上下文初始化给  CommonsMutipartResolver （多部分解析器）
+            //将当前上下文初始化给  CommonsMultipartResolver （多部分解析器）
             CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver(
                     requ.getServletContext());
             // 判断是否是多数据段提交格式
@@ -83,7 +85,7 @@ public class ReadXmlApi {
                 Iterator<String> iter = multiRequest.getFileNames();
                 while (iter.hasNext()) {
                     logger.info("开始获取整体文件信息！ "+System.currentTimeMillis());
-                    List<MultipartFile> fileRows = multiRequest.getFiles(iter.next().toString());
+                    List<MultipartFile> fileRows = multiRequest.getFiles(iter.next());
                     for (MultipartFile item : fileRows) {
                         try {
                             // 如果fileitem中封装的是普通输入项的数据
@@ -105,7 +107,6 @@ public class ReadXmlApi {
                             logger.error("存储"+filename+"文件完成！ "+System.currentTimeMillis());
                             if (!aBoolean){
                                 errList.add("上传文件名：" + filename+"，文件上传失败");
-                                continue;
                             }
                         } catch (UnsupportedEncodingException e) {
                             e.printStackTrace();

src/main/java/com/yxproject/start/entity/PersonPostEntity.java

@@ -96,6 +96,9 @@ public class PersonPostEntity {
     @Basic@Column(name = "GK")
     private Long gk;
 
+    public void setGk(Long gk) {
+        this.gk = gk;
+    }
     /**
      * 设置格口 0-5 截取excel中格口(010-010-B14-214)第三段 判断对应的格口序号
      *