From 68ed12cb9b68040855e012830c59c866a6b726c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Thu, 13 Apr 2023 19:00:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9OTA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jero/modules/ota/entity/OtaBaCxJbxx.java     | 2 ++
 .../java/com/jero/modules/ota/entity/OtaBaSjSjmbcx.java   | 2 ++
 .../java/com/jero/modules/ota/enums/OtaTitleEnum.java     | 4 ++--
 .../modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java  | 8 ++++----
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxJbxx.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxJbxx.java
index 45a78473a..0f480e27c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxJbxx.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxJbxx.java
@@ -110,11 +110,13 @@ public class OtaBaCxJbxx implements Serializable {
 	/**车辆动力类型1*/
 	@Excel(name = "车辆动力类型1", width = 15)
     @ApiModelProperty(value = "车辆动力类型1")
+    @Dict(dicCode = "vehicle_dynamic_type")
     private java.lang.String dllx1;
 
 	/**车辆动力类型2*/
 	@Excel(name = "车辆动力类型2", width = 15)
     @ApiModelProperty(value = "车辆动力类型2")
+    @Dict(dicCode = "vehicle_dynamic_type1")
     private java.lang.String dllx2;
 
 	/**通信终端*/
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjSjmbcx.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjSjmbcx.java
index 44921fc95..f8bc02a51 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjSjmbcx.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjSjmbcx.java
@@ -104,11 +104,13 @@ public class OtaBaSjSjmbcx implements Serializable {
 	/**车辆动力类型1*/
 	@Excel(name = "车辆动力类型1", width = 15)
     @ApiModelProperty(value = "车辆动力类型1")
+    @Dict(dicCode = "vehicle_dynamic_type")
     private java.lang.String dllx1;
 
 	/**车辆动力类型2*/
 	@Excel(name = "车辆动力类型2", width = 15)
     @ApiModelProperty(value = "车辆动力类型2")
+    @Dict(dicCode = "vehicle_dynamic_type1")
     private java.lang.String dllx2;
 
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java
index d27d120b5..4b5e5cad3 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java
@@ -17,8 +17,8 @@ public enum OtaTitleEnum {
     //    QYMC("qymc", "企业名称", "0","enterprise name ",0),
     DJBH("djbh", "产品登记编号", "0", "Product Registration Number ", 500),
     CPLB("cplb", "产品类别", "product_category", "Product category", 0),
-    DLLX1("dllx1", "车辆动力类型", "0", "Vehicle Power Type", 50),
-    DLLX2("dllx2", "车辆动力类型", "0", "Vehicle Power Type", 50),
+    DLLX1("dllx1", "车辆动力类型", "vehicle_dynamic_type", "Vehicle Power Type", 50),
+    DLLX2("dllx2", "车辆动力类型", "vehicle_dynamic_type1", "Vehicle Power Type", 50),
     TXZD("txzd", "通信终端", "communication_terminal", "communication terminal", 0),
     CDOTASJ("cdotasj", "车端OTA升级管理系统", "0", "OTA Upgrade Management System", 500),
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java
index bef8b2448..db91dd7aa 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java
@@ -268,10 +268,10 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl<OtaBaCxJbxxMapper, OtaBa
         jbxx.setCpxh(ImportFileUtil.getCellValue(cell, wb));
         row = s.getRow(8);
         cell = row.getCell(1);
-        jbxx.setDllx1(ImportFileUtil.getCellValue(cell, wb));
+        jbxx.setDllx1(ImportFileUtil.getCellValueDict(cell, wb, "vehicle_dynamic_type", sysDictService, cut));
         row = s.getRow(9);
         cell = row.getCell(1);
-        jbxx.setDllx2(ImportFileUtil.getCellValue(cell, wb));
+        jbxx.setDllx2(ImportFileUtil.getCellValueDict(cell, wb, "vehicle_dynamic_type1", sysDictService, cut));
         row = s.getRow(10);
         cell = row.getCell(1);
         jbxx.setTxzd(ImportFileUtil.getCellValueDict(cell, wb, "communication_terminal", sysDictService, cut));
@@ -316,10 +316,10 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl<OtaBaCxJbxxMapper, OtaBa
             cell.setCellValue(jbxx.getCpxh());
             row = s.getRow(8);
             cell = row.getCell(1);
-            cell.setCellValue(jbxx.getDllx1());
+            cell.setCellValue(ComparisonUtil.queryDictTextByKey("vehicle_dynamic_type", jbxx.getDllx1(), sysDictService));
             row = s.getRow(9);
             cell = row.getCell(1);
-            cell.setCellValue(jbxx.getDllx2());
+            cell.setCellValue(ComparisonUtil.queryDictTextByKey("vehicle_dynamic_type1", jbxx.getDllx2(), sysDictService));
             row = s.getRow(10);
             cell = row.getCell(1);
             String str = jbxx.getTxzd();