开发OTA备案工具-导入导出

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxAqcsController.java

@@ -204,7 +204,10 @@ public class OtaBaCxAqcsController extends JeroController<OtaBaCxAqcs, IOtaBaCxA
                                 @RequestParam(value = "otaId", required = false) String otaId) throws Exception {
         OtaBaCxAqcs res;
         try {
-            res = this.otaBaCxAqcsService.importData(file, otaId, cut);
+            String[] params = otaId.split("\\?");
+            otaId = params[0].equals("null") ? "" : params[0];
+            cut = params[1].replace("cut=", "");
+            res = this.otaBaCxAqcsService.importData(file, params[0], cut);
         } catch (Exception e) {
             e.printStackTrace();
             return Result.error(e.getMessage());

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJbxxController.java

@@ -198,6 +198,9 @@ public class OtaBaCxJbxxController extends JeroController<OtaBaCxJbxx, IOtaBaCxJ
                                 @RequestParam(value = "otaId", required = false) String otaId) throws Exception {
         OtaBaCxJbxx res;
         try {
+            String[] params = otaId.split("\\?");
+            otaId = params[0].equals("null") ? "" : params[0];
+            cut = params[1].replace("cut=", "");
             res = this.otaBaCxJbxxService.importData(file, otaId, cut);
         } catch (Exception e) {
             e.printStackTrace();

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJsfzbacsController.java

@@ -200,6 +200,9 @@ public class OtaBaCxJsfzbacsController extends JeroController<OtaBaCxJsfzbacs, I
                                 @RequestParam(value = "cut", required = false) String cut,
                                 @RequestParam(value = "otaId", required = false) String otaId) throws Exception {
         try {
+            String[] params = otaId.split("\\?");
+            otaId = params[0].equals("null") ? "" : params[0];
+            cut = params[1].replace("cut=", "");
             this.otaBaCxJsfzbacsService.importData(file, otaId, cut);
         } catch (Exception e) {
             e.printStackTrace();

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjjsmccsController.java

@@ -201,6 +201,9 @@ public class OtaBaCxKsjjsmccsController extends JeroController<OtaBaCxKsjjsmccs,
                                 @RequestParam(value = "cut", required = false) String cut,
                                 @RequestParam(value = "otaId", required = false) String otaId) throws Exception {
         try {
+            String[] params = otaId.split("\\?");
+            otaId = params[0].equals("null") ? "" : params[0];
+            cut = params[1].replace("cut=", "");
             this.otaBaCxKsjjsmccsService.importData(file, otaId, cut);
         } catch (Exception e) {
             e.printStackTrace();

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjxtmccsController.java

@@ -203,6 +203,9 @@ public class OtaBaCxKsjxtmccsController extends JeroController<OtaBaCxKsjxtmccs,
                                 @RequestParam(value = "cut", required = false) String cut,
                                 @RequestParam(value = "otaId", required = false) String otaId) throws Exception {
         try {
+            String[] params = otaId.split("\\?");
+            otaId = params[0].equals("null") ? "" : params[0];
+            cut = params[1].replace("cut=", "");
             this.otaBaCxKsjxtmccsService.importData(file, otaId, cut);
         } catch (Exception e) {
             e.printStackTrace();

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxZxsjyqController.java

@@ -199,6 +199,9 @@ public class OtaBaCxZxsjyqController extends JeroController<OtaBaCxZxsjyq, IOtaB
                                 @RequestParam(value = "otaId", required = false) String otaId) throws Exception {
         OtaBaCxZxsjyq res;
         try {
+            String[] params = otaId.split("\\?");
+            otaId = params[0].equals("null") ? "" : params[0];
+            cut = params[1].replace("cut=", "");
             res = this.otaBaCxZxsjyqService.importData(file, otaId, cut);
         } catch (Exception e) {
             e.printStackTrace();

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxJsfzbacs.java

@@ -68,35 +68,35 @@ public class OtaBaCxJsfzbacs implements Serializable {
     @ApiModelProperty(value = "otaid")
     private java.lang.String otaId;
 
-	/**网络安全要求配置*/
-	@Excel(name = "网络安全要求配置", width = 15)
-    @ApiModelProperty(value = "网络安全要求配置")
-    private java.lang.String wlaqyqPz;
+	/**激光雷达配置*/
+	@Excel(name = "激光雷达配置", width = 15)
+    @ApiModelProperty(value = "激光雷达配置")
+    private java.lang.Integer jgldPz;
 
-	/**网络安全要求数量*/
-	@Excel(name = "网络安全要求数量", width = 15)
-    @ApiModelProperty(value = "网络安全要求数量")
-    private java.lang.String wlaqyqSl;
+	/**激光雷达数量*/
+	@Excel(name = "激光雷达数量", width = 15)
+    @ApiModelProperty(value = "激光雷达数量")
+    private java.lang.String jgldSl;
 
-	/**网络安全要求布置位置*/
-	@Excel(name = "网络安全要求布置位置", width = 15)
-    @ApiModelProperty(value = "网络安全要求布置位置")
-    private java.lang.String wlaqyqBzwz;
+	/**激光雷达布置位置*/
+	@Excel(name = "激光雷达布置位置", width = 15)
+    @ApiModelProperty(value = "激光雷达布置位置")
+    private java.lang.String jgldBzwz;
 
-	/**网络安全要求规格型号*/
-	@Excel(name = "网络安全要求规格型号", width = 15)
-    @ApiModelProperty(value = "网络安全要求规格型号")
-    private java.lang.String wlaqyqGgxh;
+	/**激光雷达规格型号*/
+	@Excel(name = "激光雷达规格型号", width = 15)
+    @ApiModelProperty(value = "激光雷达规格型号")
+    private java.lang.String jgldGgxh;
 
-	/**网络安全要求生产企业*/
-	@Excel(name = "网络安全要求生产企业", width = 15)
-    @ApiModelProperty(value = "网络安全要求生产企业")
-    private java.lang.String wlaqyqScqy;
+	/**激光雷达生产企业*/
+	@Excel(name = "激光雷达生产企业", width = 15)
+    @ApiModelProperty(value = "激光雷达生产企业")
+    private java.lang.String jgldScqy;
 
 	/**毫米波雷达配置*/
 	@Excel(name = "毫米波雷达配置", width = 15)
     @ApiModelProperty(value = "毫米波雷达配置")
-    private java.lang.String hmbldPz;
+    private java.lang.Integer hmbldPz;
 
 	/**毫米波雷达数量*/
 	@Excel(name = "毫米波雷达数量", width = 15)
@@ -121,7 +121,7 @@ public class OtaBaCxJsfzbacs implements Serializable {
 	/**超声波雷达配置*/
 	@Excel(name = "超声波雷达配置", width = 15)
     @ApiModelProperty(value = "超声波雷达配置")
-    private java.lang.String csbldPz;
+    private java.lang.Integer csbldPz;
 
 	/**超声波雷达数量*/
 	@Excel(name = "超声波雷达数量", width = 15)
@@ -146,7 +146,7 @@ public class OtaBaCxJsfzbacs implements Serializable {
 	/**摄像头倒车影像/(环视)配置*/
 	@Excel(name = "摄像头倒车影像/(环视)配置", width = 15)
     @ApiModelProperty(value = "摄像头倒车影像/(环视)配置")
-    private java.lang.String sxthsPz;
+    private java.lang.Integer sxthsPz;
 
 	/**摄像头倒车影像/(环视)数量*/
 	@Excel(name = "摄像头倒车影像/(环视)数量", width = 15)
@@ -171,7 +171,7 @@ public class OtaBaCxJsfzbacs implements Serializable {
 	/**摄像头单双多目配置*/
 	@Excel(name = "摄像头单双多目配置", width = 15)
     @ApiModelProperty(value = "摄像头单双多目配置")
-    private java.lang.String sxtdsdPz;
+    private java.lang.Integer sxtdsdPz;
 
 	/**摄像头单双多目数量*/
 	@Excel(name = "摄像头单双多目数量", width = 15)
@@ -196,7 +196,7 @@ public class OtaBaCxJsfzbacs implements Serializable {
 	/**驾驶员监控摄像头配置*/
 	@Excel(name = "驾驶员监控摄像头配置", width = 15)
     @ApiModelProperty(value = "驾驶员监控摄像头配置")
-    private java.lang.String jsyjkPz;
+    private java.lang.Integer jsyjkPz;
 
 	/**驾驶员监控摄像头数量*/
 	@Excel(name = "驾驶员监控摄像头数量", width = 15)
@@ -221,7 +221,7 @@ public class OtaBaCxJsfzbacs implements Serializable {
 	/**驾驶员监控红外传感器配置*/
 	@Excel(name = "驾驶员监控红外传感器配置", width = 15)
     @ApiModelProperty(value = "驾驶员监控红外传感器配置")
-    private java.lang.String jsyhwPz;
+    private java.lang.Integer jsyhwPz;
 
 	/**驾驶员监控红外传感器数量*/
 	@Excel(name = "驾驶员监控红外传感器数量", width = 15)
@@ -246,7 +246,7 @@ public class OtaBaCxJsfzbacs implements Serializable {
 	/**车载卫星定位设备配置*/
 	@Excel(name = "车载卫星定位设备配置", width = 15)
     @ApiModelProperty(value = "车载卫星定位设备配置")
-    private java.lang.String czwxdwPz;
+    private java.lang.Integer czwxdwPz;
 
 	/**车载卫星定位设备规格型号*/
 	@Excel(name = "车载卫星定位设备规格型号", width = 15)
@@ -261,7 +261,7 @@ public class OtaBaCxJsfzbacs implements Serializable {
 	/**惯性导航系统配置*/
 	@Excel(name = "惯性导航系统配置", width = 15)
     @ApiModelProperty(value = "惯性导航系统配置")
-    private java.lang.String gxdhPz;
+    private java.lang.Integer gxdhPz;
 
 	/**惯性导航系统规格型号*/
 	@Excel(name = "惯性导航系统规格型号", width = 15)
@@ -276,7 +276,7 @@ public class OtaBaCxJsfzbacs implements Serializable {
 	/**轮速计配置*/
 	@Excel(name = "轮速计配置", width = 15)
     @ApiModelProperty(value = "轮速计配置")
-    private java.lang.String lsjPz;
+    private java.lang.Integer lsjPz;
 
 	/**轮速计规格型号*/
 	@Excel(name = "轮速计规格型号", width = 15)
@@ -291,7 +291,7 @@ public class OtaBaCxJsfzbacs implements Serializable {
 	/**高精度地图配置*/
 	@Excel(name = "高精度地图配置", width = 15)
     @ApiModelProperty(value = "高精度地图配置")
-    private java.lang.String gjddtPz;
+    private java.lang.Integer gjddtPz;
 
 	/**高精度地图规格型号*/
 	@Excel(name = "高精度地图规格型号", width = 15)
@@ -306,7 +306,7 @@ public class OtaBaCxJsfzbacs implements Serializable {
 	/**电子围栏配置*/
 	@Excel(name = "电子围栏配置", width = 15)
     @ApiModelProperty(value = "电子围栏配置")
-    private java.lang.String dzwlPz;
+    private java.lang.Integer dzwlPz;
 
 	/**电子围栏*/
 	@Excel(name = "电子围栏", width = 15)
@@ -316,7 +316,7 @@ public class OtaBaCxJsfzbacs implements Serializable {
 	/**车载通信系统配置*/
 	@Excel(name = "车载通信系统配置", width = 15)
     @ApiModelProperty(value = "车载通信系统配置")
-    private java.lang.String cztxPz;
+    private java.lang.Integer cztxPz;
 
 	/**车载通信系统系统名称*/
 	@Excel(name = "车载通信系统系统名称", width = 15)
@@ -346,7 +346,7 @@ public class OtaBaCxJsfzbacs implements Serializable {
 	/**驾驶辅助功能操纵件配置*/
 	@Excel(name = "驾驶辅助功能操纵件配置", width = 15)
     @ApiModelProperty(value = "驾驶辅助功能操纵件配置")
-    private java.lang.String jsfzczjPz;
+    private java.lang.Integer jsfzczjPz;
 
 	/**驾驶辅助功能操纵件名称*/
 	@Excel(name = "驾驶辅助功能操纵件名称", width = 15)
@@ -366,7 +366,7 @@ public class OtaBaCxJsfzbacs implements Serializable {
 	/**驾驶辅助功能指示器配置*/
 	@Excel(name = "驾驶辅助功能指示器配置", width = 15)
     @ApiModelProperty(value = "驾驶辅助功能指示器配置")
-    private java.lang.String jsfzzsqPz;
+    private java.lang.Integer jsfzzsqPz;
 
 	/**驾驶辅助功能指示器名称*/
 	@Excel(name = "驾驶辅助功能指示器名称", width = 15)
@@ -386,7 +386,7 @@ public class OtaBaCxJsfzbacs implements Serializable {
 	/**方向盘脱手提示器配置*/
 	@Excel(name = "方向盘脱手提示器配置", width = 15)
     @ApiModelProperty(value = "方向盘脱手提示器配置")
-    private java.lang.String fxptstsPz;
+    private java.lang.Integer fxptstsPz;
 
 	/**方向盘脱手提示器名称*/
 	@Excel(name = "方向盘脱手提示器名称", width = 15)
@@ -406,7 +406,7 @@ public class OtaBaCxJsfzbacs implements Serializable {
 	/**驾驶员注意力提醒指示器配置*/
 	@Excel(name = "驾驶员注意力提醒指示器配置", width = 15)
     @ApiModelProperty(value = "驾驶员注意力提醒指示器配置")
-    private java.lang.String jsyzyltsPz;
+    private java.lang.Integer jsyzyltsPz;
 
 	/**驾驶员注意力提醒指示器名称*/
 	@Excel(name = "驾驶员注意力提醒指示器名称", width = 15)
@@ -426,7 +426,7 @@ public class OtaBaCxJsfzbacs implements Serializable {
 	/**自动驾驶数据记录系统配置*/
 	@Excel(name = "自动驾驶数据记录系统配置", width = 15)
     @ApiModelProperty(value = "自动驾驶数据记录系统配置")
-    private java.lang.String dssadPz;
+    private java.lang.Integer dssadPz;
 
 	/**自动驾驶数据记录系统规格型号*/
 	@Excel(name = "自动驾驶数据记录系统规格型号", width = 15)
@@ -441,7 +441,7 @@ public class OtaBaCxJsfzbacs implements Serializable {
 	/**事件数据记录系统配置*/
 	@Excel(name = "事件数据记录系统配置", width = 15)
     @ApiModelProperty(value = "事件数据记录系统配置")
-    private java.lang.String edrPz;
+    private java.lang.Integer edrPz;
 
 	/**事件数据记录系统规格型号*/
 	@Excel(name = "事件数据记录系统规格型号", width = 15)
@@ -457,7 +457,7 @@ public class OtaBaCxJsfzbacs implements Serializable {
 
     }
 
-    public OtaBaCxJsfzbacs(String id, String createBy, Date createTime, String updateBy, Date updateTime, String sysOrgCode, String otaId, String wlaqyqPz, String wlaqyqSl, String wlaqyqBzwz, String wlaqyqGgxh, String wlaqyqScqy, String hmbldPz, String hmbldSl, String hmbldBzwz, String hmbldGgxh, String hmbldScqy, String csbldPz, String csbldSl, String csbldBzwz, String csbldGgxh, String csbldScqy, String sxthsPz, String sxthsSl, String sxthsBzwz, String sxthsGgxh, String sxthsScqy, String sxtdsdPz, String sxtdsdSl, String sxtdsdBzwz, String sxtdsdGgxh, String sxtdsdScqy, String jsyjkPz, String jsyjkSl, String jsyjkBzwz, String jsyjkGgxh, String jsyjkScqy, String jsyhwPz, String jsyhwSl, String jsyhwBzwz, String jsyhwGgxh, String jsyhwScqy, String czwxdwPz, String czwxdwGgxh, String czwxdwScqy, String gxdhPz, String gxdhGgxh, String gxdhScqy, String lsjPz, String lsjGgxh, String lsjScqy, String gjddtPz, String gjddtGgxh, String gjddtScqy, String dzwlPz, String dzwlDxxgcs, String cztxPz, String cztxXtmc, String cztxGgxh, String cztxScqy, String cztxBbh, String cztxKfqy, String jsfzczjPz, String jsfzczjMc, String jsfzczjYjxh, String jsfzczjScqy, String jsfzzsqPz, String jsfzzsqMc, String jsfzzsqYjxh, String jsfzzsqScqy, String fxptstsPz, String fxptstsMc, String fxptstsYjxh, String fxptstsScqy, String jsyzyltsPz, String jsyzyltsMc, String jsyzyltsYjxh, String jsyzyltsScqy, String dssadPz, String dssadGgxh, String dssadScqy, String edrPz, String edrGgxh, String edrScqy) {
+    public OtaBaCxJsfzbacs(String id, String createBy, Date createTime, String updateBy, Date updateTime, String sysOrgCode, String otaId, int jgldPz, String jgldSl, String jgldBzwz, String jgldGgxh, String jgldScqy, int hmbldPz, String hmbldSl, String hmbldBzwz, String hmbldGgxh, String hmbldScqy, int csbldPz, String csbldSl, String csbldBzwz, String csbldGgxh, String csbldScqy, int sxthsPz, String sxthsSl, String sxthsBzwz, String sxthsGgxh, String sxthsScqy, int sxtdsdPz, String sxtdsdSl, String sxtdsdBzwz, String sxtdsdGgxh, String sxtdsdScqy, int jsyjkPz, String jsyjkSl, String jsyjkBzwz, String jsyjkGgxh, String jsyjkScqy, int jsyhwPz, String jsyhwSl, String jsyhwBzwz, String jsyhwGgxh, String jsyhwScqy, int czwxdwPz, String czwxdwGgxh, String czwxdwScqy, int gxdhPz, String gxdhGgxh, String gxdhScqy, int lsjPz, String lsjGgxh, String lsjScqy, int gjddtPz, String gjddtGgxh, String gjddtScqy, int dzwlPz, String dzwlDxxgcs, int cztxPz, String cztxXtmc, String cztxGgxh, String cztxScqy, String cztxBbh, String cztxKfqy, int jsfzczjPz, String jsfzczjMc, String jsfzczjYjxh, String jsfzczjScqy, int jsfzzsqPz, String jsfzzsqMc, String jsfzzsqYjxh, String jsfzzsqScqy, int fxptstsPz, String fxptstsMc, String fxptstsYjxh, String fxptstsScqy, int jsyzyltsPz, String jsyzyltsMc, String jsyzyltsYjxh, String jsyzyltsScqy, int dssadPz, String dssadGgxh, String dssadScqy, int edrPz, String edrGgxh, String edrScqy) {
         this.id = id;
         this.createBy = createBy;
         this.createTime = createTime;
@@ -465,11 +465,11 @@ public class OtaBaCxJsfzbacs implements Serializable {
         this.updateTime = updateTime;
         this.sysOrgCode = sysOrgCode;
         this.otaId = otaId;
-        this.wlaqyqPz = wlaqyqPz;
-        this.wlaqyqSl = wlaqyqSl;
-        this.wlaqyqBzwz = wlaqyqBzwz;
-        this.wlaqyqGgxh = wlaqyqGgxh;
-        this.wlaqyqScqy = wlaqyqScqy;
+        this.jgldPz = jgldPz;
+        this.jgldSl = jgldSl;
+        this.jgldBzwz = jgldBzwz;
+        this.jgldGgxh = jgldGgxh;
+        this.jgldScqy = jgldScqy;
         this.hmbldPz = hmbldPz;
         this.hmbldSl = hmbldSl;
         this.hmbldBzwz = hmbldBzwz;

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java

@@ -65,11 +65,11 @@ public enum OtaTitleEnum {
     CSYZSJ("csyzsj", "初始软件包的完整性验证数据", "0"),
     FJ("fj", "附件", "0"),
 
-    WLAQYQ_PZ("wlaqyqPz", "网络安全要求配置", "2"),
-    WLAQYQ_SL("wlaqyqSl", "网络安全要求数量", "0"),
-    WLAQYQ_BZWZ("wlaqyqBzwz", "网络安全要求布置位置", "0"),
-    WLAQYQ_GGXH("wlaqyqGgxh", "网络安全要求规格型号", "0"),
-    WLAQYQ_SCQY("wlaqyqScqy", "网络安全要求生产企业", "0"),
+    WLAQYQ_PZ("jgldPz", "激光雷达配置", "2"),
+    WLAQYQ_SL("jgldSl", "激光雷达数量", "0"),
+    WLAQYQ_BZWZ("jgldBzwz", "激光雷达布置位置", "0"),
+    WLAQYQ_GGXH("jgldGgxh", "激光雷达规格型号", "0"),
+    WLAQYQ_SCQY("jgldScqy", "激光雷达生产企业", "0"),
     HMBLD_PZ("hmbldPz", "毫米波雷达配置", "2"),
     HMBLD_SL("hmbldSl", "毫米波雷达数量", "0"),
     HMBLD_BZWZ("hmbldBzwz", "毫米波雷达布置位置", "0"),

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java

@@ -5,9 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.exception.JeroBootException;
-import com.jero.modules.ota.entity.OtaBaCxJsfzbacs;
-import com.jero.modules.ota.entity.OtaBaCxSjmk;
-import com.jero.modules.ota.entity.OtaBaCxTxjl;
+import com.jero.modules.ota.entity.*;
 import com.jero.modules.ota.enums.OtaModuleEnum;
 import com.jero.modules.ota.enums.OtaTitleEnum;
 import com.jero.modules.ota.mapper.OtaBaCxJsfzbacsMapper;
@@ -18,6 +16,11 @@ import com.jero.modules.ota.utils.ComparisonUtil;
 import com.jero.modules.ota.utils.ImportFileUtil;
 import com.jero.modules.system.service.ISysDictService;
 import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -60,12 +63,12 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
     public void add(JSONObject json) {
         OtaBaCxJsfzbacs otaBaCxJsfzbacs = new OtaBaCxJsfzbacs();
         String otaId = json.getString("otaId");
-        OtaBaCxJsfzbacs otaBaCxJsfzbacsOld = this.getByOtaId(otaId);
         otaBaCxJsfzbacs.setOtaId(otaId);
         parseBjData(json, otaBaCxJsfzbacs);
         Date now = new Date();
         otaBaCxJsfzbacs.setCreateTime(now);
         otaBaCxJsfzbacs.setUpdateTime(now);
+        OtaBaCxJsfzbacs otaBaCxJsfzbacsOld = this.getByOtaId(otaId);
         ComparisonUtil cu = new ComparisonUtil();
         if (ObjectUtils.isEmpty(otaBaCxJsfzbacsOld)) {
             otaBaCxJsfzbacsOld = new OtaBaCxJsfzbacs();
@@ -251,15 +254,321 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
         if (null == upFile) {
             throw new JeroBootException("请上传正确的文件");
         }
-        JSONObject json = parseFile(upFile, otaId, cut);
+        OtaBaCxJsfzbacs basc = parseFile(upFile, otaId, cut);
+        Date now = new Date();
+        basc.setCreateTime(now);
+        basc.setUpdateTime(now);
+        OtaBaCxJsfzbacs otaBaCxJsfzbacsOld = this.getByOtaId(otaId);
+        ComparisonUtil cu = new ComparisonUtil();
+        if (ObjectUtils.isEmpty(otaBaCxJsfzbacsOld)) {
+            otaBaCxJsfzbacsOld = new OtaBaCxJsfzbacs();
+        }
+        List<OtaBaCxTxjl> reList = cu.comparisonRecord(otaId, OtaModuleEnum.CX_JSFZXTJCBACS, otaBaCxJsfzbacsOld, basc, sysDictService);
+        saveOrUpdate(basc);
+
+        List<OtaBaCxSjmk> oldList = OtaBaCxSjmkService.queryByOtaId(otaId);
+        OtaBaCxSjmkService.deleteByOtaId(otaId);
+        List<OtaBaCxSjmk> sjmkList = parseList(upFile, otaId, cut);
+        reList.addAll(cu.comparisonListRecord(otaId, OtaModuleEnum.CX_JSFZXTJCBACS, OtaTitleEnum.BJMC.getName(), oldList, sjmkList, sysDictService));
+        OtaBaCxSjmkService.saveOrUpdateBatch(sjmkList);
+        otaBaCxTxjlService.saveBatch(reList);
     }
 
-    private JSONObject parseFile(File upFile, String otaId, String cut) {
-        JSONObject jsonObj = new JSONObject();
-        jsonObj.put("otaId",otaId);
+    private List<OtaBaCxSjmk> parseList(File upFile, String otaId, String cut) throws Exception {
+        Date now = new Date();
+        List<OtaBaCxSjmk> sjmkList = new ArrayList<>();
+        Workbook wb = ImportFileUtil.readExcel(upFile);
+        Sheet s = wb.getSheetAt(0);
+        int rows = s.getPhysicalNumberOfRows();
+        for (int i = 63; i < rows; i++) {
+            Row row = s.getRow(i);
+            Cell cell = row.getCell(0);
+            String str = ImportFileUtil.getCellValue(cell, wb);
+            OtaBaCxSjmk sjmk = new OtaBaCxSjmk();
+            if (StringUtils.isEmpty(str)) {
+                //列表数据数量，部件名称为空时结束
+                break;
+            } else {
+                sjmk.setOtaId(otaId);
+                sjmk.setCreateTime(now);
+                sjmk.setBjmc(str);
+                cell = row.getCell(1);
+                sjmk.setPzqk(ImportFileUtil.getCellValueYesOrNo(cell, wb));
+                cell = row.getCell(2);
+                sjmk.setKzqmc(ImportFileUtil.getCellValue(cell, wb));
+                cell = row.getCell(3);
+                sjmk.setYjggxh(ImportFileUtil.getCellValue(cell, wb));
+                cell = row.getCell(4);
+                sjmk.setYjscqy(ImportFileUtil.getCellValue(cell, wb));
+                cell = row.getCell(5);
+                sjmk.setRjbb(ImportFileUtil.getCellValue(cell, wb));
+                cell = row.getCell(6);
+                sjmk.setRjkfqy(ImportFileUtil.getCellValue(cell, wb));
+                cell = row.getCell(7);
+                sjmk.setBzwz(ImportFileUtil.getCellValue(cell, wb));
+                sjmkList.add(sjmk);
+            }
+        }
+        return sjmkList;
+    }
+
+    private OtaBaCxJsfzbacs parseFile(File upFile, String otaId, String cut) throws Exception {
+        Workbook wb = ImportFileUtil.readExcel(upFile);
+        Sheet s = wb.getSheetAt(0);
+        OtaBaCxJsfzbacs bass = new OtaBaCxJsfzbacs();
+        bass.setOtaId(otaId);
+
+        Row row = s.getRow(2);
+        Cell cell = row.getCell(2);
+        bass.setJsfzczjPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb)));
+        row = s.getRow(2);
+        cell = row.getCell(4);
+        bass.setJgldSl(ImportFileUtil.getCellValue(cell, wb));
+        row = s.getRow(3);
+        cell = row.getCell(4);
+        bass.setJgldBzwz(ImportFileUtil.getCellValue(cell, wb));
+        row = s.getRow(4);
+        cell = row.getCell(4);
+        bass.setJgldGgxh(ImportFileUtil.getCellValue(cell, wb));
+        row = s.getRow(5);
+        cell = row.getCell(4);
+        bass.setJgldScqy(ImportFileUtil.getCellValue(cell, wb));
+
+        row = s.getRow(6);
+        cell = row.getCell(2);
+        bass.setHmbldPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb)));
+        row = s.getRow(6);
+        cell = row.getCell(4);
+        bass.setHmbldSl(ImportFileUtil.getCellValue(cell, wb));
+        row = s.getRow(7);
+        cell = row.getCell(4);
+        bass.setHmbldBzwz(ImportFileUtil.getCellValue(cell, wb));
+        row = s.getRow(8);
+        cell = row.getCell(4);
+        bass.setHmbldGgxh(ImportFileUtil.getCellValue(cell, wb));
+        row = s.getRow(9);
+        cell = row.getCell(4);
+        bass.setHmbldScqy(ImportFileUtil.getCellValue(cell, wb));
 
 
+        row = s.getRow(10);
+        cell = row.getCell(2);
+        bass.setCsbldPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb)));
+        row = s.getRow(10);
+        cell = row.getCell(4);
+        bass.setCsbldSl(ImportFileUtil.getCellValue(cell, wb));
+        row = s.getRow(11);
+        cell = row.getCell(4);
+        bass.setCsbldBzwz(ImportFileUtil.getCellValue(cell, wb));
+        row = s.getRow(12);
+        cell = row.getCell(4);
+        bass.setCsbldGgxh(ImportFileUtil.getCellValue(cell, wb));
+        row = s.getRow(13);
+        cell = row.getCell(4);
+        bass.setCsbldScqy(ImportFileUtil.getCellValue(cell, wb));
 
-        return jsonObj;
+
+        row = s.getRow(14);
+        cell = row.getCell(2);
+        bass.setSxthsPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb)));
+        row = s.getRow(14);
+        cell = row.getCell(4);
+        bass.setSxthsSl(ImportFileUtil.getCellValue(cell, wb));
+        row = s.getRow(15);
+        cell = row.getCell(4);
+        bass.setSxthsBzwz(ImportFileUtil.getCellValue(cell, wb));
+        row = s.getRow(16);
+        cell = row.getCell(4);
+        bass.setSxthsGgxh(ImportFileUtil.getCellValue(cell, wb));
+        row = s.getRow(17);
+        cell = row.getCell(4);
+        bass.setSxthsScqy(ImportFileUtil.getCellValue(cell, wb));
+
+        row = s.getRow(18);
+        cell = row.getCell(2);
+        bass.setSxtdsdPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb)));
+        row = s.getRow(18);
+        cell = row.getCell(4);
+        bass.setSxtdsdSl(ImportFileUtil.getCellValue(cell, wb));
+        row = s.getRow(19);
+        cell = row.getCell(4);
+        bass.setSxtdsdBzwz(ImportFileUtil.getCellValue(cell, wb));
+        row = s.getRow(20);
+        cell = row.getCell(4);
+        bass.setSxtdsdGgxh(ImportFileUtil.getCellValue(cell, wb));
+        row = s.getRow(21);
+        cell = row.getCell(4);
+        bass.setSxtdsdScqy(ImportFileUtil.getCellValue(cell, wb));
+
+        row = s.getRow(22);
+        cell = row.getCell(2);
+        bass.setJsyjkPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb)));
+        row = s.getRow(22);
+        cell = row.getCell(4);
+        bass.setJsyjkSl(ImportFileUtil.getCellValue(cell, wb));
+        row = s.getRow(23);
+        cell = row.getCell(4);
+        bass.setJsyjkBzwz(ImportFileUtil.getCellValue(cell, wb));
+        row = s.getRow(24);
+        cell = row.getCell(4);
+        bass.setJsyjkGgxh(ImportFileUtil.getCellValue(cell, wb));
+        row = s.getRow(25);
+        cell = row.getCell(4);
+        bass.setJsyjkScqy(ImportFileUtil.getCellValue(cell, wb));
+
+        row = s.getRow(26);
+        cell = row.getCell(2);
+        bass.setJsyhwPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb)));
+        row = s.getRow(26);
+        cell = row.getCell(4);
+        bass.setJsyhwSl(ImportFileUtil.getCellValue(cell, wb));
+        row = s.getRow(27);
+        cell = row.getCell(4);
+        bass.setJsyhwBzwz(ImportFileUtil.getCellValue(cell, wb));
+        row = s.getRow(28);
+        cell = row.getCell(4);
+        bass.setJsyhwGgxh(ImportFileUtil.getCellValue(cell, wb));
+        row = s.getRow(29);
+        cell = row.getCell(4);
+        bass.setJsyhwScqy(ImportFileUtil.getCellValue(cell, wb));
+
+        row = s.getRow(30);
+        cell = row.getCell(2);
+        bass.setCzwxdwPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb)));
+        row = s.getRow(30);
+        cell = row.getCell(4);
+        bass.setCzwxdwGgxh(ImportFileUtil.getCellValue(cell, wb));
+        row = s.getRow(31);
+        cell = row.getCell(4);
+        bass.setCzwxdwScqy(ImportFileUtil.getCellValue(cell, wb));
+
+        row = s.getRow(32);
+        cell = row.getCell(2);
+        bass.setGxdhPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb)));
+        row = s.getRow(32);
+        cell = row.getCell(4);
+        bass.setGxdhGgxh(ImportFileUtil.getCellValue(cell, wb));
+        row = s.getRow(33);
+        cell = row.getCell(4);
+        bass.setGxdhScqy(ImportFileUtil.getCellValue(cell, wb));
+
+        row = s.getRow(34);
+        cell = row.getCell(2);
+        bass.setLsjPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb)));
+        row = s.getRow(34);
+        cell = row.getCell(4);
+        bass.setLsjGgxh(ImportFileUtil.getCellValue(cell, wb));
+        row = s.getRow(35);
+        cell = row.getCell(4);
+        bass.setLsjScqy(ImportFileUtil.getCellValue(cell, wb));
+
+        row = s.getRow(36);
+        cell = row.getCell(2);
+        bass.setGjddtPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb)));
+        row = s.getRow(36);
+        cell = row.getCell(4);
+        bass.setGjddtGgxh(ImportFileUtil.getCellValue(cell, wb));
+        row = s.getRow(37);
+        cell = row.getCell(4);
+        bass.setGjddtScqy(ImportFileUtil.getCellValue(cell, wb));
+
+        row = s.getRow(38);
+        cell = row.getCell(2);
+        bass.setDzwlPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb)));
+        row = s.getRow(38);
+        cell = row.getCell(4);
+        bass.setDzwlDxxgcs(ImportFileUtil.getCellValue(cell, wb));
+
+        row = s.getRow(39);
+        cell = row.getCell(2);
+        bass.setCztxPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb)));
+        row = s.getRow(39);
+        cell = row.getCell(4);
+        bass.setCztxXtmc(ImportFileUtil.getCellValue(cell, wb));
+        row = s.getRow(40);
+        cell = row.getCell(4);
+        bass.setCztxGgxh(ImportFileUtil.getCellValue(cell, wb));
+        row = s.getRow(41);
+        cell = row.getCell(4);
+        bass.setCztxScqy(ImportFileUtil.getCellValue(cell, wb));
+        row = s.getRow(42);
+        cell = row.getCell(4);
+        bass.setCztxBbh(ImportFileUtil.getCellValue(cell, wb));
+        row = s.getRow(43);
+        cell = row.getCell(4);
+        bass.setCztxKfqy(ImportFileUtil.getCellValue(cell, wb));
+
+        row = s.getRow(44);
+        cell = row.getCell(2);
+        bass.setJsfzczjPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb)));
+        row = s.getRow(44);
+        cell = row.getCell(4);
+        bass.setJsfzczjMc(ImportFileUtil.getCellValue(cell, wb));
+        row = s.getRow(45);
+        cell = row.getCell(4);
+        bass.setJsfzczjYjxh(ImportFileUtil.getCellValue(cell, wb));
+        row = s.getRow(46);
+        cell = row.getCell(4);
+        bass.setJsfzczjScqy(ImportFileUtil.getCellValue(cell, wb));
+
+        row = s.getRow(47);
+        cell = row.getCell(2);
+        bass.setJsfzzsqPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb)));
+        row = s.getRow(47);
+        cell = row.getCell(4);
+        bass.setJsfzzsqMc(ImportFileUtil.getCellValue(cell, wb));
+        row = s.getRow(48);
+        cell = row.getCell(4);
+        bass.setJsfzzsqYjxh(ImportFileUtil.getCellValue(cell, wb));
+        row = s.getRow(49);
+        cell = row.getCell(4);
+        bass.setJsfzzsqScqy(ImportFileUtil.getCellValue(cell, wb));
+
+        row = s.getRow(50);
+        cell = row.getCell(2);
+        bass.setFxptstsPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb)));
+        row = s.getRow(50);
+        cell = row.getCell(4);
+        bass.setFxptstsMc(ImportFileUtil.getCellValue(cell, wb));
+        row = s.getRow(51);
+        cell = row.getCell(4);
+        bass.setFxptstsYjxh(ImportFileUtil.getCellValue(cell, wb));
+        row = s.getRow(52);
+        cell = row.getCell(4);
+        bass.setFxptstsScqy(ImportFileUtil.getCellValue(cell, wb));
+
+        row = s.getRow(53);
+        cell = row.getCell(2);
+        bass.setJsyzyltsPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb)));
+        row = s.getRow(53);
+        cell = row.getCell(4);
+        bass.setJsyzyltsMc(ImportFileUtil.getCellValue(cell, wb));
+        row = s.getRow(54);
+        cell = row.getCell(4);
+        bass.setJsyzyltsYjxh(ImportFileUtil.getCellValue(cell, wb));
+        row = s.getRow(55);
+        cell = row.getCell(4);
+        bass.setJsyzyltsScqy(ImportFileUtil.getCellValue(cell, wb));
+
+        row = s.getRow(56);
+        cell = row.getCell(2);
+        bass.setDssadPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb)));
+        row = s.getRow(56);
+        cell = row.getCell(4);
+        bass.setDssadGgxh(ImportFileUtil.getCellValue(cell, wb));
+        row = s.getRow(57);
+        cell = row.getCell(4);
+        bass.setDssadScqy(ImportFileUtil.getCellValue(cell, wb));
+
+        row = s.getRow(58);
+        cell = row.getCell(2);
+        bass.setEdrPz(Integer.parseInt(ImportFileUtil.getCellValueYesOrNo(cell, wb)));
+        row = s.getRow(58);
+        cell = row.getCell(4);
+        bass.setEdrGgxh(ImportFileUtil.getCellValue(cell, wb));
+        row = s.getRow(59);
+        cell = row.getCell(4);
+        bass.setEdrScqy(ImportFileUtil.getCellValue(cell, wb));
+        return bass;
     }
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java

@@ -98,6 +98,9 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl<OtaBaCxKsjjsmccsMap
                 otaBaCxJsfzbacs.setUpdateTime(now);
                 newList.add(otaBaCxJsfzbacs);
             }
+            if(ObjectUtils.isEmpty(oldList)){
+                oldList = new ArrayList<>();
+            }
             ComparisonUtil cu = new ComparisonUtil();
             List<OtaBaCxTxjl> reList = cu.comparisonListRecord(otaId, OtaModuleEnum.CX_KZXSJDJSFZGNMCYCS, OtaTitleEnum.GNMC.getName(), oldList, newList, sysDictService);
             saveOrUpdateBatch(newList);
@@ -278,7 +281,6 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl<OtaBaCxKsjjsmccsMap
                 cell = row.getCell(13);
                 mssc.setCsyzsj(ImportFileUtil.getCellValue(cell, wb));
                 mssc.setCreateTime(now);
-                mssc.setUpdateTime(now);
                 mccsList.add(mssc);
             }
         }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java

@@ -69,7 +69,7 @@ public class ComparisonUtil<T> {
                             field.setAccessible(true);
                             Object newVal = field.get(newObj);
                             String newStr = "";
-                            if (ObjectUtils.isNotEmpty(newVal)) {
+                            if (ObjectUtils.isNotEmpty(newVal) && !field.getName().equals(tableField.getName())) {
                                 newStr = newVal.toString();
                                 content = tableField.get(newObj).toString() + "-" + title + "由'空'改为'" + newStr + "'";
                                 resList.add(new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content));
@@ -93,7 +93,7 @@ public class ComparisonUtil<T> {
                     for (T newObj : newList) {
                         if (ObjectUtils.isNotEmpty(newObj)) {
                             Object newId = idField.get(newObj);
-                            if (ObjectUtils.isNotEmpty(newObj) && oldId.equals(newId.toString())) {
+                            if (ObjectUtils.isNotEmpty(newId) && oldId.equals(newId.toString())) {
                                 break;
                             }
                         }