cq_anquan
/
safety-eval-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sign

dev
luotaiqian 2026-08-07 10:53:17 +08:00
parent 7b3eb56ad6
commit f6f9089dc7
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalProcessControlExecutor.java
View File

@ -39,6 +39,7 @@ import org.qinan.safetyeval.infrastructure.dataobject.*;
import org.qinan.safetyeval.infrastructure.mapper.*; import org.qinan.safetyeval.infrastructure.mapper.*;
import org.qinan.safetyeval.infrastructure.persistence.queryservice.*; import org.qinan.safetyeval.infrastructure.persistence.queryservice.*;
import org.qinan.safetyeval.infrastructure.support.InsertFieldDefaults; import org.qinan.safetyeval.infrastructure.support.InsertFieldDefaults;
import org.qinan.safetyeval.infrastructure.utils.CommonUtil;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
@ -440,7 +441,7 @@ public class EvalProcessControlExecutor implements EvalProcessControlApi {
private JSONObject buildUrlNameObj(String url, String itemName) { private JSONObject buildUrlNameObj(String url, String itemName) {
JSONObject obj = new JSONObject(); JSONObject obj = new JSONObject();
obj.put("url", url); obj.put("url", url);
obj.put("name", itemName + extractFileName(url)); obj.put("name", extractFileName(url));
return obj; return obj;
} }
@ -539,10 +540,12 @@ public class EvalProcessControlExecutor implements EvalProcessControlApi {
if (!CollectionUtils.isEmpty(files)) { if (!CollectionUtils.isEmpty(files)) {
for (EvalProjectFileCO f : files) { for (EvalProjectFileCO f : files) {
List<JSONObject> urlObjects = parseFileUrlObjects(f.getProjectDocUrl()); List<JSONObject> urlObjects = parseFileUrlObjects(f.getProjectDocUrl());
String itemName = f.getItemName();
for (JSONObject obj : urlObjects) { for (JSONObject obj : urlObjects) {
EvalProjectDocMaterialItemCO item = new EvalProjectDocMaterialItemCO(); EvalProjectDocMaterialItemCO item = new EvalProjectDocMaterialItemCO();
String name = obj.getStr("name"); String name = obj.getStr("name");
item.setMaterialName(StringUtils.hasText(name) ? name : f.getMaterialName()); String fName = StringUtils.hasText(name) ? CommonUtil.EMPTY : name;
item.setMaterialName(itemName + fName);
item.setProjectDocUrl(obj.getStr("url")); item.setProjectDocUrl(obj.getStr("url"));
item.setMaterialType(MaterialCategory.ARCHIVED.getVal()); item.setMaterialType(MaterialCategory.ARCHIVED.getVal());
archivedItems.add(item); archivedItems.add(item);

1
safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/utils/CommonUtil.java
View File

@ -6,4 +6,5 @@ import lombok.experimental.UtilityClass;
public class CommonUtil { public class CommonUtil {
public static final String COMMA = ","; public static final String COMMA = ",";
public static final String COLON = ":"; public static final String COLON = ":";
public static final String EMPTY = "";
} }