FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_migration' into 'develop_master'

Browse Source 
feat: There is no way the, 跑跑跑 跑数据 重置es

See merge request LiuChao/foton-slrs-system-rest!414
This commit is contained in:
super_liu
2022-03-08 16:36:54 +08:00
parent 5f055e2152 c1eeea3f1f
commit 230e035424
19 changed files with 2190 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+5 -5
View File
@@ -225,7 +225,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
createStandAttrInfo(sarBussionessStandEO);
}
// 增加关联事件
String sortName = sysInfoEOService.getDicNamesByCodes(sarBussionessStandEO.getStandSort());
String sortName = sysInfoEOService.getDicNamesByCodes(sarBussionessStandEO.getStandSort(),"JKSADFH564S");
String number = sortName + " " + sarBussionessStandEO.getStandCode();
if (StringUtils.isNotBlank(sarBussionessStandEO.getStandYear())) {
number += "-" + sarBussionessStandEO.getStandYear();
@@ -394,7 +394,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
}
} else {
List<String> valArr = Arrays.asList(value.split(","));
value = dicTypeEODao.getDicNamesByCodes(valArr);
value = dicTypeEODao.getDicNamesByCodes(valArr,"");
}
entry.setValue(value);
}
@@ -530,7 +530,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
if(newMap != null && oldMap != null) {
newMap = changeMap(sarStandardsInfoEO,newMap);
oldMap = changeMap(beforeSarStandardsInfo,oldMap);
String sortName = sysInfoEOService.getDicNamesByCodes(sarStandardsInfoEO.getStandSort());
String sortName = sysInfoEOService.getDicNamesByCodes(sarStandardsInfoEO.getStandSort(),"JKSADFH564S");
String number = sortName + " " + sarStandardsInfoEO.getStandCode();
if (StringUtils.isNotBlank(sarStandardsInfoEO.getStandYear())) {
number += "-" + sarStandardsInfoEO.getStandYear();
@@ -886,7 +886,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
}else if (entry.getValue() != null && InitStandAttrUtil.selectionFieldListBuss != null && InitStandAttrUtil.selectionFieldListBuss.size() > 0 && InitStandAttrUtil.selectionFieldListBuss.contains(name)) {
value = entry.getValue().toString();
List<String> valArr = Arrays.asList(value.split(","));
value = dicTypeEODao.getDicNamesByCodes(valArr);
value = dicTypeEODao.getDicNamesByCodes(valArr,"");
Optional.ofNullable(value)
.ifPresent(val->{
@@ -1124,7 +1124,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
valArr = Arrays.asList(value.split(","));
}
if(!valArr.isEmpty()){
value = dicTypeEODao.getDicNamesByCodes(valArr);
value = dicTypeEODao.getDicNamesByCodes(valArr,"");
}
}
entry.setValue(value);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java
+5 -5
View File
@@ -383,7 +383,7 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl<SarLawsStandInfoDao
}else if (entry.getValue() != null && InitStandAttrUtil.selectionFieldListLaws != null && InitStandAttrUtil.selectionFieldListLaws.size() > 0 && InitStandAttrUtil.selectionFieldListLaws.contains(name)) {
value = entry.getValue().toString();
List<String> valArr = Arrays.asList(value.split(","));
value = dicTypeEODao.getDicNamesByCodes(valArr);
value = dicTypeEODao.getDicNamesByCodes(valArr,"");
entry.setValue(value);
}
}
@@ -505,7 +505,7 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl<SarLawsStandInfoDao
}
} else {
List<String> valArr = Arrays.asList(value.split(","));
value = dicTypeEODao.getDicNamesByCodes(valArr);
value = dicTypeEODao.getDicNamesByCodes(valArr,"");
}
entry.setValue(value);
}
@@ -544,7 +544,7 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl<SarLawsStandInfoDao
}
} else {
List<String> valArr = Arrays.asList(value.split(","));
value = dicTypeEODao.getDicNamesByCodes(valArr);
value = dicTypeEODao.getDicNamesByCodes(valArr,"");
}
entry.setValue(value);
}
@@ -662,7 +662,7 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl<SarLawsStandInfoDao
valArr = Arrays.asList(value.split(","));
}
if(!valArr.isEmpty()){
value = dicTypeEODao.getDicNamesByCodes(valArr);
value = dicTypeEODao.getDicNamesByCodes(valArr,"");
}
}
entry.setValue(value);
@@ -711,7 +711,7 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl<SarLawsStandInfoDao
}
newMap = changeMap(sarStandardsInfoEO,newMap);
oldMap = changeMap(beforeSarStandardsInfo,oldMap);
String sortName = sysInfoEOService.getDicNamesByCodes(sarStandardsInfoEO.getLawsType());
String sortName = sysInfoEOService.getDicNamesByCodes(sarStandardsInfoEO.getLawsType(),"sg9gb7liywkrnv3pa5uh");
String number = sortName + " " + sarStandardsInfoEO.getLawsNumber();
String content = number + " 《" + sarStandardsInfoEO.getLawsName()+" " + sarStandardsInfoEO.getLawsEnName() + "》";
sarUpdLogEOService.createUpdateLog(SarTypeEnum.BUSINESS.getValue(),sarStandardsInfoEO.getId(),oldMap,newMap,content);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+3 -3
View File
@@ -653,7 +653,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
value= String.join(",", stringList.isEmpty() ? valArr : stringList);
break;
}
default:value = dicTypeEODao.getDicNamesByCodes(valArr);
default:value = dicTypeEODao.getDicNamesByCodes(valArr,"");
}
@@ -683,7 +683,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
valArr = Arrays.asList(value.split(","));
}
if(!valArr.isEmpty()){
value = dicTypeEODao.getDicNamesByCodes(valArr);
value = dicTypeEODao.getDicNamesByCodes(valArr,"");
}
}
entry.setValue(value);
@@ -731,7 +731,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
}
} else {
List<String> valArr = Arrays.asList(value.split(","));
value = dicTypeEODao.getDicNamesByCodes(valArr);
value = dicTypeEODao.getDicNamesByCodes(valArr,"");
}
}
entry.setValue(value);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/impl/SarUpdLogServiceImpl.java
+1 -1
View File
@@ -193,7 +193,7 @@ public class SarUpdLogServiceImpl extends ServiceImpl<SarUpdLogDao, SarUpdLog> i
}
return value;
default:
value = sysInfoEOService.getDicNamesByCodes(value);
value = sysInfoEOService.getDicNamesByCodes(value,"");
return value;
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sysInfo/service/SysInfoEOService.java
+3 -3
View File
@@ -94,11 +94,11 @@ public class SysInfoEOService {
* @Param: [userIds]
* @Return: java.lang.String
*/
public String getDicNamesByCodes(String codes){
public String getDicNamesByCodes(String codes,String dicId){
String names = "";
if (StringUtils.isNotBlank(codes)) {
String[] idArr = codes.split(",");
String names1 = dicTypeEODao.getDicNamesByCodes(Arrays.asList(idArr));
String names1 = dicTypeEODao.getDicNamesByCodes(Arrays.asList(idArr),dicId);
if(StringUtils.isNotBlank(names1)){
List<String> list1 = Arrays.asList(names1.split(","));
List<String> list = list1.stream().distinct().collect(Collectors.toList());
@@ -214,7 +214,7 @@ public class SysInfoEOService {
valueName = getRoleNamesByIds(value);
} else {
List<String> valArr = Arrays.asList(value.split(","));
valueName = dicTypeEODao.getDicNamesByCodes(valArr);
valueName = dicTypeEODao.getDicNamesByCodes(valArr,"");
}
}
nameMap.put(field+"Show", valueName);