开发OTA备案工具-车辆升级

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

@@ -102,4 +102,8 @@ public class OtaBaCxAqcs implements Serializable {
     @TableField(exist = false)
     private List<AttachmentEO> zmclList = new ArrayList<>();
 
+    public void addZmcl(AttachmentEO zmcl) {
+        this.zmclList.add(zmcl);
+    }
+
 }

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

@@ -36,91 +36,127 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 public class OtaBaCxZxsjyq implements Serializable {
     private static final long serialVersionUID = 1L;
 
-	/**主键*/
+    /**
+     * 主键
+     */
     @TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
     private java.lang.String id;
 
-	/**创建人*/
+    /**
+     * 创建人
+     */
     @ApiModelProperty(value = "创建人")
     private java.lang.String createBy;
 
-	/**创建日期*/
+    /**
+     * 创建日期
+     */
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建日期")
     private java.util.Date createTime;
 
-	/**更新人*/
+    /**
+     * 更新人
+     */
     @ApiModelProperty(value = "更新人")
     private java.lang.String updateBy;
 
-	/**更新日期*/
+    /**
+     * 更新日期
+     */
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新日期")
     private java.util.Date updateTime;
 
-	/**所属部门*/
+    /**
+     * 所属部门
+     */
     @ApiModelProperty(value = "所属部门")
     private java.lang.String sysOrgCode;
 
-	/**otaId*/
+    /**
+     * otaId
+     */
     @Excel(name = "otaId", width = 15)
     @ApiModelProperty(value = "otaId")
     private java.lang.String otaId;
 
-	/**保护升级包*/
+    /**
+     * 保护升级包
+     */
     @Excel(name = "保护升级包", width = 15)
     @ApiModelProperty(value = "保护升级包")
     private java.lang.String bhsjb;
 
-	/**保护车辆版本*/
+    /**
+     * 保护车辆版本
+     */
     @Excel(name = "保护车辆版本", width = 15)
     @ApiModelProperty(value = "保护车辆版本")
     private java.lang.String bhclbb;
 
-	/**车辆更新能力*/
+    /**
+     * 车辆更新能力
+     */
     @Excel(name = "车辆更新能力", width = 15)
     @ApiModelProperty(value = "车辆更新能力")
     private java.lang.String clgxnl;
 
-	/**车辆升级条件*/
+    /**
+     * 车辆升级条件
+     */
     @Excel(name = "车辆升级条件", width = 15)
     @ApiModelProperty(value = "车辆升级条件")
     private java.lang.String clsjtj;
 
-	/**车辆升级所需电量*/
+    /**
+     * 车辆升级所需电量
+     */
     @Excel(name = "车辆升级所需电量", width = 15)
     @ApiModelProperty(value = "车辆升级所需电量")
     private java.lang.String clsjdl;
 
-	/**升级保护车辆安全*/
+    /**
+     * 升级保护车辆安全
+     */
     @Excel(name = "升级保护车辆安全", width = 15)
     @ApiModelProperty(value = "升级保护车辆安全")
     private java.lang.String sjbhaq;
 
-	/**升级所满足的安全条件*/
+    /**
+     * 升级所满足的安全条件
+     */
     @Excel(name = "升级所满足的安全条件", width = 15)
     @ApiModelProperty(value = "升级所满足的安全条件")
     private java.lang.String sjantj;
 
-	/**升级失败安全状态*/
+    /**
+     * 升级失败安全状态
+     */
     @Excel(name = "升级失败安全状态", width = 15)
     @ApiModelProperty(value = "升级失败安全状态")
     private java.lang.String sjsbaq;
 
-	/**升级公告*/
+    /**
+     * 升级公告
+     */
     @Excel(name = "升级公告", width = 15)
     @ApiModelProperty(value = "升级公告")
     private java.lang.String sjgg;
 
-	/**升级结果状态*/
+    /**
+     * 升级结果状态
+     */
     @Excel(name = "升级结果状态", width = 15)
     @ApiModelProperty(value = "升级结果状态")
     private java.lang.String sjzt;
 
-	/**证明材料*/
+    /**
+     * 证明材料
+     */
     @Excel(name = "证明材料", width = 15)
     @ApiModelProperty(value = "证明材料")
     private java.lang.String zmcl;
@@ -128,4 +164,7 @@ public class OtaBaCxZxsjyq implements Serializable {
     @TableField(exist = false)
     private List<AttachmentEO> zmclList = new ArrayList<>();
 
+    public void addZmcl(AttachmentEO zmcl) {
+        this.zmclList.add(zmcl);
+    }
 }

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

@@ -79,13 +79,14 @@ public class OtaBaCxAqcsServiceImpl extends ServiceImpl<OtaBaCxAqcsMapper, OtaBa
                 otaBaCxAqcs.setCreateTime(now);
             }
             otaBaCxAqcs.setUpdateTime(now);
-            otaBaCxAqcs.setZmcl("");
             if (null != otaBaCxAqcs.getZmclList() && otaBaCxAqcs.getZmclList().size() > 0) {
                 JSONArray obj = new JSONArray();
                 for (AttachmentEO aeo : otaBaCxAqcs.getZmclList()) {
                     obj.add(aeo);
                 }
                 otaBaCxAqcs.setZmcl(obj.toString());
+            }else{
+                otaBaCxAqcs.setZmcl("");
             }
             if (ObjectUtils.isNotEmpty(otaBaCxAqcsOld) && StringUtils.isNotEmpty(otaBaCxAqcsOld.getZmcl())) {
                 List<AttachmentEO> aeoList = JSONArray.parseArray(otaBaCxAqcsOld.getZmcl(), AttachmentEO.class);
@@ -265,6 +266,7 @@ public class OtaBaCxAqcsServiceImpl extends ServiceImpl<OtaBaCxAqcsMapper, OtaBa
             aeo.setId(f.getId());
             aeo.setFileName(f.getFileName());
             obj.add(aeo);
+            aqcs.addZmcl(aeo);
         }
         aqcs.setZmcl(obj.toString());
         return aqcs;

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

@@ -340,7 +340,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
 
         Row row = s.getRow(2);
         Cell cell = row.getCell(2);
-        bass.setJsfzczjPz(ImportFileUtil.getCellValueYesOrNoInt(cell, wb));
+        bass.setJgldPz(ImportFileUtil.getCellValueYesOrNoInt(cell, wb));
         row = s.getRow(2);
         cell = row.getCell(4);
         bass.setJgldSl(ImportFileUtil.getCellValue(cell, wb));

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

@@ -82,13 +82,14 @@ public class OtaBaCxZxsjyqServiceImpl extends ServiceImpl<OtaBaCxZxsjyqMapper, O
             }
         }
         otaBaCxZxsjyq.setUpdateTime(now);
-        otaBaCxZxsjyq.setZmcl("");
         if (null != otaBaCxZxsjyq.getZmclList() && otaBaCxZxsjyq.getZmclList().size() > 0) {
             JSONArray obj = new JSONArray();
             for (AttachmentEO aeo : otaBaCxZxsjyq.getZmclList()) {
                 obj.add(aeo);
             }
             otaBaCxZxsjyq.setZmcl(obj.toString());
+        } else {
+            otaBaCxZxsjyq.setZmcl("");
         }
         if (ObjectUtils.isNotEmpty(otaBaCxZxsjyqOld) && StringUtils.isNotEmpty(otaBaCxZxsjyqOld.getZmcl())) {
             List<AttachmentEO> aeoList = JSONArray.parseArray(otaBaCxZxsjyqOld.getZmcl(), AttachmentEO.class);
@@ -271,6 +272,7 @@ public class OtaBaCxZxsjyqServiceImpl extends ServiceImpl<OtaBaCxZxsjyqMapper, O
             aeo.setId(f.getId());
             aeo.setFileName(f.getFileName());
             obj.add(aeo);
+            otaBaCxZxsjyq.addZmcl(aeo);
         }
         otaBaCxZxsjyq.setZmcl(obj.toString());
         return otaBaCxZxsjyq;