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:
高嵩
2023-03-30 18:24:24 +08:00
parent ce79a5cd27 65cd556289
commit 4457092d91
2 changed files with 169 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/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
+151 -9
View File
@@ -1793,11 +1793,28 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
// 操作记录
StringBuilder logCnContent = new StringBuilder();
StringBuilder logEnContent = new StringBuilder();
logCnContent.append(loginUser.getUsername()).append("将");
logEnContent.append(loginUser.getUsername()).append(" set ");
logCnContent.append(loginUser.getUsername());
logEnContent.append(loginUser.getUsername());
// 删除操作记录
StringBuilder deleteLogCnContent = new StringBuilder();
StringBuilder deleteLogEnContent = new StringBuilder();
deleteLogCnContent.append(loginUser.getUsername());
deleteLogEnContent.append(loginUser.getUsername());
// 添加操作记录
StringBuilder addLogCnContent = new StringBuilder();
StringBuilder addLogEnContent = new StringBuilder();
addLogCnContent.append(loginUser.getUsername());
addLogEnContent.append(loginUser.getUsername());
// 变更标识
boolean changeFlag = false;
// 删除标识
boolean deleteFlag = false;
// 新增标识
boolean addFlag = false;
String configNameCn = "";
String configNameEn = "";
@@ -1824,6 +1841,11 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
// 无法转ParamsConfigDataVO（遍历会出现该异常 ： LinkedHashMap cannot be cast to ParamsConfigDataVO）
// List<Map<String, Object>> configDataVOList = (List<Map<String, Object>>) paramsReportConfigDataMap.get("list");
logCnContent.append("将");
logEnContent.append(" set ");
logCnContent.append(paramsReportConfigEO.getConfigName()).append("的");
logEnContent.append(paramsReportConfigEO.getConfigName());
Map<String, Object> paramsConfigDataVOMap = (Map<String, Object>) paramsReportConfigDataMap.get("paramsConfigData");
@@ -1831,6 +1853,8 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
String configDataId = paramsConfigDataMap.getKey();
List<Map<String, Object>> configDataVOList = (List<Map<String, Object>>) paramsConfigDataMap.getValue();
if (CollectionUtil.isNotEmpty(configDataVOList)) {
Integer orderNum = (Integer) configDataVOList.get(0).get("orderNum");
@@ -1999,22 +2023,106 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
}
}
QueryWrapper<ParamsReportConfigDataEO> removeConfigDataWrap = new QueryWrapper<>();
removeConfigDataWrap.lambda().eq(ParamsReportConfigDataEO::getParamsConfigId,paramsReportConfigEOId);
removeConfigDataWrap.lambda().eq(ParamsReportConfigDataEO::getParamsCollectManifestId,paramsCollectManifestId);
this.paramsReportConfigDataEOService.remove(removeConfigDataWrap);
paramsReportConfigDataEO.setParamsCollectManifestId(paramsCollectManifestId);
paramsReportConfigDataEO.setParamsConfigId(paramsReportConfigEOId);
newConfigDataEOList.add(paramsReportConfigDataEO);
}
//
// logCnContent.append(paramsReportConfigEO.getConfigName()).append("的");
// logEnContent.append(paramsReportConfigEO.getConfigName());
}
QueryWrapper<ParamsReportConfigDataEO> prcdQueryWrap = new QueryWrapper<>();
prcdQueryWrap.lambda().eq(ParamsReportConfigDataEO::getParamsConfigId,paramsReportConfigEOId);
prcdQueryWrap.lambda().eq(ParamsReportConfigDataEO::getParamsCollectManifestId,paramsCollectManifestId);
List<ParamsReportConfigDataEO> prcdEoList = this.paramsReportConfigDataEOService.list(prcdQueryWrap);
if(CollectionUtils.isNotEmpty(prcdEoList)){
List<String> paramsConfigDataIdList = paramsConfigDataVOMap.entrySet().stream().map(e -> e.getKey()).distinct().collect(Collectors.toList());
logCnContent.append(paramsReportConfigEO.getConfigName()).append("的");
logEnContent.append(paramsReportConfigEO.getConfigName());
List<String> newAddPcdDataIdList = paramsConfigDataVOMap.entrySet().stream().map(e -> e.getKey()).filter(e -> {
boolean flag = false;
// 如果key的长度是16位，则是新添加的
if (e.length() == 16) {
flag = true;
}
return flag;
}).distinct().collect(Collectors.toList());
if(CollectionUtils.isNotEmpty(newAddPcdDataIdList)){
StringBuilder dataValueSb = new StringBuilder();
for (String newAddPcdDataId : newAddPcdDataIdList) {
List<Map<String,Object>> configDataVOList = (List<Map<String, Object>>) paramsConfigDataVOMap.get(newAddPcdDataId);
for (Map<String, Object> paramsConfigDataVO : configDataVOList) {
String type = (String) paramsConfigDataVO.get("type");
String dataValue = "";
if(ObjectUtils.isNotEmpty(paramsConfigDataVO.get("dataValue"))){
dataValue = String.valueOf(paramsConfigDataVO.get("dataValue"));
}
// 如果是附件 单独处理
if(StringUtils.equals(type,ConfigDataTypeEnum.FILE.getValue())){
}
dataValueSb.append("\"").append(dataValue).append("\",");
}
}
String dataValue = "";
if(StringUtils.isNotBlank(dataValueSb.toString())){
dataValue = dataValueSb.toString().substring(0,dataValueSb.length()-1);
}
addLogCnContent.append("在").append(paramsReportConfigEO.getConfigName()).append("中添加了").append(dataValue).append("，");
addLogEnContent.append("在").append(paramsReportConfigEO.getConfigName()).append("中添加了").append(dataValue).append(",");
addFlag = true;
}
// 判断有没有被减掉的（删除的）
List<ParamsReportConfigDataEO> deletePrcdEoList = prcdEoList.stream().filter(prcdEo -> {
boolean flag = true;
for (String paramsConfigDataId : paramsConfigDataIdList) {
if(StringUtils.equals(prcdEo.getId(),paramsConfigDataId)){
flag = false;
break;
}
}
return flag;
}).collect(Collectors.toList());
// 如果有被删的数据 增加log记录
if(CollectionUtils.isNotEmpty(deletePrcdEoList)){
StringBuilder dataValueSb = new StringBuilder();
for (ParamsReportConfigDataEO paramsReportConfigDataEO : deletePrcdEoList) {
if(StringUtils.isNotBlank(paramsReportConfigDataEO.getTextData())){
dataValueSb.append("\"").append(paramsReportConfigDataEO.getTextData()).append("\",");
}
if(StringUtils.isNotBlank(paramsReportConfigDataEO.getPullData())){
dataValueSb.append("\"").append(paramsReportConfigDataEO.getPullData()).append("\",");
}
if(StringUtils.isNotBlank(paramsReportConfigDataEO.getFileConnectId())){
dataValueSb.append("\"").append(paramsReportConfigDataEO.getFileConnectId()).append("\",");
}
}
String dataValue = "";
if(StringUtils.isNotBlank(dataValueSb.toString())){
dataValue = dataValueSb.toString().substring(0,dataValueSb.length()-1);
}
deleteLogCnContent.append("在").append(paramsReportConfigEO.getConfigName()).append("中删除了").append(dataValue).append("，");
deleteLogEnContent.append("在").append(paramsReportConfigEO.getConfigName()).append("中删除了").append(dataValue).append(",");
deleteFlag = true;
}
}
QueryWrapper<ParamsReportConfigDataEO> removeConfigDataWrap = new QueryWrapper<>();
removeConfigDataWrap.lambda().eq(ParamsReportConfigDataEO::getParamsConfigId,paramsReportConfigEOId);
removeConfigDataWrap.lambda().eq(ParamsReportConfigDataEO::getParamsCollectManifestId,paramsCollectManifestId);
this.paramsReportConfigDataEOService.remove(removeConfigDataWrap);
//******************这里是当前配置的循环结束了******************
//判断结尾是不是该配置的名字--如果是(说明该配置没有被改变)需要从logCnContent中删除该配置名字
@@ -2037,7 +2145,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
}
}
ParamsReportDetailLogEO insertLogEO = new ParamsReportDetailLogEO();
/*if (logCnContent.toString().endsWith("，")) {
String ramarks = "";
if(map.get("remarks") != null){
@@ -2051,6 +2159,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
insertLogEOList.add(insertLogEO);
}*/
if(changeFlag){
ParamsReportDetailLogEO insertLogEO = new ParamsReportDetailLogEO();
String ramarks = "";
if(map.get("remarks") != null){
ramarks = map.get("remarks").toString();
@@ -2066,6 +2175,39 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
insertLogEO.setRemarks(ramarks);
insertLogEOList.add(insertLogEO);
}
if(deleteFlag){
ParamsReportDetailLogEO insertLogEO = new ParamsReportDetailLogEO();
String ramarks = "";
if(map.get("remarks") != null){
ramarks = map.get("remarks").toString();
}
insertLogEO.setLogCnContent(deleteLogCnContent.toString().substring(0, deleteLogCnContent.lastIndexOf("，")));
insertLogEO.setLogEnContent(deleteLogEnContent.toString().substring(0, deleteLogEnContent.lastIndexOf(",")));
insertLogEO.setParamsReportId(paramsManifestId);
insertLogEO.setParamsReportDetailId(paramsCollectManifestId);
insertLogEO.setRemarks(ramarks);
insertLogEOList.add(insertLogEO);
}
if(addFlag){
ParamsReportDetailLogEO insertLogEO = new ParamsReportDetailLogEO();
String ramarks = "";
if(map.get("remarks") != null){
ramarks = map.get("remarks").toString();
}
insertLogEO.setLogCnContent(addLogCnContent.toString().substring(0, addLogCnContent.lastIndexOf("，")));
insertLogEO.setLogEnContent(addLogEnContent.toString().substring(0, addLogEnContent.lastIndexOf(",")));
insertLogEO.setParamsReportId(paramsManifestId);
insertLogEO.setParamsReportDetailId(paramsCollectManifestId);
insertLogEO.setRemarks(ramarks);
insertLogEOList.add(insertLogEO);
}
}
// 批量更新
jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
+18 -12
View File
@@ -168,7 +168,8 @@ import ImportFile from '@/components/ImportFileData/index'
confirmLoading: false,
disabled: false,
form:{
qymc:'安徽江淮汽车集团股份有限公司'
qymc:'安徽江淮汽车集团股份有限公司',
bapc:undefined
},
url: {
exportData: '/ota/otaBaSjSjmbcx/exportData',
@@ -336,17 +337,22 @@ import ImportFile from '@/components/ImportFileData/index'
},
changeId(value,option){
this.selectListPc.map(item=>{
if(item.id==value){
this.form.cpsb = item.cpsb
this.form.cpmc = item.cpmc
this.form.cpxh = item.cpxh
getAction('/ota/otaBaCxJbxx/queryByOtaId',{otaIdT:'',otaId:item.id}).then(res=>{
this.form.dllx1=res.result.dllx1 == null?undefined:res.result.dllx1
this.form.dllx2=res.result.dllx2== null?undefined:res.result.dllx2
})
}
})
this.$nextTick(()=>{
this.form={...this.form}
this.$refs.ruleForm.validateField('bapc')
})
this.selectListPc.map(item=>{
if(item.id==value){
this.form.cpsb = item.cpsb
this.form.cpmc = item.cpmc
this.form.cpxh = item.cpxh
getAction('/ota/otaBaCxJbxx/queryByOtaId',{otaIdT:'',otaId:item.id}).then(res=>{
this.form.dllx1=res.result.dllx1 == null?undefined:res.result.dllx1
this.form.dllx2=res.result.dllx2== null?undefined:res.result.dllx2
})
}
})
this.$forceUpdate()
},
update(val){