guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

三项制度库数据迁移和自建数据区分

limingyu-20240401-app登录曹实业判断修改
liujun 2024-03-12 11:50:00 +08:00
parent c674e3de1e
commit ba48e647dc
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/com/zcloud/service/depository/impl/TextLibraryServiceImpl.java
View File

@ -10,6 +10,7 @@ import com.zcloud.mapper.datasource.depository.TextLibraryMapper;
import com.zcloud.service.depository.TextLibraryService; import com.zcloud.service.depository.TextLibraryService;
import com.zcloud.util.*; import com.zcloud.util.*;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Value;
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.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
@ -50,6 +51,9 @@ public class TextLibraryServiceImpl implements TextLibraryService {
@Resource @Resource
private TextInfoMapper textInfoMapper; private TextInfoMapper textInfoMapper;
@Value("${heBeiQinAnFile}")
private String heBeiQinAnFile;
/** /**
* 新增 * 新增
* *
@ -101,6 +105,12 @@ public class TextLibraryServiceImpl implements TextLibraryService {
entity.put("ATTRIBUTE_LIST", _labels.stream().filter(n -> n.get("CATEGORY") != null).filter(n -> n.getString("CATEGORY").equals("ATTRIBUTE_LIST")).collect(Collectors.toList())); entity.put("ATTRIBUTE_LIST", _labels.stream().filter(n -> n.get("CATEGORY") != null).filter(n -> n.getString("CATEGORY").equals("ATTRIBUTE_LIST")).collect(Collectors.toList()));
entity.put("CATEGORY_LIST", _labels.stream().filter(n -> n.get("CATEGORY") != null).filter(n -> n.getString("CATEGORY").equals("CATEGORY_LIST")).collect(Collectors.toList())); entity.put("CATEGORY_LIST", _labels.stream().filter(n -> n.get("CATEGORY") != null).filter(n -> n.getString("CATEGORY").equals("CATEGORY_LIST")).collect(Collectors.toList()));
} }
// 如果是迁移数据就用河北秦安的路径
for (PageData entity : list) {
if(!"1".equals(entity.getString("MIGRATION_FLAG"))){
entity.put("PATH",heBeiQinAnFile + entity.getString("PATH"));
}
}
return list; return list;
} }
@ -160,11 +170,12 @@ public class TextLibraryServiceImpl implements TextLibraryService {
if (StringUtils.isNotBlank(condition.getString("BUS_TEXT_LIBRARY_ID"))) { if (StringUtils.isNotBlank(condition.getString("BUS_TEXT_LIBRARY_ID"))) {
// 保存历史文件 // 保存历史文件
PageData entity = textlibraryMapper.findById(condition); PageData entity = textlibraryMapper.findById(condition);
condition.put("REMOTE_FILE_NAME", Warden.getFileName(condition.getString("PATH"))); entity.put("REMOTE_FILE_NAME", Warden.getFileName(condition.getString("PATH")));
condition.put("CREATED_TIME", entity.get("CREATED_TIME")); entity.put("CREATED_TIME", entity.get("CREATED_TIME"));
condition.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); entity.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
condition.put("STATUS", "1"); entity.put("STATUS", "1");
textlibraryMapper.edit(condition); entity.put("MIGRATION_FLAG", "1");
textlibraryMapper.edit(entity);
libraryLabelsMapper.deleteByLibraryId(condition); libraryLabelsMapper.deleteByLibraryId(condition);
List<PageData> types = Warden.getList(condition.getString("TYPES")); List<PageData> types = Warden.getList(condition.getString("TYPES"));
List<PageData> list = new ArrayList<>(types); List<PageData> list = new ArrayList<>(types);
@ -238,6 +249,7 @@ public class TextLibraryServiceImpl implements TextLibraryService {
condition.put("ISDELETE", "0"); condition.put("ISDELETE", "0");
condition.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); condition.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
condition.put("STATUS", "1"); condition.put("STATUS", "1");
condition.put("MIGRATION_FLAG", "1");
textlibraryMapper.save(condition); textlibraryMapper.save(condition);
List<PageData> list = new ArrayList<>(); List<PageData> list = new ArrayList<>();

2
src/main/resources/application-dev.properties
View File

@ -126,3 +126,5 @@ mq.gwj.file.topic=czks_dockingPicture
#港务局文件服务器前缀 #港务局文件服务器前缀
cfd.prevention.api.url=http://192.168.0.31:7021/qa-regulatory-cfd cfd.prevention.api.url=http://192.168.0.31:7021/qa-regulatory-cfd
#河北秦安文件服务器前缀
heBeiQinAnFile=https://file.zcloudchina.com/YTHFile