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

Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

Browse Source
This commit is contained in:
wangzhijiang
2023-04-04 21:07:16 +08:00
parent 86785ffe9d 0781f5a01b
commit c7dd019532
4 changed files with 21 additions and 21 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/service/impl/OtaBaCxJbxxServiceImpl.java
+1
View File
@@ -82,6 +82,7 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl<OtaBaCxJbxxMapper, OtaBa
otaBaCxList.setId(UUID.randomUUID().toString().replace("-", ""));
otaBaCxList.updateData(otaBaCxJbxx);
otaBaCxListService.add(otaBaCxList);
otaBaCxJbxx.setId(null);
otaBaCxJbxx.setOtaId(otaBaCxList.getId());
otaBaCxJbxx.setCreateTime(now);
} else {
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjfzbhServiceImpl.java
+18
View File
@@ -75,6 +75,9 @@ public class OtaBaSjSjfzbhServiceImpl extends ServiceImpl<OtaBaSjSjfzbhMapper, O
String otaId = (String) json.get("otaId");
if (StringUtils.isNotEmpty(otaId)) {
oldList = getByOtaId(otaId);
if (ObjectUtils.isEmpty(oldList)) {
oldList = setDefault(otaId);
}
deleteByOtaId(otaId);
JSONArray list = json.getJSONArray("list");
if (null != list) {
@@ -112,6 +115,18 @@ public class OtaBaSjSjfzbhServiceImpl extends ServiceImpl<OtaBaSjSjfzbhMapper, O
}
}
public List<OtaBaSjSjfzbh> setDefault(String otaId) {
List<OtaBaSjSjfzbh> list = this.getByOtaId(otaId);
Date now = new Date();
OtaBaSjSjfzbh bh = new OtaBaSjSjfzbh();
bh.setOtaId(otaId);
bh.setSjsjkzq("ADC ADAS主控制器");
bh.setCreateTime(now);
bh.setId(UUID.randomUUID().toString().replace("-", ""));
list.add(bh);
saveBatch(list);
return list;
}
public void deleteByOtaId(String otaId) {
List<OtaBaSjSjfzbh> list = this.getByOtaId(otaId);
@@ -184,6 +199,9 @@ public class OtaBaSjSjfzbhServiceImpl extends ServiceImpl<OtaBaSjSjfzbhMapper, O
if (ObjectUtil.isEmpty(res)) {
res = getByOtaId(otaIdT);
}
if (ObjectUtils.isEmpty(res)) {
res = setDefault(otaId);
}
JSONObject json = new JSONObject();
json.put("list", res);
return json;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java
+1
View File
@@ -81,6 +81,7 @@ public class OtaBaSjSjmbcxServiceImpl extends ServiceImpl<OtaBaSjSjmbcxMapper, O
otaBaSjList.updateData(otaBaSjSjmbcx);
otaBaSjList.setSjzt("0");
otaBaSjListService.add(otaBaSjList);
otaBaSjSjmbcx.setId(null);
otaBaSjSjmbcx.setOtaId(otaBaSjList.getId());
otaBaSjSjmbcx.setCreateTime(now);
} else {
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java
+1 -21
View File
@@ -74,9 +74,7 @@ public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl<OtaBaSjSjxtbhMapper, O
String otaId = (String) json.get("otaId");
if (StringUtils.isNotEmpty(otaId)) {
oldList = getByOtaId(otaId);
if (ObjectUtils.isEmpty(oldList)) {
oldList = setDefault(otaId);
}
deleteByOtaId(otaId);
JSONArray list = json.getJSONArray("list");
if (null != list) {
@@ -114,19 +112,6 @@ public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl<OtaBaSjSjxtbhMapper, O
}
}
public List<OtaBaSjSjxtbh> setDefault(String otaId) {
List<OtaBaSjSjxtbh> list = this.getByOtaId(otaId);
Date now = new Date();
OtaBaSjSjxtbh bh = new OtaBaSjSjxtbh();
bh.setOtaId(otaId);
bh.setSjkzqmc("ADC ADAS主控制器");
bh.setCreateTime(now);
bh.setId(UUID.randomUUID().toString().replace("-", ""));
list.add(bh);
saveBatch(list);
return list;
}
public void deleteByOtaId(String otaId) {
List<OtaBaSjSjxtbh> list = this.getByOtaId(otaId);
List<String> ids = new ArrayList<>();
@@ -136,7 +121,6 @@ public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl<OtaBaSjSjxtbhMapper, O
this.deleteByIds(ids);
}
/**
* 更新
*
@@ -199,10 +183,6 @@ public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl<OtaBaSjSjxtbhMapper, O
if (ObjectUtil.isEmpty(res)) {
res = getByOtaId(otaIdT);
}
if (ObjectUtils.isEmpty(res)) {
res = setDefault(otaId);
}
JSONObject json = new JSONObject();
json.put("list", res);
return json;