From 8a8cc6b3c564a441c37c6c586ff2582fc727a302 Mon Sep 17 00:00:00 2001
From: "wenkuan.shi" <wenkuan.shi@xujiesoft.com >
Date: Tue, 18 Jun 2024 17:26:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E4=B8=80=E4=B8=AA=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E7=94=A8=E6=9D=A5=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/reader/entity/EquipmentDataDetail.java   |  1 +
 .../impl/GetInformationForExcelServiceImpl.java      | 12 ++++++++++++
 .../mapper/reader/GetInformationForExcelMapper.xml   |  7 ++++---
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/reader/entity/EquipmentDataDetail.java b/src/main/java/com/xujie/sys/modules/reader/entity/EquipmentDataDetail.java
index 29b6fb85..d3409fe6 100644
--- a/src/main/java/com/xujie/sys/modules/reader/entity/EquipmentDataDetail.java
+++ b/src/main/java/com/xujie/sys/modules/reader/entity/EquipmentDataDetail.java
@@ -31,6 +31,7 @@ public class EquipmentDataDetail {
     private Date createDate;
     private Date createBy;
     private String photoValue1;
+    private int num;
     //批次号
     private int batchNo;
     //文件编号
diff --git a/src/main/java/com/xujie/sys/modules/reader/service/impl/GetInformationForExcelServiceImpl.java b/src/main/java/com/xujie/sys/modules/reader/service/impl/GetInformationForExcelServiceImpl.java
index 654b9b9a..ff93727a 100644
--- a/src/main/java/com/xujie/sys/modules/reader/service/impl/GetInformationForExcelServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/reader/service/impl/GetInformationForExcelServiceImpl.java
@@ -321,6 +321,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
                     }
                 }
                 //对数据进行切割封装
+                int index = 1;
                 for (String info : list) {
                     String[] data = info.split("\t");
                     EquipmentDataDetail equipmentDataDetail = new EquipmentDataDetail();
@@ -341,7 +342,9 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
                     equipmentDataDetail.setValue7(data[7]);
                     equipmentDataDetail.setValue8(data[8]);
                     equipmentDataDetail.setValue9(data[9]);
+                    equipmentDataDetail.setNum(index);
                     equipmentDataDetails.add(equipmentDataDetail);
+                    index++;
                 }
                 bufferedReader.close();
             } catch (IOException e) {
@@ -372,6 +375,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
                 log.info("读取的文件为空,或不是excel格式的");
                 return new ArrayList<>();
             }
+            int index=1;
             //获取TEST后面的两个值
             for (int i = 0; i < list.size(); i++) {
                 if (list.get(i).get(0) == null) {
@@ -388,7 +392,9 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
                     equipmentDataDetail.setCreateDate(new Date());
                     equipmentDataDetail.setValue0(list.get(i).get(1));
                     equipmentDataDetail.setValue1(list.get(i).get(3));
+                    equipmentDataDetail.setNum(index);
                     equipmentDataDetails.add(equipmentDataDetail);
+                    index++;
                 }
             }
         }
@@ -413,6 +419,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
                         list.add(line);
                     }
                 }
+                int index=1;
                 for (String s : list) {
                     EquipmentDataDetail equipmentDataDetail = new EquipmentDataDetail();
                     String[] data = s.split("\t");
@@ -427,7 +434,9 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
                     equipmentDataDetail.setValue1(data[1]);
                     equipmentDataDetail.setValue2(data[2]);
                     equipmentDataDetail.setValue3(data[3]);
+                    equipmentDataDetail.setNum(index);
                     detailList.add(equipmentDataDetail);
+                    index++;
                 }
             } catch (Exception e) {
                 e.printStackTrace();
@@ -439,6 +448,7 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
     //对图片进行保存
     private static List<EquipmentDataDetail> saveImage(List<String> fileName, EquipmentFolderLocation excel, Integer batchNo) {
         List<EquipmentDataDetail> detailList = new ArrayList<>();
+        int index= 1;
         for (String s : fileName) {
             EquipmentDataDetail equipmentDataDetail = new EquipmentDataDetail();
             equipmentDataDetail.setEquipmentNo(excel.getEquipmentNo());
@@ -449,7 +459,9 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
             equipmentDataDetail.setFileNo(excel.getFileNo());
             equipmentDataDetail.setPhotoValue1(s);
             equipmentDataDetail.setCreateDate(new Date());
+            equipmentDataDetail.setNum(index);
             detailList.add(equipmentDataDetail);
+            index++;
         }
         return detailList;
 
diff --git a/src/main/resources/mapper/reader/GetInformationForExcelMapper.xml b/src/main/resources/mapper/reader/GetInformationForExcelMapper.xml
index 7726f2dc..ce30cca0 100644
--- a/src/main/resources/mapper/reader/GetInformationForExcelMapper.xml
+++ b/src/main/resources/mapper/reader/GetInformationForExcelMapper.xml
@@ -18,15 +18,16 @@
         <result column="value9" jdbcType="VARCHAR" property="value9" />
         <result column="create_date" jdbcType="VARCHAR" property="createDate" />
         <result column="create_by" jdbcType="VARCHAR" property="createBy" />
-        <result column="batch_no" jdbcType="VARCHAR" property="batchNo" />
+        <result column="batch_no" jdbcType="INTEGER" property="batchNo" />
         <result column="file_no" jdbcType="VARCHAR" property="fileNo" />
         <result column="photo_value1" jdbcType="VARCHAR" property="fileNo" />
+        <result column="num" jdbcType="INTEGER" property="num" />
     </resultMap>
     <insert id="saveByExcels" parameterType="com.xujie.sys.modules.reader.entity.EquipmentDataDetail">
-        insert into Equipment_data_detail(site,bu_no,equipment_no,item_no,value0,value1,value2,value3,value4,value5,value6,value7,value8,value9,create_date,create_by,batch_no,file_no,photo_value1)
+        insert into Equipment_data_detail(site,bu_no,equipment_no,item_no,value0,value1,value2,value3,value4,value5,value6,value7,value8,value9,create_date,create_by,batch_no,file_no,photo_value1,num)
         values
         <foreach collection="list" item="item" index="index" separator=",">
-            (#{item.site},#{item.buNo},#{item.equipmentNo},#{item.itemNo},#{item.value0},#{item.value1},#{item.value2},#{item.value3},#{item.value4},#{item.value5},#{item.value6},#{item.value7},#{item.value8},#{item.value9},#{item.createDate},#{item.createBy},#{item.batchNo},#{item.fileNo},#{item.photoValue1})
+            (#{item.site},#{item.buNo},#{item.equipmentNo},#{item.itemNo},#{item.value0},#{item.value1},#{item.value2},#{item.value3},#{item.value4},#{item.value5},#{item.value6},#{item.value7},#{item.value8},#{item.value9},#{item.createDate},#{item.createBy},#{item.batchNo},#{item.fileNo},#{item.photoValue1},#{item.num})
         </foreach>
     </insert>
 </mapper>