WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改OTA

Browse Source
This commit is contained in:
高嵩
2023-04-13 19:00:10 +08:00
parent 9173375069
commit 68ed12cb9b
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxJbxx.java
+2
View File
@@ -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;
/**通信终端*/
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjSjmbcx.java
+2
View File
@@ -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;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java
+2 -2
View File
@@ -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),
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java
+4 -4
View File
@@ -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();