yzj
/
RK-archives
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

迭代一键挂接功能

master
yangzj 3 years ago
parent
e3e805dad1
commit
baccb2564d
5 changed files with 92 additions and 192 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 135
      ruoyi-archives/src/main/java/com/ruoyi/archives/service/impl/ArchiveImportServiceImpl.java
  2. 26
      ruoyi-archives/src/main/java/com/ruoyi/archives/util/RedaConditionUtil.java
  3. 2
      ruoyi-archives/src/main/resources/mapper/archives/ArchiveRecordInfoMapper.xml
  4. 99
      ruoyi-common/src/main/java/com/ruoyi/common/config/ArchiveUploadConfig.java
  5. 22
      ruoyi-common/src/main/resources/archivesUpload.properties

135
ruoyi-archives/src/main/java/com/ruoyi/archives/service/impl/ArchiveImportServiceImpl.java
Unescape View File

@ -1411,48 +1411,12 @@ public class ArchiveImportServiceImpl implements ArchiveImportService { @@ -1411,48 +1411,12 @@ public class ArchiveImportServiceImpl implements ArchiveImportService {
list.add(archiveRecordInfo);
}
Map<String, ArchiveRecordInfo> stringArchiveRecordInfoMap = batchSaveRecordInfoList(list);
//上传相关的文件
uploadAllFiles(stringArchiveRecordInfoMap,ArchiveUploadConfig.getDAYJAction());
// //读取文件
// List<CommonFileModel> writFileModels = ExcelUtil.readExcel(file, CommonFileModel.class, 2, 2);
// ArrayList<ArchiveFileInfo> archiveFileInfos = new ArrayList<>(writFileModels.size());
// this.importFiles(writFileModels,file,stringArchiveRecordInfoMap,archiveFileInfos);
// List<KeyValue> keyValues=new ArrayList<>();
// for (ArchiveRecordInfo archiveRecordInfo : list) {
// //再次查询
// if (numberGenUtil.selectXmNum(archiveRecordInfo.getArchiveCategory().toUpperCase()+ archiveRecordInfo.getYear(),Integer.valueOf(archiveRecordInfo.getCaseNum()))){
// numberGenUtil.removeValueByKey(keyValues);
// throw new RuntimeException("["+file.getOriginalFilename()+"——Sheet:1——档号" + archiveRecordInfo.getFileNum() + "]根据档号生成规则,系统已存在相同流水号,请检查后提交");
// }
// //无误后push
// KeyValue keyValue=new KeyValue();
// keyValue.setKey(archiveRecordInfo.getArchiveCategory().toUpperCase()+ archiveRecordInfo.getYear());
// keyValue.setValue(Integer.valueOf(archiveRecordInfo.getCaseNum()));
// keyValues.add(keyValue);
// numberGenUtil.pushXmNum(archiveRecordInfo.getArchiveCategory().toUpperCase()+ archiveRecordInfo.getYear(),Integer.valueOf(archiveRecordInfo.getCaseNum()));
// }
// for (ArchiveFileInfo archiveFileInfo : archiveFileInfos) {
// if (archiveFileInfo!=null){
// numberGenUtil.pushXmNum(archiveFileInfo.getArId(),Integer.valueOf(archiveFileInfo.getArSort()));
// }
//
// }
this.setCacheByRecord(stringArchiveRecordInfoMap,type);
}
//##########################################################公共方法##########################
/*
遍历excel，根据档号生成规则，判断有无重复
*/
// private Boolean excelRepeatWithFileNum(ArrayList<ArchiveRecordInfo> list,String key,String caseNum){
// for (ArchiveRecordInfo archiveRecordInfo : list) {
// if(archiveRecordInfo.getFileNum().contains(key)&&archiveRecordInfo.getFileNum().substring(archiveRecordInfo.getFileNum().lastIndexOf("-")+1).equals(caseNum)){
// count++;
// }
// }
// return count<=0?false:true;
// }
/*
读取导入卷内文件
*/
@ -1698,52 +1662,10 @@ public class ArchiveImportServiceImpl implements ArchiveImportService { @@ -1698,52 +1662,10 @@ public class ArchiveImportServiceImpl implements ArchiveImportService {
ValueOperations<String, Object> ops = redisTemplate.opsForValue();
Map<String, ArchiveRecordInfo> recordInfoMap = (Map<String, ArchiveRecordInfo>) ops.get(recordKey);
List<ArchiveFileInfo> fileInfos = (List<ArchiveFileInfo>) ops.get(fileKey);
if (recordInfoMap==null) {
return AjaxResult.error("请先上传数据");
}
String action =null;
switch (type){
case CategoryDict.JJ_RECORD:
action=ArchiveUploadConfig.getJJAction();
break;
case CategoryDict.HTZ_RECORD:
action=ArchiveUploadConfig.getHTAction();
break;
case CategoryDict.HTY_RECORD:
action=ArchiveUploadConfig.getHTAction();
break;
case CategoryDict.SW_RECORD:
action=ArchiveUploadConfig.getSTAction();
break;
case CategoryDict.SX_RECORD:
action=ArchiveUploadConfig.getSXAction();
break;
case CategoryDict.ZX_RECORD:
action=ArchiveUploadConfig.getZXAction();
break;
case CategoryDict.WS_RECORD:
action=ArchiveUploadConfig.getWSAction();
break;
case CategoryDict.WS_QB_RECORD:
action=ArchiveUploadConfig.getWSAction();
break;
case CategoryDict.ZXXM_RECORD:
action=ArchiveUploadConfig.getZXXMAction();
break;
case CategoryDict.ZXXM_SECOND_RECORD:
action=ArchiveUploadConfig.getZXXMAction();//咨询项目档号变为KJ的情况
break;
case CategoryDict.JYDA_RECORD:
action=ArchiveUploadConfig.getJYAction();
break;
case CategoryDict.DAYJJL_RECORD:
action=ArchiveUploadConfig.getDAYJAction();
break;
case CategoryDict.NJ_RECORD:
action=ArchiveUploadConfig.getNJAction();
break;
}
List<FileUploadList> fileUploadLists = uploadAllFiles(recordInfoMap, action);
// if (recordInfoMap==null) {
// return AjaxResult.error("请先上传数据");
// }
List<FileUploadList> fileUploadLists = uploadAllFiles(recordInfoMap, type);
if (fileInfos!=null){
changeRecordToFile(fileInfos,fileUploadLists);
redisTemplate.delete(fileKey);
@ -1782,14 +1704,19 @@ public class ArchiveImportServiceImpl implements ArchiveImportService { @@ -1782,14 +1704,19 @@ public class ArchiveImportServiceImpl implements ArchiveImportService {
/**
* @Description:批量上传文件
* @param stringArchiveRecordInfoMap 需要导入上传文件的数据
* @param byAction 根据ArchiveRecordInfo1的那个字段读取文件
* @param type 读取那个类型的文件
* @Date: 2022/5/18 22:32
*/
public List<FileUploadList> uploadAllFiles(Map<String, ArchiveRecordInfo> stringArchiveRecordInfoMap,String byAction){
public List<FileUploadList> uploadAllFiles(Map<String, ArchiveRecordInfo> stringArchiveRecordInfoMap,String type){
List<FileUploadList> list=new ArrayList<>();
HashMap<String, String> archiveActions = ArchiveUploadConfig.getArchiveActions();
String byAction = archiveActions.get(type);
//指定从第几层的路径开始为key
int size = ArchiveUploadConfig.getActions().get(byAction).size();
//读取文件
log.info("准备读取文件*********************************");
final Map<String, List<String>> fils = getFils();
final Map<String, List<String>> fils = getFils(size);
//上传所对应的文件
if (stringArchiveRecordInfoMap!=null&&!stringArchiveRecordInfoMap.isEmpty()){
stringArchiveRecordInfoMap.forEach((nums,info)->{
@ -1838,21 +1765,15 @@ public class ArchiveImportServiceImpl implements ArchiveImportService { @@ -1838,21 +1765,15 @@ public class ArchiveImportServiceImpl implements ArchiveImportService {
* @return: java.util.Map<java.lang.String,java.util.List<java.lang.String>>
* @Date: 2022/5/18 22:35
*/
public Map<String,List<String>> getFils(){
// Map<String, List<String>> fileMsg = redisTemplate.opsForValue().get(FILE_MSG);
// if (fileMsg==null){
public Map<String,List<String>> getFils(Integer index){
Map<String,List<String>> msg=new HashMap<>();
String path=RuoYiConfig.getReadPath();
File file=new File(path);
log.info("读取文件开始===========================");
log.info("文件路径为{}",file.getAbsoluteFile());
final Map<String, List<String>> fils = getFils(file, msg,0);
final Map<String, List<String>> fils = getFils(file, msg,index);
log.info("读取文件结束===========================");
// fileMsg=new HashMap<>();
// fileMsg.putAll(fils);
// redisTemplate.opsForValue().set(FILE_MSG,fileMsg,10L, TimeUnit.MINUTES);
// }
// return fileMsg;
return fils;
}
/**
@ -1865,8 +1786,8 @@ public class ArchiveImportServiceImpl implements ArchiveImportService { @@ -1865,8 +1786,8 @@ public class ArchiveImportServiceImpl implements ArchiveImportService {
*/
public Map<String,List<String>> getFils(File file,Map<String,List<String>> map,int index){
if (!file.isFile()){
index++;
log.info("当前读取文件的层级为第{}层",index);
// index++;
// log.info("当前读取文件的层级为第{}层",index);
log.info("当前读取的文件路径为{}",file.getAbsolutePath());
File[] listFiles = file.listFiles();
@ -1883,9 +1804,23 @@ public class ArchiveImportServiceImpl implements ArchiveImportService { @@ -1883,9 +1804,23 @@ public class ArchiveImportServiceImpl implements ArchiveImportService {
final String parent = file.getParent();
if (!parent.isEmpty()){
String separator = parent.contains("/")?"/":"\\\\";
// final String[] split = parent.split("\\\\");
final String[] split = parent.split("/");
String name=split[split.length-1];
// final String[] split = parent.split("/");
final String[] split = parent.split(separator);
// String name=split[split.length-index];
String name =null;
StringBuilder sb =new StringBuilder();
for (int i = index; i >= 1; i--) {
sb.append(split[split.length-i]);
if (i!=1){
sb.append(separator);
}
}
name =sb.toString();
final List<String> list = map.getOrDefault(name, new ArrayList<String>());
if (file.isFile()){
list.add(file.getAbsolutePath());

26
ruoyi-archives/src/main/java/com/ruoyi/archives/util/RedaConditionUtil.java
Unescape View File

@ -3,6 +3,7 @@ package com.ruoyi.archives.util; @@ -3,6 +3,7 @@ package com.ruoyi.archives.util;
import com.ruoyi.archives.domain.ArchiveRecordInfo;
import com.ruoyi.archives.domain.export.RedaFile;
import com.ruoyi.common.config.ArchiveUploadConfig;
import org.apache.commons.lang3.ObjectUtils;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@ -22,13 +23,28 @@ public class RedaConditionUtil { @@ -22,13 +23,28 @@ public class RedaConditionUtil {
synchronized (RedaConditionUtil.class){
if (action==null){
action=new HashMap<>();
ArchiveUploadConfig.getActions().forEach((atrribute,methodName)->{
ArchiveUploadConfig.getActions().forEach((atrribute,methodNames)->{
action.put(atrribute,(info -> {
Class<ArchiveRecordInfo> aClass = ArchiveRecordInfo.class;
String a=null;
//获取当前系统的分隔符是\\\ 还是‘/’
String separator = ArchiveUploadConfig.getSeparator();
StringBuilder sb = new StringBuilder();
try {
Method m = aClass.getMethod(methodName, null);
a= (String) m.invoke(info,null);
//通过方法名获取路径值
for (int i = 0; i < methodNames.size(); i++) {
Method m = aClass.getMethod(methodNames.get(i), null);
Object invoke = m.invoke(info, null);
if (invoke!=null){
sb.append(invoke.toString());
if (i<methodNames.size()-1){
sb.append(separator);
}
}
}
} catch (NoSuchMethodException e) {
e.printStackTrace();
} catch (IllegalAccessException e) {
@ -36,7 +52,7 @@ public class RedaConditionUtil { @@ -36,7 +52,7 @@ public class RedaConditionUtil {
} catch (InvocationTargetException e) {
e.printStackTrace();
}
return a;
return sb.toString();
}));
});
return action;

2
ruoyi-archives/src/main/resources/mapper/archives/ArchiveRecordInfoMapper.xml
Unescape View File

@ -131,7 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -131,7 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="remark !=null and remark !=''">and remark like concat('%', #{remark},'%')</if>
<if test="project_name !=null and project_name !=''">and project_name like concat('%', #{project_name},'%')</if>
</where>
ORDER BY "YEAR" ASC , "ARCHIVE_SCOPE" ASC , "CASE_NUM" ASC
ORDER BY "YEAR" ASC , "ARCHIVE_SCOPE" ASC , CAST ("CASE_NUM" AS INTEGER ) ASC
</select>
<select id="selectArchiveRecordInfoById" parameterType="String" resultMap="ArchiveRecordInfoResult">

99
ruoyi-common/src/main/java/com/ruoyi/common/config/ArchiveUploadConfig.java
Unescape View File

@ -4,6 +4,8 @@ import org.springframework.boot.context.properties.ConfigurationProperties; @@ -4,6 +4,8 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.PropertySource;
import org.springframework.stereotype.Component;
import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@ -13,106 +15,29 @@ import java.util.List; @@ -13,106 +15,29 @@ import java.util.List;
public class ArchiveUploadConfig {
private static String path;
private static HashMap<String,String> actions;
private static String WSAction;
private static String HTAction;
private static String JJAction;
private static String ZXAction;
private static String STAction;
private static String SXAction;
private static String ZXXMAction;
private static String JYAction;
private static String DAYJAction;
private static String NJAction;
public static String getSTAction() {
return STAction;
}
public void setSTAction(String STAction) {
ArchiveUploadConfig.STAction = STAction;
}
public static String getSXAction() {
return SXAction;
}
public void setSXAction(String SXAction) {
ArchiveUploadConfig.SXAction = SXAction;
}
public static String getZXXMAction() {
return ZXXMAction;
}
public void setZXXMAction(String ZXXMAction) {
ArchiveUploadConfig.ZXXMAction = ZXXMAction;
}
public static String getJYAction() {
return JYAction;
}
private static HashMap<String, ArrayList<String>> actions;
private static HashMap<String, String> archiveActions;
public void setJYAction(String JYAction) {
ArchiveUploadConfig.JYAction = JYAction;
}
public static String getDAYJAction() {
return DAYJAction;
}
public void setDAYJAction(String DAYJAction) {
ArchiveUploadConfig.DAYJAction = DAYJAction;
public static HashMap<String, String> getArchiveActions() {
return archiveActions;
}
public static String getNJAction() {
return NJAction;
public void setArchiveActions(HashMap<String, String> archiveActions) {
ArchiveUploadConfig.archiveActions = archiveActions;
}
public void setNJAction(String NJAction) {
ArchiveUploadConfig.NJAction = NJAction;
}
public static HashMap<String, String> getActions() {
public static HashMap<String, ArrayList<String>> getActions() {
return actions;
}
public void setActions(HashMap<String, String> actions) {
public void setActions(HashMap<String, ArrayList<String>> actions) {
ArchiveUploadConfig.actions = actions;
}
public static String getWSAction() {
return WSAction;
}
public void setWSAction(String WSAction) {
ArchiveUploadConfig.WSAction = WSAction;
}
public static String getHTAction() {
return HTAction;
}
public void setHTAction(String HTAction) {
ArchiveUploadConfig.HTAction = HTAction;
}
public static String getJJAction() {
return JJAction;
}
public void setJJAction(String JJAction) {
ArchiveUploadConfig.JJAction = JJAction;
}
public static String getZXAction() {
return ZXAction;
}
public void setZXAction(String ZXAction) {
ArchiveUploadConfig.ZXAction = ZXAction;
}
public static String getPath() {
return path;
@ -121,4 +46,8 @@ public class ArchiveUploadConfig { @@ -121,4 +46,8 @@ public class ArchiveUploadConfig {
public void setPath(String path) {
ArchiveUploadConfig.path = path;
}
public static String getSeparator(){
return System.getProperty("os.name").toLowerCase().contains("windows")?"\\\\":"/";
}
}

22
ruoyi-common/src/main/resources/archivesUpload.properties
Unescape View File

@ -5,7 +5,27 @@ upload.path=/home/hanyuqin/ruoyi/uploadPath @@ -5,7 +5,27 @@ upload.path=/home/hanyuqin/ruoyi/uploadPath
#上传对应的字段
upload.actions.file_num=getFileNum
upload.actions.case_num=getCaseNum
upload.actions.box_num=getBoxNum
upload.actions.box_num=getBoxName,getDepartment
upload.archiveActions.WS=file_num
upload.archiveActions.WSQB=box_num
upload.archiveActions.JJ=file_num
upload.archiveActions.HTZ=file_num
upload.archiveActions.HTY=file_num
upload.archiveActions.SW=file_num
upload.archiveActions.SX=file_num
upload.archiveActions.ZX=file_num
upload.archiveActions.ZXXM=file_num
upload.archiveActions.KJ=file_num
upload.archiveActions.JYDA=file_num
upload.archiveActions.DAYJJL=file_num
upload.archiveActions.NJ=file_num
#文书上传根据 file_num字段上传（可选（file_num、case_num、box_num））
upload.WSAction=file_num

Write Preview
Loading…
Cancel
Save