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

修改是否和有无

Browse Source
This commit is contained in:
高嵩
2023-04-02 14:53:25 +08:00
parent c83bbd236a
commit ab38f28e70
5 changed files with 115 additions and 64 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/enums/OtaTitleEnum.java
+20 -20
View File
@@ -55,7 +55,7 @@ public enum OtaTitleEnum {
CZXTBBH("czxtbbh", "软件版本号", "0", "", 50),
GNMC("gnmc", "功能名称", "0", "", 50),
PZQK("pzqk", "配置情况", "2", "", 0),
PZQK("pzqk", "配置情况", "1", "", 0),
JSZDHJB("jszdhjb", "驾驶自动化级别", "driving_automation_level", "", 0),
SJGGCS("sjggcs", "升级可能变更的《公告》技术参数", "0", "", 500),
GNMS("gnms", "功能描述", "0", "", 500),
@@ -64,81 +64,81 @@ public enum OtaTitleEnum {
CSYZSJ("csyzsj", "初始软件包的完整性验证数据", "0", "", 500),
FJ("fj", "附件", "0", "", 0),
WLAQYQ_PZ("jgldPz", "激光雷达-配置", "2", "", 0),
WLAQYQ_PZ("jgldPz", "激光雷达-配置", "1", "", 0),
WLAQYQ_SL("jgldSl", "激光雷达-数量", "0", "", 50),
WLAQYQ_BZWZ("jgldBzwz", "激光雷达-布置位置", "0", "", 50),
WLAQYQ_GGXH("jgldGgxh", "激光雷达-规格型号", "0", "", 0),
WLAQYQ_SCQY("jgldScqy", "激光雷达-生产企业", "0", "", 50),
HMBLD_PZ("hmbldPz", "毫米波雷达-配置", "2", "", 0),
HMBLD_PZ("hmbldPz", "毫米波雷达-配置", "1", "", 0),
HMBLD_SL("hmbldSl", "毫米波雷达-数量", "0", "", 50),
HMBLD_BZWZ("hmbldBzwz", "毫米波雷达-布置位置", "0", "", 50),
HMBLD_GGXH("hmbldGgxh", "毫米波雷达-规格型号", "0", "", 50),
HMBLD_SCQY("hmbldScqy", "毫米波雷达-生产企业", "0", "", 50),
CSBLD_PZ("csbldPz", "超声波雷达-配置", "2", "", 0),
CSBLD_PZ("csbldPz", "超声波雷达-配置", "1", "", 0),
CSBLD_SL("csbldSl", "超声波雷达-数量", "0", "", 50),
CSBLD_BZWZ("csbldBzwz", "超声波雷达-布置位置", "0", "", 50),
CSBLD_GGXH("csbldGgxh", "超声波雷达-规格型号", "0", "", 50),
CSBLD_SCQY("csbldScqy", "超声波雷达-生产企业", "0", "", 50),
SXTHS_PZ("sxthsPz", "摄像头-倒车影像/360(环视)-配置", "2", "", 0),
SXTHS_PZ("sxthsPz", "摄像头-倒车影像/360(环视)-配置", "1", "", 0),
SXTHS_SL("sxthsSl", "摄像头-倒车影像/360(环视)-数量", "0", "", 50),
SXTHS_BZWZ("sxthsBzwz", "摄像头-倒车影像/360(环视)-布置位置", "0", "", 50),
SXTHS_GGXH("sxthsGgxh", "摄像头-倒车影像/360(环视)-规格型号", "0", "", 50),
SXTHS_SCQY("sxthsScqy", "摄像头-倒车影像/360(环视)-生产企业", "0", "", 50),
SXTDSD_PZ("sxtdsdPz", "摄像头-单目/双目/多目-配置", "2", "", 50),
SXTDSD_PZ("sxtdsdPz", "摄像头-单目/双目/多目-配置", "1", "", 50),
SXTDSD_SL("sxtdsdSl", "摄像头-单目双目多目-数量", "0", "", 50),
SXTDSD_BZWZ("sxtdsdBzwz", "摄像头-单目双多目-布置位置", "0", "", 50),
SXTDSD_GGXH("sxtdsdGgxh", "摄像头-单目/双目/多目-规格型号", "0", "", 50),
SXTDSD_SCQY("sxtdsdScqy", "摄像头-单目/双目/多目-生产企业", "0", "", 50),
JSYJK_PZ("jsyjkPz", "驾驶员注意力监测系统DMS-驾驶员监控摄像头-配置", "2", "", 0),
JSYJK_PZ("jsyjkPz", "驾驶员注意力监测系统DMS-驾驶员监控摄像头-配置", "1", "", 0),
JSYJK_SL("jsyjkSl", "驾驶员注意力监测系统DMS-驾驶员监控摄像头-数量", "0", "", 50),
JSYJK_BZWZ("jsyjkBzwz", "驾驶员注意力监测系统DMS-驾驶员监控摄像头-布置位置", "0", "", 50),
JSYJK_GGXH("jsyjkGgxh", "驾驶员注意力监测系统DMS-驾驶员监控摄像头-规格型号", "0", "", 50),
JSYJK_SCQY("jsyjkScqy", "驾驶员注意力监测系统DMS-驾驶员监控摄像头-生产企业", "0", "", 50),
JSYHW_PZ("jsyhwPz", "驾驶员注意力监测系统DMS-驾驶员监控红外传感器-配置", "2", "", 0),
JSYHW_PZ("jsyhwPz", "驾驶员注意力监测系统DMS-驾驶员监控红外传感器-配置", "1", "", 0),
JSYHW_SL("jsyhwSl", "驾驶员注意力监测系统DMS-驾驶员监控红外传感器-数量", "0", "", 50),
JSYHW_BZWZ("jsyhwBzwz", "驾驶员注意力监测系统DMS-驾驶员监控红外传感器-布置位置", "0", "", 50),
JSYHW_GGXH("jsyhwGgxh", "驾驶员注意力监测系统DMS-驾驶员监控红外传感器-规格型号", "0", "", 50),
JSYHW_SCQY("jsyhwScqy", "驾驶员注意力监测系统DMS-驾驶员监控红外传感器-生产企业", "0", "", 50),
CZWXDW_PZ("czwxdwPz", "定位及导航系统-车载卫星定位设备（接收卫星信号及辅助定位信号的装置，PPP/GNSS/RTK）-配置", "2", "", 0),
CZWXDW_PZ("czwxdwPz", "定位及导航系统-车载卫星定位设备（接收卫星信号及辅助定位信号的装置，PPP/GNSS/RTK）-配置", "1", "", 0),
CZWXDW_GGXH("czwxdwGgxh", "定位及导航系统-车载卫星定位设备（接收卫星信号及辅助定位信号的装置，PPP/GNSS/RTK）-规格型号", "0", "", 50),
CZWXDW_SCQY("czwxdwScqy", "定位及导航系统-车载卫星定位设备（接收卫星信号及辅助定位信号的装置，PPP/GNSS/RTK）-生产企业", "0", "", 50),
GXDH_PZ("gxdhPz", "定位及导航系统-惯性导航系统-配置", "2", "", 0),
GXDH_PZ("gxdhPz", "定位及导航系统-惯性导航系统-配置", "1", "", 0),
GXDH_GGXH("gxdhGgxh", "定位及导航系统-惯性导航系统-规格型号", "0", "", 50),
GXDH_SCQY("gxdhScqy", "定位及导航系统-惯性导航系统-生产企业", "0", "", 50),
LSJ_PZ("lsjPz", "定位及导航系统-轮速计-配置", "2", "", 0),
LSJ_PZ("lsjPz", "定位及导航系统-轮速计-配置", "1", "", 0),
LSJ_GGXH("lsjGgxh", "定位及导航系统-轮速计-规格型号", "0", "", 50),
LSJ_SCQY("lsjScqy", "定位及导航系统-轮速计-生产企业", "0", "", 50),
GJDDT_PZ("gjddtPz", "定位及导航系统-高精度地图-配置", "2", "", 0),
GJDDT_PZ("gjddtPz", "定位及导航系统-高精度地图-配置", "1", "", 0),
GJDDT_GGXH("gjddtGgxh", "定位及导航系统-高精度地图-规格型号", "0", "", 50),
GJDDT_SCQY("gjddtScqy", "定位及导航系统-高精度地图-生产企业", "0", "", 50),
DZWL_PZ("dzwlPz", "定位及导航系统-电子围栏-配置", "2", "", 0),
DZWL_PZ("dzwlPz", "定位及导航系统-电子围栏-配置", "1", "", 0),
DZWL_DXXGCS("dzwlDxxgcs", "定位及导航系统-电子围栏-定性描述相关场所", "0", "", 50),
CZTX_PZ("cztxPz", "车载通信系统-配置", "2", "", 0),
CZTX_PZ("cztxPz", "车载通信系统-配置", "1", "", 0),
CZTX_XTMC("cztxXtmc", "车载通信系统-系统名称", "0", "", 50),
CZTX_GGXH("cztxGgxh", "车载通信系统-规格型号", "0", "", 50),
CZTX_SCQY("cztxScqy", "车载通信系统-生产企业", "0", "", 50),
CZTX_BBH("cztxBbh", "车载通信系统-版本号", "0", "", 50),
CZTX_KFQY("cztxKfqy", "车载通信系统-软件开发企业", "0", "", 50),
JSFZCZJ_PZ("jsfzczjPz", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能操纵件-配置", "2", "", 0),
JSFZCZJ_PZ("jsfzczjPz", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能操纵件-配置", "1", "", 0),
JSFZCZJ_MC("jsfzczjMc", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能操纵件-操纵件名称", "0", "", 50),
JSFZCZJ_YJXH("jsfzczjYjxh", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能操纵件-硬件规格型号", "0", "", 50),
JSFZCZJ_SCQY("jsfzczjScqy", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能操纵件-生产企业", "0", "", 50),
JSFZZSQ_PZ("jsfzzsqPz", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能指示器/信号装置-配置", "2", "", 0),
JSFZZSQ_PZ("jsfzzsqPz", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能指示器/信号装置-配置", "1", "", 0),
JSFZZSQ_MC("jsfzzsqMc", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能指示器/信号装置-指示器/信号装置名称", "0", "", 50),
JSFZZSQ_YJXH("jsfzzsqYjxh", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能指示器/信号装置-硬件规格型号", "0", "", 50),
JSFZZSQ_SCQY("jsfzzsqScqy", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能指示器/信号装置-生产企业", "0", "", 50),
FXPTSTS_PZ("fxptstsPz", "驾驶辅助系统操纵件、指示器及信号装置-方向盘脱手提示器/信号装置-配置", "2", "", 0),
FXPTSTS_PZ("fxptstsPz", "驾驶辅助系统操纵件、指示器及信号装置-方向盘脱手提示器/信号装置-配置", "1", "", 0),
FXPTSTS_MC("fxptstsMc", "驾驶辅助系统操纵件、指示器及信号装置-方向盘脱手提示器/信号装置-指示器/信号装置名称", "0", "", 50),
FXPTSTS_YJXH("fxptstsYjxh", "驾驶辅助系统操纵件、指示器及信号装置-方向盘脱手提示器/信号装置-硬件规格型号", "0", "", 50),
FXPTSTS_SCQY("fxptstsScqy", "驾驶辅助系统操纵件、指示器及信号装置-方向盘脱手提示器/信号装置-生产企业", "0", "", 50),
JSYZYLTS_PZ("jsyzyltsPz", "驾驶辅助系统操纵件、指示器及信号装置-驾驶员注意力提醒指示器/信号装置-配置", "2", "", 0),
JSYZYLTS_PZ("jsyzyltsPz", "驾驶辅助系统操纵件、指示器及信号装置-驾驶员注意力提醒指示器/信号装置-配置", "1", "", 0),
JSYZYLTS_MC("jsyzyltsMc", "驾驶辅助系统操纵件、指示器及信号装置-驾驶员注意力提醒指示器/信号装置-指示器/信号装置名称", "0", "", 50),
JSYZYLTS_YJXH("jsyzyltsYjxh", "驾驶辅助系统操纵件、指示器及信号装置-驾驶员注意力提醒指示器/信号装置-硬件规格型号", "0", "", 50),
JSYZYLTS_SCQY("jsyzyltsScqy", "驾驶辅助系统操纵件、指示器及信号装置-驾驶员注意力提醒指示器/信号装置-生产企业", "0", "", 50),
DSSAD_PZ("dssadPz", "自动驾驶数据记录系统(DSSAD)-系统配置", "2", "", 0),
DSSAD_PZ("dssadPz", "自动驾驶数据记录系统(DSSAD)-系统配置", "1", "", 0),
DSSAD_GGXH("dssadGgxh", "自动驾驶数据记录系统(DSSAD)-规格型号", "0", "", 50),
DSSAD_SCQY("dssadScqy", "自动驾驶数据记录系统(DSSAD)-生产企业", "0", "", 50),
EDR_PZ("edrPz", "事件数据记录系统(EDR)-配置", "2", "", 0),
EDR_PZ("edrPz", "事件数据记录系统(EDR)-配置", "1", "", 0),
EDR_GGXH("edrGgxh", "事件数据记录系统(EDR)-规格型号", "0", "", 50),
EDR_SCQY("edrScqy", "事件数据记录系统(EDR)-生产企业", "0", "", 50),
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java
+40 -40
View File
@@ -313,7 +313,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
sjmk.setCreateTime(now);
sjmk.setBjmc(str);
cell = row.getCell(1);
sjmk.setPzqk(ImportFileUtil.getCellValueYesOrNo(cell, wb));
sjmk.setPzqk(ImportFileUtil.getCellValueHaveOrNot(cell, wb));
cell = row.getCell(2);
sjmk.setKzqmc(ImportFileUtil.getCellValue(cell, wb));
cell = row.getCell(3);
@@ -342,7 +342,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
Row row = s.getRow(2);
Cell cell = row.getCell(2);
bass.setJgldPz(ImportFileUtil.getCellValueYesOrNoInt(cell, wb));
bass.setJgldPz(ImportFileUtil.getCellValueHaveOrNotInt(cell, wb));
row = s.getRow(2);
cell = row.getCell(4);
bass.setJgldSl(ImportFileUtil.getCellValue(cell, wb));
@@ -358,7 +358,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
row = s.getRow(6);
cell = row.getCell(2);
bass.setHmbldPz(ImportFileUtil.getCellValueYesOrNoInt(cell, wb));
bass.setHmbldPz(ImportFileUtil.getCellValueHaveOrNotInt(cell, wb));
row = s.getRow(6);
cell = row.getCell(4);
bass.setHmbldSl(ImportFileUtil.getCellValue(cell, wb));
@@ -375,7 +375,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
row = s.getRow(10);
cell = row.getCell(2);
bass.setCsbldPz(ImportFileUtil.getCellValueYesOrNoInt(cell, wb));
bass.setCsbldPz(ImportFileUtil.getCellValueHaveOrNotInt(cell, wb));
row = s.getRow(10);
cell = row.getCell(4);
bass.setCsbldSl(ImportFileUtil.getCellValue(cell, wb));
@@ -392,7 +392,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
row = s.getRow(14);
cell = row.getCell(2);
bass.setSxthsPz(ImportFileUtil.getCellValueYesOrNoInt(cell, wb));
bass.setSxthsPz(ImportFileUtil.getCellValueHaveOrNotInt(cell, wb));
row = s.getRow(14);
cell = row.getCell(4);
bass.setSxthsSl(ImportFileUtil.getCellValue(cell, wb));
@@ -408,7 +408,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
row = s.getRow(18);
cell = row.getCell(2);
bass.setSxtdsdPz(ImportFileUtil.getCellValueYesOrNoInt(cell, wb));
bass.setSxtdsdPz(ImportFileUtil.getCellValueHaveOrNotInt(cell, wb));
row = s.getRow(18);
cell = row.getCell(4);
bass.setSxtdsdSl(ImportFileUtil.getCellValue(cell, wb));
@@ -424,7 +424,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
row = s.getRow(22);
cell = row.getCell(2);
bass.setJsyjkPz(ImportFileUtil.getCellValueYesOrNoInt(cell, wb));
bass.setJsyjkPz(ImportFileUtil.getCellValueHaveOrNotInt(cell, wb));
row = s.getRow(22);
cell = row.getCell(4);
bass.setJsyjkSl(ImportFileUtil.getCellValue(cell, wb));
@@ -440,7 +440,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
row = s.getRow(26);
cell = row.getCell(2);
bass.setJsyhwPz(ImportFileUtil.getCellValueYesOrNoInt(cell, wb));
bass.setJsyhwPz(ImportFileUtil.getCellValueHaveOrNotInt(cell, wb));
row = s.getRow(26);
cell = row.getCell(4);
bass.setJsyhwSl(ImportFileUtil.getCellValue(cell, wb));
@@ -456,7 +456,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
row = s.getRow(30);
cell = row.getCell(2);
bass.setCzwxdwPz(ImportFileUtil.getCellValueYesOrNoInt(cell, wb));
bass.setCzwxdwPz(ImportFileUtil.getCellValueHaveOrNotInt(cell, wb));
row = s.getRow(30);
cell = row.getCell(4);
bass.setCzwxdwGgxh(ImportFileUtil.getCellValue(cell, wb));
@@ -466,7 +466,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
row = s.getRow(32);
cell = row.getCell(2);
bass.setGxdhPz(ImportFileUtil.getCellValueYesOrNoInt(cell, wb));
bass.setGxdhPz(ImportFileUtil.getCellValueHaveOrNotInt(cell, wb));
row = s.getRow(32);
cell = row.getCell(4);
bass.setGxdhGgxh(ImportFileUtil.getCellValue(cell, wb));
@@ -476,7 +476,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
row = s.getRow(34);
cell = row.getCell(2);
bass.setLsjPz(ImportFileUtil.getCellValueYesOrNoInt(cell, wb));
bass.setLsjPz(ImportFileUtil.getCellValueHaveOrNotInt(cell, wb));
row = s.getRow(34);
cell = row.getCell(4);
bass.setLsjGgxh(ImportFileUtil.getCellValue(cell, wb));
@@ -486,7 +486,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
row = s.getRow(36);
cell = row.getCell(2);
bass.setGjddtPz(ImportFileUtil.getCellValueYesOrNoInt(cell, wb));
bass.setGjddtPz(ImportFileUtil.getCellValueHaveOrNotInt(cell, wb));
row = s.getRow(36);
cell = row.getCell(4);
bass.setGjddtGgxh(ImportFileUtil.getCellValue(cell, wb));
@@ -496,14 +496,14 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
row = s.getRow(38);
cell = row.getCell(2);
bass.setDzwlPz(ImportFileUtil.getCellValueYesOrNoInt(cell, wb));
bass.setDzwlPz(ImportFileUtil.getCellValueHaveOrNotInt(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(ImportFileUtil.getCellValueYesOrNoInt(cell, wb));
bass.setCztxPz(ImportFileUtil.getCellValueHaveOrNotInt(cell, wb));
row = s.getRow(39);
cell = row.getCell(4);
bass.setCztxXtmc(ImportFileUtil.getCellValue(cell, wb));
@@ -522,7 +522,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
row = s.getRow(44);
cell = row.getCell(2);
bass.setJsfzczjPz(ImportFileUtil.getCellValueYesOrNoInt(cell, wb));
bass.setJsfzczjPz(ImportFileUtil.getCellValueHaveOrNotInt(cell, wb));
row = s.getRow(44);
cell = row.getCell(4);
bass.setJsfzczjMc(ImportFileUtil.getCellValue(cell, wb));
@@ -535,7 +535,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
row = s.getRow(47);
cell = row.getCell(2);
bass.setJsfzzsqPz(ImportFileUtil.getCellValueYesOrNoInt(cell, wb));
bass.setJsfzzsqPz(ImportFileUtil.getCellValueHaveOrNotInt(cell, wb));
row = s.getRow(47);
cell = row.getCell(4);
bass.setJsfzzsqMc(ImportFileUtil.getCellValue(cell, wb));
@@ -548,7 +548,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
row = s.getRow(50);
cell = row.getCell(2);
bass.setFxptstsPz(ImportFileUtil.getCellValueYesOrNoInt(cell, wb));
bass.setFxptstsPz(ImportFileUtil.getCellValueHaveOrNotInt(cell, wb));
row = s.getRow(50);
cell = row.getCell(4);
bass.setFxptstsMc(ImportFileUtil.getCellValue(cell, wb));
@@ -561,7 +561,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
row = s.getRow(53);
cell = row.getCell(2);
bass.setJsyzyltsPz(ImportFileUtil.getCellValueYesOrNoInt(cell, wb));
bass.setJsyzyltsPz(ImportFileUtil.getCellValueHaveOrNotInt(cell, wb));
row = s.getRow(53);
cell = row.getCell(4);
bass.setJsyzyltsMc(ImportFileUtil.getCellValue(cell, wb));
@@ -574,7 +574,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
row = s.getRow(56);
cell = row.getCell(2);
bass.setDssadPz(ImportFileUtil.getCellValueYesOrNoInt(cell, wb));
bass.setDssadPz(ImportFileUtil.getCellValueHaveOrNotInt(cell, wb));
row = s.getRow(56);
cell = row.getCell(4);
bass.setDssadGgxh(ImportFileUtil.getCellValue(cell, wb));
@@ -584,7 +584,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
row = s.getRow(58);
cell = row.getCell(2);
bass.setEdrPz(ImportFileUtil.getCellValueYesOrNoInt(cell, wb));
bass.setEdrPz(ImportFileUtil.getCellValueHaveOrNotInt(cell, wb));
row = s.getRow(58);
cell = row.getCell(4);
bass.setEdrGgxh(ImportFileUtil.getCellValue(cell, wb));
@@ -605,7 +605,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
Row row = s.getRow(2);
Cell cell = row.getCell(2);
cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getJsfzczjPz()));
cell.setCellValue(ImportFileUtil.getCellValueHaveOrNotInt(bass.getJsfzczjPz()));
row = s.getRow(2);
cell = row.getCell(4);
cell.setCellValue(bass.getJgldSl());
@@ -621,7 +621,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
row = s.getRow(6);
cell = row.getCell(2);
cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getHmbldPz()));
cell.setCellValue(ImportFileUtil.getCellValueHaveOrNotInt(bass.getHmbldPz()));
row = s.getRow(6);
cell = row.getCell(4);
cell.setCellValue(bass.getHmbldSl());
@@ -636,7 +636,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
cell.setCellValue(bass.getHmbldScqy());
row = s.getRow(10);
cell = row.getCell(2);
cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getCsbldPz()));
cell.setCellValue(ImportFileUtil.getCellValueHaveOrNotInt(bass.getCsbldPz()));
row = s.getRow(10);
cell = row.getCell(4);
cell.setCellValue(bass.getCsbldSl());
@@ -652,7 +652,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
row = s.getRow(14);
cell = row.getCell(2);
cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getSxthsPz()));
cell.setCellValue(ImportFileUtil.getCellValueHaveOrNotInt(bass.getSxthsPz()));
row = s.getRow(14);
cell = row.getCell(4);
cell.setCellValue(bass.getSxthsSl());
@@ -668,7 +668,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
row = s.getRow(18);
cell = row.getCell(2);
cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getSxtdsdPz()));
cell.setCellValue(ImportFileUtil.getCellValueHaveOrNotInt(bass.getSxtdsdPz()));
row = s.getRow(18);
cell = row.getCell(4);
cell.setCellValue(bass.getSxtdsdSl());
@@ -684,7 +684,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
row = s.getRow(22);
cell = row.getCell(2);
cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getJsyjkPz()));
cell.setCellValue(ImportFileUtil.getCellValueHaveOrNotInt(bass.getJsyjkPz()));
row = s.getRow(22);
cell = row.getCell(4);
cell.setCellValue(bass.getJsyjkSl());
@@ -700,7 +700,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
row = s.getRow(26);
cell = row.getCell(2);
cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getJsyhwPz()));
cell.setCellValue(ImportFileUtil.getCellValueHaveOrNotInt(bass.getJsyhwPz()));
row = s.getRow(26);
cell = row.getCell(4);
cell.setCellValue(bass.getJsyhwSl());
@@ -716,7 +716,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
row = s.getRow(30);
cell = row.getCell(2);
cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getCzwxdwPz()));
cell.setCellValue(ImportFileUtil.getCellValueHaveOrNotInt(bass.getCzwxdwPz()));
row = s.getRow(30);
cell = row.getCell(4);
cell.setCellValue(bass.getCzwxdwGgxh());
@@ -726,7 +726,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
row = s.getRow(32);
cell = row.getCell(2);
cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getGxdhPz()));
cell.setCellValue(ImportFileUtil.getCellValueHaveOrNotInt(bass.getGxdhPz()));
row = s.getRow(32);
cell = row.getCell(4);
cell.setCellValue(bass.getGxdhGgxh());
@@ -736,7 +736,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
row = s.getRow(34);
cell = row.getCell(2);
cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getLsjPz()));
cell.setCellValue(ImportFileUtil.getCellValueHaveOrNotInt(bass.getLsjPz()));
row = s.getRow(34);
cell = row.getCell(4);
cell.setCellValue(bass.getLsjGgxh());
@@ -746,7 +746,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
row = s.getRow(36);
cell = row.getCell(2);
cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getGjddtPz()));
cell.setCellValue(ImportFileUtil.getCellValueHaveOrNotInt(bass.getGjddtPz()));
row = s.getRow(36);
cell = row.getCell(4);
cell.setCellValue(bass.getGjddtGgxh());
@@ -756,14 +756,14 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
row = s.getRow(38);
cell = row.getCell(2);
cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getDzwlPz()));
cell.setCellValue(ImportFileUtil.getCellValueHaveOrNotInt(bass.getDzwlPz()));
row = s.getRow(38);
cell = row.getCell(4);
cell.setCellValue(bass.getDzwlDxxgcs());
row = s.getRow(39);
cell = row.getCell(2);
cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getCztxPz()));
cell.setCellValue(ImportFileUtil.getCellValueHaveOrNotInt(bass.getCztxPz()));
row = s.getRow(39);
cell = row.getCell(4);
cell.setCellValue(bass.getCztxXtmc());
@@ -782,7 +782,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
row = s.getRow(44);
cell = row.getCell(2);
cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getJsfzczjPz()));
cell.setCellValue(ImportFileUtil.getCellValueHaveOrNotInt(bass.getJsfzczjPz()));
row = s.getRow(44);
cell = row.getCell(4);
cell.setCellValue(bass.getJsfzczjMc());
@@ -795,7 +795,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
row = s.getRow(47);
cell = row.getCell(2);
cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getJsfzzsqPz()));
cell.setCellValue(ImportFileUtil.getCellValueHaveOrNotInt(bass.getJsfzzsqPz()));
row = s.getRow(47);
cell = row.getCell(4);
cell.setCellValue(bass.getJsfzzsqMc());
@@ -808,7 +808,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
row = s.getRow(50);
cell = row.getCell(2);
cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getFxptstsPz()));
cell.setCellValue(ImportFileUtil.getCellValueHaveOrNotInt(bass.getFxptstsPz()));
row = s.getRow(50);
cell = row.getCell(4);
cell.setCellValue(bass.getFxptstsMc());
@@ -821,7 +821,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
row = s.getRow(53);
cell = row.getCell(2);
cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getJsyzyltsPz()));
cell.setCellValue(ImportFileUtil.getCellValueHaveOrNotInt(bass.getJsyzyltsPz()));
row = s.getRow(53);
cell = row.getCell(4);
cell.setCellValue(bass.getJsyzyltsMc());
@@ -834,7 +834,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
row = s.getRow(56);
cell = row.getCell(2);
cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getDssadPz()));
cell.setCellValue(ImportFileUtil.getCellValueHaveOrNotInt(bass.getDssadPz()));
row = s.getRow(56);
cell = row.getCell(4);
cell.setCellValue(bass.getDssadGgxh());
@@ -844,7 +844,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
row = s.getRow(58);
cell = row.getCell(2);
cell.setCellValue(ImportFileUtil.getCellValueYesOrNoInt(bass.getEdrPz()));
cell.setCellValue(ImportFileUtil.getCellValueHaveOrNotInt(bass.getEdrPz()));
row = s.getRow(58);
cell = row.getCell(4);
cell.setCellValue(bass.getEdrGgxh());
@@ -860,7 +860,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
cell = row.createCell(0);
cell.setCellValue(sjmk.getBjmc());
cell = row.createCell(1);
cell.setCellValue(ImportFileUtil.getCellValueYesOrNo(sjmk.getPzqk()));
cell.setCellValue(ImportFileUtil.getCellValueHaveOrNot(sjmk.getPzqk()));
cell = row.createCell(2);
cell.setCellValue(sjmk.getKzqmc());
cell = row.createCell(3);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java
+2 -2
View File
@@ -303,7 +303,7 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl<OtaBaCxKsjjsmccsMap
}
mssc.setGnmc(gnmc);
cell = row.getCell(1);
mssc.setPzqk(ImportFileUtil.getCellValueYesOrNo(cell, wb));
mssc.setPzqk(ImportFileUtil.getCellValueHaveOrNot(cell, wb));
cell = row.getCell(2);
mssc.setSfksj(ImportFileUtil.getCellValueYesOrNo(cell, wb));
cell = row.getCell(3);
@@ -350,7 +350,7 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl<OtaBaCxKsjjsmccsMap
Cell cell = row.createCell(0);
cell.setCellValue(mccs.getGnmc());
cell = row.createCell(1);
cell.setCellValue(ImportFileUtil.getCellValueYesOrNo(mccs.getPzqk()));
cell.setCellValue(ImportFileUtil.getCellValueHaveOrNot(mccs.getPzqk()));
cell = row.createCell(2);
cell.setCellValue(ImportFileUtil.getCellValueYesOrNo(mccs.getSfksj()));
cell = row.createCell(3);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java
+15 -2
View File
@@ -178,8 +178,8 @@ public class ComparisonUtil<T> {
}
public void checkAttError(String[] strs, StringBuilder errMsg, String title, String cut) {
for (String str:strs) {
if(!str.endsWith(".doc")&&!str.endsWith(".docx")&&!str.endsWith(".pdf")&&!str.endsWith(".DOC")&&!str.endsWith(".DOCX")&&!str.endsWith(".PDF")){
for (String str : strs) {
if (!str.endsWith(".doc") && !str.endsWith(".docx") && !str.endsWith(".pdf") && !str.endsWith(".DOC") && !str.endsWith(".DOCX") && !str.endsWith(".PDF")) {
errMsg.append(title + " 支持doc/docx/pdf格式 , ");
}
}
@@ -203,6 +203,11 @@ public class ComparisonUtil<T> {
errMsg.append(title + " 的长度超过了 " + ote.getLen() + ", ");
field.set(clazz, "");
}
} else if ("1".equals(ote.getType())) {
if (!"有".equals(str) && !"无".equals(str)) {
errMsg.append(title + " 必须填写是或否 , ");
field.set(clazz, "");
}
} else if ("2".equals(ote.getType())) {
if (!"是".equals(str) && !"否".equals(str)) {
errMsg.append(title + " 必须填写是或否 , ");
@@ -285,6 +290,14 @@ public class ComparisonUtil<T> {
if (ObjectUtils.isNotEmpty(newVal)) {
res = newVal.toString();
}
} else if ("1".equals(ote.getType())) {
if (ObjectUtils.isNotEmpty(newVal)) {
if ("1".equals(newVal.toString())) {
res = "有";
} else if ("2".equals(newVal.toString())) {
res = "无";
}
}
} else if ("2".equals(ote.getType())) {
if (ObjectUtils.isNotEmpty(newVal)) {
if ("1".equals(newVal.toString())) {
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java
+38
View File
@@ -164,6 +164,32 @@ public class ImportFileUtil {
return res;
}
public static String getCellValueHaveOrNot(Cell cell, Workbook workbook) throws Exception {
String res = "";
String str = getCellValue(cell, workbook);
if (StringUtils.isNotEmpty(str)) {
if (str.equals("有")) {
res = "1";
} else if (str.equals("无")) {
res = "2";
}
}
return res;
}
public static String getCellValueHaveOrNotInt(Integer val) throws Exception {
String res = "";
if (ObjectUtils.isNotEmpty(val)) {
if (val.equals(1)) {
res = "有";
} else if (val.equals(2)) {
res = "无";
}
}
return res;
}
public static String getCellValueYesOrNo(Cell cell, Workbook workbook) throws Exception {
String res = "";
String str = getCellValue(cell, workbook);
@@ -189,6 +215,18 @@ public class ImportFileUtil {
return res;
}
public static String getCellValueHaveOrNot(String str) throws Exception {
String res = "";
if (StringUtils.isNotEmpty(str)) {
if (str.equals("1")) {
res = "有";
} else if (str.equals("2")) {
res = "无";
}
}
return res;
}
public static String getCellValueYesOrNo(String str) throws Exception {
String res = "";
if (StringUtils.isNotEmpty(str)) {