参数清单收集-控件校验改造
This commit is contained in:
wangzhijiang
@@ -163,3 +163,7 @@ UPDATE `laws_weilai`.`onl_cgform_field` SET `is_show_list` = 0 WHERE `id` = '152
|
||||
-- 参数配置数据表，增加排序号字段sql 2023-1-31 未同步生产环境
|
||||
ALTER TABLE `laws_weilai`.`params_config_data`
|
||||
ADD COLUMN `order_num` int(10) NULL COMMENT '排序号' AFTER `params_collect_manifest_id`;
|
||||
|
||||
-- 上报库参数配置数据表，增加排序号字段sql 2023-2-1 未同步生产环境
|
||||
ALTER TABLE `laws_weilai`.`params_report_config_data`
|
||||
ADD COLUMN `order_num` int(10) NULL COMMENT '排序号' AFTER `params_collect_manifest_id`;
|
||||
|
||||
+9
@@ -56,6 +56,15 @@ public interface IParamsConfigDataEOService extends IService<ParamsConfigDataEO>
|
||||
*/
|
||||
ParamsConfigDataEO queryByConfigIdAndCollectManifestId(String paramsConfigId, String paramsCollectManifestId);
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*
|
||||
* @param paramsConfigId
|
||||
* @param paramsCollectManifestId
|
||||
* @return
|
||||
*/
|
||||
List<ParamsConfigDataEO> queryListByConfigIdAndCollectManifestId(String paramsConfigId, String paramsCollectManifestId);
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*
|
||||
|
||||
+226
-157
@@ -1250,7 +1250,6 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
|
||||
|
||||
// 添加配置数据
|
||||
for (Map.Entry<String, Object> entry : map.entrySet()) {
|
||||
ParamsConfigDataEO paramsConfigDataEO = new ParamsConfigDataEO();
|
||||
if ("id".equals(entry.getKey())) {
|
||||
continue;
|
||||
}
|
||||
@@ -1259,100 +1258,122 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
|
||||
String paramsConfigEOId = entry.getKey();
|
||||
Map<String, Object> paramsConfigDataMap = (Map<String, Object>) entry.getValue();
|
||||
// 无法转ParamsConfigDataVO（遍历会出现该异常 ： LinkedHashMap cannot be cast to ParamsConfigDataVO）
|
||||
List<Map<String, Object>> paramsConfigDataVOList = (List<Map<String, Object>>) paramsConfigDataMap.get("list");
|
||||
// List<Map<String, Object>> paramsConfigDataVOList = (List<Map<String, Object>>) paramsConfigDataMap.get("list");
|
||||
Map<String, Object> paramsConfigDataVOMap = (Map<String, Object>) paramsConfigDataMap.get("paramsConfigData");
|
||||
|
||||
// 判断是新增还是修改
|
||||
ParamsConfigDataEO oldConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigEOId, paramsCollectManifestId);
|
||||
if (ObjectUtil.isNotEmpty(oldConfigDataEO)) {
|
||||
paramsConfigDataEO.setId(oldConfigDataEO.getId());
|
||||
// ParamsConfigDataEO oldConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigEOId, paramsCollectManifestId);
|
||||
List<ParamsConfigDataEO> oldConfigDataEOList = this.paramsConfigDataEOService.queryListByConfigIdAndCollectManifestId(paramsConfigEOId, paramsCollectManifestId);
|
||||
|
||||
}
|
||||
paramsConfigDataEO.setParamsCollectManifestId(paramsCollectManifestId);
|
||||
paramsConfigDataEO.setParamsConfigId(paramsConfigEOId);
|
||||
ParamsConfigEO paramsConfigEO = this.paramsConfigEOService.queryById(paramsConfigEOId);
|
||||
if(Objects.isNull(paramsConfigEO)){
|
||||
continue;
|
||||
}
|
||||
if (CollectionUtil.isNotEmpty(paramsConfigDataVOList)) {
|
||||
boolean appendFlag = false; // 拼接标识
|
||||
for (Map<String, Object> paramsConfigDataVO : paramsConfigDataVOList) {
|
||||
String dataValue = (String) paramsConfigDataVO.get("dataValue");
|
||||
// 只要其中有一个值就可以进行拼接
|
||||
if(StringUtils.isNotEmpty(dataValue)){
|
||||
appendFlag = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if(appendFlag){
|
||||
logCnContentSb.append(paramsConfigEO.getConfigName()).append("为");
|
||||
logEnContentSb.append(" configuration ").append(paramsConfigEO.getConfigName()).append(" as ");
|
||||
}
|
||||
for (Map<String, Object> paramsConfigDataVO : paramsConfigDataVOList) {
|
||||
String type = (String) paramsConfigDataVO.get("type");
|
||||
String dataValue = (String) paramsConfigDataVO.get("dataValue");
|
||||
|
||||
if (type.equals(ConfigDataTypeEnum.TEXT.getValue())) {
|
||||
paramsConfigDataEO.setTextData(dataValue);
|
||||
if (StringUtils.isNotEmpty(dataValue)) {
|
||||
logCnContentSb.append("\"").append(dataValue).append("\"");
|
||||
logEnContentSb.append("\"").append(dataValue).append("\"");
|
||||
}
|
||||
// 拼接历史记录信息
|
||||
for (Map.Entry<String, Object> configDataMap : paramsConfigDataVOMap.entrySet()) {
|
||||
List<Map<String, Object>> paramsConfigDataVOList = (List<Map<String, Object>>)configDataMap.getValue();
|
||||
|
||||
} else if (type.equals(ConfigDataTypeEnum.PULL.getValue())
|
||||
|| type.equals(ConfigDataTypeEnum.PULL_MORE.getValue())) {
|
||||
paramsConfigDataEO.setPullData(dataValue);
|
||||
if (StringUtils.isNotEmpty(dataValue)) {
|
||||
logCnContentSb.append("\"").append(dataValue).append("\"");
|
||||
logEnContentSb.append("\"").append(dataValue).append("\"");
|
||||
}
|
||||
if (CollectionUtil.isNotEmpty(paramsConfigDataVOList)) {
|
||||
|
||||
} else if (type.equals(ConfigDataTypeEnum.FILE.getValue())) {
|
||||
if (StringUtils.isNotEmpty(dataValue) && dataValue.contains(",")) { // 新加多个文件
|
||||
// 处理文件connectId
|
||||
String[] fileIdList = dataValue.split(",");
|
||||
String connectId = UUID.randomUUID().toString().replace("-", "");
|
||||
List<OSSFile> updateFileList = new ArrayList<>();
|
||||
for (int i = 0; i < fileIdList.length; i++) {
|
||||
OSSFile ossFile = new OSSFile();
|
||||
ossFile.setId(fileIdList[i]);
|
||||
ossFile.setConnectId(connectId);
|
||||
updateFileList.add(ossFile);
|
||||
ParamsConfigDataEO paramsConfigDataEO = new ParamsConfigDataEO();
|
||||
if(CollectionUtils.isNotEmpty(oldConfigDataEOList)){
|
||||
List<ParamsConfigDataEO> oldConfigDataEOs = oldConfigDataEOList.stream().filter(configData -> {
|
||||
boolean flag = false;
|
||||
if (StringUtils.equals(configDataMap.getKey(), configData.getId())) {
|
||||
flag = true;
|
||||
}
|
||||
ossFileService.updateBatchById(updateFileList);
|
||||
dataValue = connectId;
|
||||
} else if (StringUtils.isNotEmpty(dataValue) && !dataValue.contains(",")) {
|
||||
List<OSSFile> ossFiles = ossFileService.getFileInfosByConnectId(dataValue);
|
||||
if(CollectionUtil.isEmpty(ossFiles)){ // 新加了一个文件
|
||||
return flag;
|
||||
}).collect(Collectors.toList());
|
||||
|
||||
if(CollectionUtils.isNotEmpty(oldConfigDataEOs)){
|
||||
paramsConfigDataEO.setId(oldConfigDataEOs.get(0).getId());
|
||||
}
|
||||
}
|
||||
|
||||
paramsConfigDataEO.setParamsCollectManifestId(paramsCollectManifestId);
|
||||
paramsConfigDataEO.setParamsConfigId(paramsConfigEOId);
|
||||
|
||||
boolean appendFlag = false; // 拼接标识
|
||||
for (Map<String, Object> paramsConfigDataVO : paramsConfigDataVOList) {
|
||||
String dataValue = (String) paramsConfigDataVO.get("dataValue");
|
||||
// 只要其中有一个值就可以进行拼接
|
||||
if(StringUtils.isNotEmpty(dataValue)){
|
||||
appendFlag = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if(appendFlag){
|
||||
logCnContentSb.append(paramsConfigEO.getConfigName()).append("为");
|
||||
logEnContentSb.append(" configuration ").append(paramsConfigEO.getConfigName()).append(" as ");
|
||||
}
|
||||
for (Map<String, Object> paramsConfigDataVO : paramsConfigDataVOList) {
|
||||
String type = (String) paramsConfigDataVO.get("type");
|
||||
String dataValue = (String) paramsConfigDataVO.get("dataValue");
|
||||
|
||||
if (type.equals(ConfigDataTypeEnum.TEXT.getValue())) {
|
||||
paramsConfigDataEO.setTextData(dataValue);
|
||||
if (StringUtils.isNotEmpty(dataValue)) {
|
||||
logCnContentSb.append("\"").append(dataValue).append("\"");
|
||||
logEnContentSb.append("\"").append(dataValue).append("\"");
|
||||
}
|
||||
|
||||
} else if (type.equals(ConfigDataTypeEnum.PULL.getValue())
|
||||
|| type.equals(ConfigDataTypeEnum.PULL_MORE.getValue())) {
|
||||
paramsConfigDataEO.setPullData(dataValue);
|
||||
if (StringUtils.isNotEmpty(dataValue)) {
|
||||
logCnContentSb.append("\"").append(dataValue).append("\"");
|
||||
logEnContentSb.append("\"").append(dataValue).append("\"");
|
||||
}
|
||||
|
||||
} else if (type.equals(ConfigDataTypeEnum.FILE.getValue())) {
|
||||
if (StringUtils.isNotEmpty(dataValue) && dataValue.contains(",")) { // 新加多个文件
|
||||
// 处理文件connectId
|
||||
String[] fileIdList = dataValue.split(",");
|
||||
String connectId = UUID.randomUUID().toString().replace("-", "");
|
||||
//修改文件表关联信息connect_id
|
||||
List<OSSFile> oSSFileList = new ArrayList<>();
|
||||
for (String fileId : dataValue.split(",")) {
|
||||
List<OSSFile> updateFileList = new ArrayList<>();
|
||||
for (int i = 0; i < fileIdList.length; i++) {
|
||||
OSSFile ossFile = new OSSFile();
|
||||
ossFile.setId(fileId);
|
||||
ossFile.setId(fileIdList[i]);
|
||||
ossFile.setConnectId(connectId);
|
||||
oSSFileList.add(ossFile);
|
||||
updateFileList.add(ossFile);
|
||||
}
|
||||
ossFileService.updateFileInfo(oSSFileList);
|
||||
ossFileService.updateBatchById(updateFileList);
|
||||
dataValue = connectId;
|
||||
} else if (StringUtils.isNotEmpty(dataValue) && !dataValue.contains(",")) {
|
||||
List<OSSFile> ossFiles = ossFileService.getFileInfosByConnectId(dataValue);
|
||||
if(CollectionUtil.isEmpty(ossFiles)){ // 新加了一个文件
|
||||
String connectId = UUID.randomUUID().toString().replace("-", "");
|
||||
//修改文件表关联信息connect_id
|
||||
List<OSSFile> oSSFileList = new ArrayList<>();
|
||||
for (String fileId : dataValue.split(",")) {
|
||||
OSSFile ossFile = new OSSFile();
|
||||
ossFile.setId(fileId);
|
||||
ossFile.setConnectId(connectId);
|
||||
oSSFileList.add(ossFile);
|
||||
}
|
||||
ossFileService.updateFileInfo(oSSFileList);
|
||||
dataValue = connectId;
|
||||
}
|
||||
}
|
||||
paramsConfigDataEO.setFileConnectId(dataValue);
|
||||
|
||||
List<OSSFile> fileInfos = ossFileService.getFileInfos(dataValue);
|
||||
String fileNames = fileInfos.stream().map(OSSFile::getFileName).distinct().collect(Collectors.joining(","));
|
||||
if (StringUtils.isNotEmpty(fileNames)) {
|
||||
logCnContentSb.append("\"").append(fileNames).append("\"");
|
||||
logEnContentSb.append("\"").append(fileNames).append("\"");
|
||||
}
|
||||
}
|
||||
paramsConfigDataEO.setFileConnectId(dataValue);
|
||||
|
||||
List<OSSFile> fileInfos = ossFileService.getFileInfos(dataValue);
|
||||
String fileNames = fileInfos.stream().map(OSSFile::getFileName).distinct().collect(Collectors.joining(","));
|
||||
if (StringUtils.isNotEmpty(fileNames)) {
|
||||
logCnContentSb.append("\"").append(fileNames).append("\"");
|
||||
logEnContentSb.append("\"").append(fileNames).append("\"");
|
||||
}
|
||||
newConfigDataEOList.add(paramsConfigDataEO);
|
||||
}
|
||||
}
|
||||
|
||||
if(appendFlag){
|
||||
logCnContentSb.append("，");
|
||||
logEnContentSb.append(" and ");
|
||||
if(appendFlag){
|
||||
logCnContentSb.append("，");
|
||||
logEnContentSb.append(" and ");
|
||||
}
|
||||
}
|
||||
}
|
||||
newConfigDataEOList.add(paramsConfigDataEO);
|
||||
}
|
||||
|
||||
ParamsCollectManifestLogEO paramsCollectManifestLogEO = new ParamsCollectManifestLogEO();
|
||||
@@ -1818,35 +1839,37 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
|
||||
// 添加配置数据
|
||||
int paramsConfigLenth = 1;
|
||||
for (ParamsConfigEO configEO : paramsConfigEOList) {
|
||||
ParamsConfigDataEO configDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(configEO.getId(), paramsCollectManifestEO.getId());
|
||||
// ParamsConfigDataEO configDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(configEO.getId(), paramsCollectManifestEO.getId());
|
||||
List<ParamsConfigDataEO> configDataEOList = this.paramsConfigDataEOService.queryListByConfigIdAndCollectManifestId(configEO.getId(), paramsCollectManifestEO.getId());
|
||||
for (ParamsConfigDataEO configDataEO : configDataEOList) {
|
||||
if(StringUtils.isNotEmpty(configDataEO.getPullData()) || StringUtils.isNotEmpty(configDataEO.getTextData()) || StringUtils.isNotEmpty(configDataEO.getFileConnectId())){
|
||||
logCnContentSb.append(configEO.getConfigName());
|
||||
logCnContentSb.append(" 的");
|
||||
|
||||
if(StringUtils.isNotEmpty(configDataEO.getPullData()) || StringUtils.isNotEmpty(configDataEO.getTextData()) || StringUtils.isNotEmpty(configDataEO.getFileConnectId())){
|
||||
logCnContentSb.append(configEO.getConfigName());
|
||||
logCnContentSb.append(" 的");
|
||||
|
||||
if(StringUtils.isNotEmpty(configDataEO.getPullData())){
|
||||
logCnContentSb.append("\"" +configDataEO.getPullData()+ "\"");
|
||||
logEnContentSb.append("\"" +configDataEO.getPullData()+ "\"");
|
||||
}
|
||||
if(StringUtils.isNotEmpty(configDataEO.getTextData())){
|
||||
logCnContentSb.append("\"" +configDataEO.getTextData()+ "\"");
|
||||
logEnContentSb.append("\"" +configDataEO.getTextData()+ "\"");
|
||||
}
|
||||
if(StringUtils.isNotEmpty(configDataEO.getFileConnectId())){
|
||||
List<OSSFile> fileInfos = ossFileService.getFileInfos(configDataEO.getFileConnectId());
|
||||
String fileNames = fileInfos.stream().map(OSSFile::getFileName).distinct().collect(Collectors.joining(","));
|
||||
if (StringUtils.isNotEmpty(fileNames)) {
|
||||
logCnContentSb.append("\"" +fileNames+ "\"");
|
||||
logEnContentSb.append("\"" +fileNames+ "\"");
|
||||
if(StringUtils.isNotEmpty(configDataEO.getPullData())){
|
||||
logCnContentSb.append("\"" +configDataEO.getPullData()+ "\"");
|
||||
logEnContentSb.append("\"" +configDataEO.getPullData()+ "\"");
|
||||
}
|
||||
if(StringUtils.isNotEmpty(configDataEO.getTextData())){
|
||||
logCnContentSb.append("\"" +configDataEO.getTextData()+ "\"");
|
||||
logEnContentSb.append("\"" +configDataEO.getTextData()+ "\"");
|
||||
}
|
||||
if(StringUtils.isNotEmpty(configDataEO.getFileConnectId())){
|
||||
List<OSSFile> fileInfos = ossFileService.getFileInfos(configDataEO.getFileConnectId());
|
||||
String fileNames = fileInfos.stream().map(OSSFile::getFileName).distinct().collect(Collectors.joining(","));
|
||||
if (StringUtils.isNotEmpty(fileNames)) {
|
||||
logCnContentSb.append("\"" +fileNames+ "\"");
|
||||
logEnContentSb.append("\"" +fileNames+ "\"");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
logEnContentSb.append(" of configuration " +configEO.getConfigName()+ "");
|
||||
logEnContentSb.append(" of configuration " +configEO.getConfigName()+ "");
|
||||
|
||||
// 如果配置有两条或两条以上，并且不是最后一次循环
|
||||
if(paramsConfigEOList.size() > 1 && paramsConfigLenth != paramsConfigEOList.size()){
|
||||
logCnContentSb.append("，");
|
||||
logEnContentSb.append(" and ");
|
||||
// 如果配置有两条或两条以上，并且不是最后一次循环
|
||||
if(paramsConfigEOList.size() > 1 && paramsConfigLenth != paramsConfigEOList.size()){
|
||||
logCnContentSb.append("，");
|
||||
logEnContentSb.append(" and ");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2754,45 +2777,89 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
|
||||
List<ParamsConfigDataEO> updateConfigDataEOList = new ArrayList<>();
|
||||
List<ParamsConfigDataEO> addConfigDataEOList = new ArrayList<>();
|
||||
for (int i=0; i<paramsCollectManifestIdStr.length; i++) {
|
||||
ParamsConfigDataEO sourceConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(sourceConfigId, paramsCollectManifestIdStr[i]);
|
||||
if (ObjectUtil.isNotEmpty(sourceConfigDataEO)) {
|
||||
for (int j = 0; j < targetConfigIdStr.length; j++) {
|
||||
ParamsConfigDataEO targetConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(targetConfigIdStr[j], paramsCollectManifestIdStr[i]);
|
||||
if (ObjectUtil.isNotEmpty(targetConfigDataEO)) {
|
||||
ParamsConfigDataEO updateConfigDataEO = new ParamsConfigDataEO();
|
||||
updateConfigDataEO.setId(targetConfigDataEO.getId());
|
||||
updateConfigDataEO.setTextData(sourceConfigDataEO.getTextData());
|
||||
updateConfigDataEO.setPullData(sourceConfigDataEO.getPullData());
|
||||
updateConfigDataEO.setFileConnectId(sourceConfigDataEO.getFileConnectId());
|
||||
updateConfigDataEOList.add(updateConfigDataEO);
|
||||
} else {
|
||||
ParamsConfigDataEO addConfigDataEO = new ParamsConfigDataEO();
|
||||
addConfigDataEO.setParamsConfigId(targetConfigIdStr[j]);
|
||||
addConfigDataEO.setParamsCollectManifestId(paramsCollectManifestIdStr[i]);
|
||||
addConfigDataEO.setTextData(sourceConfigDataEO.getTextData());
|
||||
addConfigDataEO.setPullData(sourceConfigDataEO.getPullData());
|
||||
addConfigDataEO.setFileConnectId(sourceConfigDataEO.getFileConnectId());
|
||||
addConfigDataEOList.add(addConfigDataEO);
|
||||
// ParamsConfigDataEO sourceConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(sourceConfigId, paramsCollectManifestIdStr[i]);
|
||||
List<ParamsConfigDataEO> sourceConfigDataEOList = this.paramsConfigDataEOService.queryListByConfigIdAndCollectManifestId(sourceConfigId, paramsCollectManifestIdStr[i]);
|
||||
if(CollectionUtils.isNotEmpty(sourceConfigDataEOList)){
|
||||
for (ParamsConfigDataEO sourceConfigDataEO : sourceConfigDataEOList) {
|
||||
if (ObjectUtil.isNotEmpty(sourceConfigDataEO)) {
|
||||
for (int j = 0; j < targetConfigIdStr.length; j++) {
|
||||
// 根据配置id、参数清单id，将被引用参数列的数据删掉，重新加
|
||||
QueryWrapper<ParamsConfigDataEO> targetConfigDataRemoveWrap = new QueryWrapper<>();
|
||||
targetConfigDataRemoveWrap.lambda().eq(ParamsConfigDataEO::getParamsConfigId,targetConfigIdStr[j]);
|
||||
targetConfigDataRemoveWrap.lambda().eq(ParamsConfigDataEO::getParamsCollectManifestId,paramsCollectManifestIdStr[i]);
|
||||
this.paramsConfigDataEOService.remove(targetConfigDataRemoveWrap);
|
||||
|
||||
ParamsConfigDataEO targetConfigDataEO = new ParamsConfigDataEO();
|
||||
BeanUtils.copyProperties(sourceConfigDataEO,targetConfigDataEO);
|
||||
targetConfigDataEO.setId(null);
|
||||
targetConfigDataEO.setParamsConfigId(targetConfigIdStr[j]);
|
||||
targetConfigDataEO.setParamsCollectManifestId(paramsCollectManifestIdStr[i]);
|
||||
addConfigDataEOList.add(targetConfigDataEO);
|
||||
|
||||
/* ParamsConfigDataEO targetConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(targetConfigIdStr[j], paramsCollectManifestIdStr[i]);
|
||||
List<ParamsConfigDataEO> targetConfigDataEOList = this.paramsConfigDataEOService.queryListByConfigIdAndCollectManifestId(targetConfigIdStr[j], paramsCollectManifestIdStr[i]);
|
||||
if(CollectionUtils.isNotEmpty(targetConfigDataEOList)){
|
||||
for (ParamsConfigDataEO targetConfigDataEO : targetConfigDataEOList) {
|
||||
if (ObjectUtil.isNotEmpty(targetConfigDataEO)) {
|
||||
ParamsConfigDataEO updateConfigDataEO = new ParamsConfigDataEO();
|
||||
updateConfigDataEO.setId(targetConfigDataEO.getId());
|
||||
updateConfigDataEO.setTextData(sourceConfigDataEO.getTextData());
|
||||
updateConfigDataEO.setPullData(sourceConfigDataEO.getPullData());
|
||||
updateConfigDataEO.setFileConnectId(sourceConfigDataEO.getFileConnectId());
|
||||
updateConfigDataEOList.add(updateConfigDataEO);
|
||||
} else {
|
||||
ParamsConfigDataEO addConfigDataEO = new ParamsConfigDataEO();
|
||||
addConfigDataEO.setParamsConfigId(targetConfigIdStr[j]);
|
||||
addConfigDataEO.setParamsCollectManifestId(paramsCollectManifestIdStr[i]);
|
||||
addConfigDataEO.setTextData(sourceConfigDataEO.getTextData());
|
||||
addConfigDataEO.setPullData(sourceConfigDataEO.getPullData());
|
||||
addConfigDataEO.setFileConnectId(sourceConfigDataEO.getFileConnectId());
|
||||
addConfigDataEOList.add(addConfigDataEO);
|
||||
}
|
||||
}
|
||||
}
|
||||
if (ObjectUtil.isNotEmpty(targetConfigDataEO)) {
|
||||
ParamsConfigDataEO updateConfigDataEO = new ParamsConfigDataEO();
|
||||
updateConfigDataEO.setId(targetConfigDataEO.getId());
|
||||
updateConfigDataEO.setTextData(sourceConfigDataEO.getTextData());
|
||||
updateConfigDataEO.setPullData(sourceConfigDataEO.getPullData());
|
||||
updateConfigDataEO.setFileConnectId(sourceConfigDataEO.getFileConnectId());
|
||||
updateConfigDataEOList.add(updateConfigDataEO);
|
||||
} else {
|
||||
ParamsConfigDataEO addConfigDataEO = new ParamsConfigDataEO();
|
||||
addConfigDataEO.setParamsConfigId(targetConfigIdStr[j]);
|
||||
addConfigDataEO.setParamsCollectManifestId(paramsCollectManifestIdStr[i]);
|
||||
addConfigDataEO.setTextData(sourceConfigDataEO.getTextData());
|
||||
addConfigDataEO.setPullData(sourceConfigDataEO.getPullData());
|
||||
addConfigDataEO.setFileConnectId(sourceConfigDataEO.getFileConnectId());
|
||||
addConfigDataEOList.add(addConfigDataEO);
|
||||
}*/
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// 清空引用到的配置的数据
|
||||
for (int j = 0; j < targetConfigIdStr.length; j++) {
|
||||
ParamsConfigDataEO targetConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(targetConfigIdStr[j], paramsCollectManifestIdStr[i]);
|
||||
if (ObjectUtil.isNotEmpty(targetConfigDataEO)) {
|
||||
ParamsConfigDataEO updateConfigDataEO = new ParamsConfigDataEO();
|
||||
updateConfigDataEO.setId(targetConfigDataEO.getId());
|
||||
updateConfigDataEO.setTextData(null);
|
||||
updateConfigDataEO.setPullData(null);
|
||||
updateConfigDataEO.setFileConnectId(null);
|
||||
updateConfigDataEOList.add(updateConfigDataEO);
|
||||
// ParamsConfigDataEO targetConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(targetConfigIdStr[j], paramsCollectManifestIdStr[i]);
|
||||
List<ParamsConfigDataEO> targetConfigDataEOList = this.paramsConfigDataEOService.queryListByConfigIdAndCollectManifestId(targetConfigIdStr[j], paramsCollectManifestIdStr[i]);
|
||||
if(CollectionUtils.isNotEmpty(targetConfigDataEOList)){
|
||||
for (ParamsConfigDataEO targetConfigDataEO : targetConfigDataEOList) {
|
||||
if (ObjectUtil.isNotEmpty(targetConfigDataEO)) {
|
||||
ParamsConfigDataEO updateConfigDataEO = new ParamsConfigDataEO();
|
||||
updateConfigDataEO.setId(targetConfigDataEO.getId());
|
||||
updateConfigDataEO.setTextData(null);
|
||||
updateConfigDataEO.setPullData(null);
|
||||
updateConfigDataEO.setFileConnectId(null);
|
||||
updateConfigDataEOList.add(updateConfigDataEO);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
paramsConfigDataEOService.saveBatch(addConfigDataEOList);
|
||||
paramsConfigDataEOService.updateBatchById(updateConfigDataEOList);
|
||||
// paramsConfigDataEOService.updateBatchById(updateConfigDataEOList);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -2865,42 +2932,44 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
|
||||
// 添加配置数据
|
||||
int paramsConfigLenth = 1;
|
||||
for (ParamsConfigEO configEO : paramsConfigEOList) {
|
||||
ParamsConfigDataEO configDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(configEO.getId(), collectManifestEO.getId());
|
||||
// ParamsConfigDataEO configDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(configEO.getId(), collectManifestEO.getId());
|
||||
List<ParamsConfigDataEO> configDataEOList = this.paramsConfigDataEOService.queryListByConfigIdAndCollectManifestId(configEO.getId(), collectManifestEO.getId());
|
||||
for (ParamsConfigDataEO configDataEO : configDataEOList) {
|
||||
ParamsReportConfigDataEO addReportConfigDataEO = new ParamsReportConfigDataEO();
|
||||
BeanUtils.copyProperties(configDataEO, addReportConfigDataEO);
|
||||
addReportConfigDataEO.setId(UUID.randomUUID().toString().replace("-",""));
|
||||
addReportConfigDataEO.setParamsConfigId(configIdMap.get(configEO.getId()));
|
||||
addReportConfigDataEO.setParamsCollectManifestId(reportDetailId);
|
||||
addReportConfigDataEOList.add(addReportConfigDataEO);
|
||||
|
||||
ParamsReportConfigDataEO addReportConfigDataEO = new ParamsReportConfigDataEO();
|
||||
BeanUtils.copyProperties(configDataEO, addReportConfigDataEO);
|
||||
addReportConfigDataEO.setId(UUID.randomUUID().toString().replace("-",""));
|
||||
addReportConfigDataEO.setParamsConfigId(configIdMap.get(configEO.getId()));
|
||||
addReportConfigDataEO.setParamsCollectManifestId(reportDetailId);
|
||||
addReportConfigDataEOList.add(addReportConfigDataEO);
|
||||
if(StringUtils.isNotEmpty(configDataEO.getPullData()) || StringUtils.isNotEmpty(configDataEO.getTextData()) || StringUtils.isNotEmpty(configDataEO.getFileConnectId())){
|
||||
logCnContentSb.append(configEO.getConfigName());
|
||||
logCnContentSb.append(" 的");
|
||||
|
||||
if(StringUtils.isNotEmpty(configDataEO.getPullData()) || StringUtils.isNotEmpty(configDataEO.getTextData()) || StringUtils.isNotEmpty(configDataEO.getFileConnectId())){
|
||||
logCnContentSb.append(configEO.getConfigName());
|
||||
logCnContentSb.append(" 的");
|
||||
|
||||
if(StringUtils.isNotEmpty(configDataEO.getPullData())){
|
||||
logCnContentSb.append("\"" +configDataEO.getPullData()+ "\"");
|
||||
logEnContentSb.append("\"" +configDataEO.getPullData()+ "\"");
|
||||
}
|
||||
if(StringUtils.isNotEmpty(configDataEO.getTextData())){
|
||||
logCnContentSb.append("\"" +configDataEO.getTextData()+ "\"");
|
||||
logEnContentSb.append("\"" +configDataEO.getTextData()+ "\"");
|
||||
}
|
||||
if(StringUtils.isNotEmpty(configDataEO.getFileConnectId())){
|
||||
List<OSSFile> fileInfos = ossFileService.getFileInfos(configDataEO.getFileConnectId());
|
||||
String fileNames = fileInfos.stream().map(OSSFile::getFileName).distinct().collect(Collectors.joining(","));
|
||||
if (StringUtils.isNotEmpty(fileNames)) {
|
||||
logCnContentSb.append("\"" +fileNames+ "\"");
|
||||
logEnContentSb.append("\"" +fileNames+ "\"");
|
||||
if(StringUtils.isNotEmpty(configDataEO.getPullData())){
|
||||
logCnContentSb.append("\"" +configDataEO.getPullData()+ "\"");
|
||||
logEnContentSb.append("\"" +configDataEO.getPullData()+ "\"");
|
||||
}
|
||||
if(StringUtils.isNotEmpty(configDataEO.getTextData())){
|
||||
logCnContentSb.append("\"" +configDataEO.getTextData()+ "\"");
|
||||
logEnContentSb.append("\"" +configDataEO.getTextData()+ "\"");
|
||||
}
|
||||
if(StringUtils.isNotEmpty(configDataEO.getFileConnectId())){
|
||||
List<OSSFile> fileInfos = ossFileService.getFileInfos(configDataEO.getFileConnectId());
|
||||
String fileNames = fileInfos.stream().map(OSSFile::getFileName).distinct().collect(Collectors.joining(","));
|
||||
if (StringUtils.isNotEmpty(fileNames)) {
|
||||
logCnContentSb.append("\"" +fileNames+ "\"");
|
||||
logEnContentSb.append("\"" +fileNames+ "\"");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
logEnContentSb.append("of configuration " +configEO.getConfigName()+ "");
|
||||
logEnContentSb.append("of configuration " +configEO.getConfigName()+ "");
|
||||
|
||||
// 如果配置有两条或两条以上，并且不是最后一次循环
|
||||
if(paramsConfigEOList.size() > 1 && paramsConfigLenth != paramsConfigEOList.size()){
|
||||
logCnContentSb.append("，");
|
||||
logEnContentSb.append(" and ");
|
||||
// 如果配置有两条或两条以上，并且不是最后一次循环
|
||||
if(paramsConfigEOList.size() > 1 && paramsConfigLenth != paramsConfigEOList.size()){
|
||||
logCnContentSb.append("，");
|
||||
logEnContentSb.append(" and ");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+15
@@ -99,6 +99,21 @@ public class ParamsConfigDataEOServiceImpl extends ServiceImpl<ParamsConfigDataE
|
||||
return getOne(queryWrapper);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*
|
||||
* @param paramsConfigId
|
||||
* @param paramsCollectManifestId
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public List<ParamsConfigDataEO> queryListByConfigIdAndCollectManifestId(String paramsConfigId, String paramsCollectManifestId) {
|
||||
LambdaQueryWrapper<ParamsConfigDataEO> queryWrapper = new LambdaQueryWrapper<>();
|
||||
queryWrapper.eq(ParamsConfigDataEO::getParamsConfigId, paramsConfigId);
|
||||
queryWrapper.eq(ParamsConfigDataEO::getParamsCollectManifestId, paramsCollectManifestId);
|
||||
return this.list(queryWrapper);
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*
|
||||
|
||||
+19
-14
@@ -43,6 +43,7 @@ import com.jero.modules.system.enums.DicCodeEnum;
|
||||
import com.jero.modules.system.mapper.SysDictMapper;
|
||||
import com.jero.modules.system.service.ISysDictService;
|
||||
import com.jero.modules.system.service.ISysUserService;
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -700,23 +701,27 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
|
||||
|
||||
// 配置数据： nio编号，控件类型，控件备选值，控件校验 均一致时 将清单参数项项复制到模板参数项，否则不复制
|
||||
for (ParamsConfigEO configEO : paramsConfigEOList) {
|
||||
ParamsConfigDataEO configDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(configEO.getId(), collectManifestEO.getId());
|
||||
// ParamsConfigDataEO configDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(configEO.getId(), collectManifestEO.getId());
|
||||
|
||||
ParamsConfigDataEO addConfigDataEO = new ParamsConfigDataEO();
|
||||
if (ObjectUtil.isNotEmpty(configDataEO)) {
|
||||
BeanUtils.copyProperties(configDataEO, addConfigDataEO);
|
||||
List<ParamsConfigDataEO> configDataEOList = this.paramsConfigDataEOService.queryListByConfigIdAndCollectManifestId(configEO.getId(), collectManifestEO.getId());
|
||||
if(CollectionUtils.isNotEmpty(configDataEOList)){
|
||||
for (ParamsConfigDataEO configDataEO : configDataEOList) {
|
||||
ParamsConfigDataEO addConfigDataEO = new ParamsConfigDataEO();
|
||||
if (ObjectUtil.isNotEmpty(configDataEO)) {
|
||||
BeanUtils.copyProperties(configDataEO, addConfigDataEO);
|
||||
|
||||
addConfigDataEO.setId(null);
|
||||
addConfigDataEO.setCreateBy(null);
|
||||
addConfigDataEO.setCreateTime(null);
|
||||
addConfigDataEO.setUpdateBy(null);
|
||||
addConfigDataEO.setUpdateTime(null);
|
||||
addConfigDataEO.setSysOrgCode(null);
|
||||
addConfigDataEO.setParamsConfigId(configIdMap.get(configEO.getId()));
|
||||
addConfigDataEO.setParamsCollectManifestId(addCollectManifestId);
|
||||
addConfigDataEOList.add(addConfigDataEO);
|
||||
addConfigDataEO.setId(null);
|
||||
addConfigDataEO.setCreateBy(null);
|
||||
addConfigDataEO.setCreateTime(null);
|
||||
addConfigDataEO.setUpdateBy(null);
|
||||
addConfigDataEO.setUpdateTime(null);
|
||||
addConfigDataEO.setSysOrgCode(null);
|
||||
addConfigDataEO.setParamsConfigId(configIdMap.get(configEO.getId()));
|
||||
addConfigDataEO.setParamsCollectManifestId(addCollectManifestId);
|
||||
addConfigDataEOList.add(addConfigDataEO);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user