批量上传附件调整
This commit is contained in:
parent
696794b294
commit
b3b871a773
@ -92,8 +92,8 @@ public class DataMigrationController {
|
|||||||
public void run() {
|
public void run() {
|
||||||
String[] fileNameArr = fileName.split(",");
|
String[] fileNameArr = fileName.split(",");
|
||||||
for(String name : fileNameArr){
|
for(String name : fileNameArr){
|
||||||
//new ReadTable().controlPolicyFile_import(me,wsId,groupValue,fileValue,name);
|
new ReadTable().controlPolicyFile_import(me,wsId,groupValue,fileValue,name);
|
||||||
new ReadTable().dataFile_import(me,wsId,groupValue,fileValue,name);
|
//new ReadTable().dataFile_import(me,wsId,groupValue,fileValue,name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@ -1,12 +1,10 @@
|
|||||||
package com.actionsoft.apps.coe.pal.datamigration.util.readtable;
|
package com.actionsoft.apps.coe.pal.datamigration.util.readtable;
|
||||||
|
|
||||||
import java.io.ByteArrayInputStream;
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileNotFoundException;
|
import java.io.FileNotFoundException;
|
||||||
import java.io.FileOutputStream;
|
import java.io.FileOutputStream;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import java.sql.Timestamp;
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
@ -24,7 +22,6 @@ import org.apache.poi.hwpf.usermodel.Table;
|
|||||||
import org.apache.poi.hwpf.usermodel.TableCell;
|
import org.apache.poi.hwpf.usermodel.TableCell;
|
||||||
import org.apache.poi.hwpf.usermodel.TableRow;
|
import org.apache.poi.hwpf.usermodel.TableRow;
|
||||||
|
|
||||||
import com.actionsoft.apps.coe.pal.constant.CoEConstant;
|
|
||||||
import com.actionsoft.apps.coe.pal.datamigration.model.po.WordAttribute;
|
import com.actionsoft.apps.coe.pal.datamigration.model.po.WordAttribute;
|
||||||
import com.actionsoft.apps.coe.pal.datamigration.model.po.WordField;
|
import com.actionsoft.apps.coe.pal.datamigration.model.po.WordField;
|
||||||
import com.actionsoft.apps.coe.pal.datamigration.util.ShapeUtil;
|
import com.actionsoft.apps.coe.pal.datamigration.util.ShapeUtil;
|
||||||
@ -33,13 +30,10 @@ import com.actionsoft.apps.coe.pal.pal.repository.designer.manage.CoeDesignerAPI
|
|||||||
import com.actionsoft.apps.coe.pal.pal.repository.designer.model.BaseModel;
|
import com.actionsoft.apps.coe.pal.pal.repository.designer.model.BaseModel;
|
||||||
import com.actionsoft.apps.coe.pal.pal.repository.designer.util.CoeDesignerUtil;
|
import com.actionsoft.apps.coe.pal.pal.repository.designer.util.CoeDesignerUtil;
|
||||||
import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryModel;
|
import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryModel;
|
||||||
import com.actionsoft.apps.coe.pal.pal.repository.upfile.constant.CoeFileConstant;
|
|
||||||
import com.actionsoft.apps.coe.pal.pal.repository.upfile.dao.UpFileDao;
|
import com.actionsoft.apps.coe.pal.pal.repository.upfile.dao.UpFileDao;
|
||||||
import com.actionsoft.apps.coe.pal.pal.repository.upfile.model.UpfileModel;
|
import com.actionsoft.apps.coe.pal.pal.repository.upfile.model.UpfileModel;
|
||||||
import com.actionsoft.apps.coe.pal.pal.repository.web.CoeProcessLevelWeb;
|
|
||||||
import com.actionsoft.apps.resource.plugin.profile.DCPluginProfile;
|
import com.actionsoft.apps.resource.plugin.profile.DCPluginProfile;
|
||||||
import com.actionsoft.bpms.bo.engine.BO;
|
import com.actionsoft.bpms.bo.engine.BO;
|
||||||
import com.actionsoft.bpms.commons.mvc.view.ResponseObject;
|
|
||||||
import com.actionsoft.bpms.server.UserContext;
|
import com.actionsoft.bpms.server.UserContext;
|
||||||
import com.actionsoft.bpms.server.fs.DCContext;
|
import com.actionsoft.bpms.server.fs.DCContext;
|
||||||
import com.actionsoft.bpms.server.fs.dc.DCProfileManager;
|
import com.actionsoft.bpms.server.fs.dc.DCProfileManager;
|
||||||
@ -102,29 +96,36 @@ public class ReadTable {
|
|||||||
HashMap<String, Object> logMaps = new HashMap<String, Object>();
|
HashMap<String, Object> logMaps = new HashMap<String, Object>();
|
||||||
logMaps.put("FILENAME", fileName);
|
logMaps.put("FILENAME", fileName);
|
||||||
try {
|
try {
|
||||||
String name = fileName.substring(0, fileName.lastIndexOf("."));
|
String name = "";
|
||||||
PALRepositoryModel palRepositoryModel = ReadWordUtil.getRepositoryByName(wsId, name);
|
if(fileName.contains("-附件")) {
|
||||||
|
name = fileName.substring(0, fileName.indexOf("-附件"));
|
||||||
|
}else {
|
||||||
|
name = fileName.substring(0, fileName.lastIndexOf("."));
|
||||||
|
}
|
||||||
|
//String name = fileName.substring(0, fileName.lastIndexOf("."));
|
||||||
|
|
||||||
|
PALRepositoryModel palRepositoryModel = ReadWordUtil.getRepositoryByName2(wsId, name);
|
||||||
if (palRepositoryModel == null) {
|
if (palRepositoryModel == null) {
|
||||||
PALRepositoryModel palRepositoryModel_s = ReadWordUtil.getRepositoryByName(wsId, "酸奶" + name);
|
PALRepositoryModel palRepositoryModel_s = ReadWordUtil.getRepositoryByName2(wsId, "酸奶" + name);
|
||||||
if (palRepositoryModel_s != null) {
|
if (palRepositoryModel_s != null) {
|
||||||
palRepositoryModel = palRepositoryModel_s;
|
palRepositoryModel = palRepositoryModel_s;
|
||||||
}
|
}
|
||||||
PALRepositoryModel palRepositoryModel_y = ReadWordUtil.getRepositoryByName(wsId, "液奶" + name);
|
PALRepositoryModel palRepositoryModel_y = ReadWordUtil.getRepositoryByName2(wsId, "液奶" + name);
|
||||||
if (palRepositoryModel_y != null) {
|
if (palRepositoryModel_y != null) {
|
||||||
palRepositoryModel = palRepositoryModel_y;
|
palRepositoryModel = palRepositoryModel_y;
|
||||||
}
|
}
|
||||||
PALRepositoryModel palRepositoryModel_l = ReadWordUtil.getRepositoryByName(wsId, "冷饮" + name);
|
PALRepositoryModel palRepositoryModel_l = ReadWordUtil.getRepositoryByName2(wsId, "冷饮" + name);
|
||||||
if (palRepositoryModel_l != null) {
|
if (palRepositoryModel_l != null) {
|
||||||
palRepositoryModel = palRepositoryModel_l;
|
palRepositoryModel = palRepositoryModel_l;
|
||||||
}
|
}
|
||||||
PALRepositoryModel palRepositoryModel_n = ReadWordUtil.getRepositoryByName(wsId, "奶粉" + name);
|
PALRepositoryModel palRepositoryModel_n = ReadWordUtil.getRepositoryByName2(wsId, "奶粉" + name);
|
||||||
if (palRepositoryModel_n != null) {
|
if (palRepositoryModel_n != null) {
|
||||||
palRepositoryModel = palRepositoryModel_n;
|
palRepositoryModel = palRepositoryModel_n;
|
||||||
}
|
}
|
||||||
if (palRepositoryModel == null) {
|
if (palRepositoryModel == null) {
|
||||||
if (name.startsWith("酸奶") || name.startsWith("液奶") || name.startsWith("冷饮")
|
if (name.startsWith("酸奶") || name.startsWith("液奶") || name.startsWith("冷饮")
|
||||||
|| name.startsWith("奶粉")) {
|
|| name.startsWith("奶粉")) {
|
||||||
PALRepositoryModel palRepositoryModel_ss = ReadWordUtil.getRepositoryByName(wsId,
|
PALRepositoryModel palRepositoryModel_ss = ReadWordUtil.getRepositoryByName2(wsId,
|
||||||
name.substring(2));
|
name.substring(2));
|
||||||
if (palRepositoryModel_ss != null) {
|
if (palRepositoryModel_ss != null) {
|
||||||
palRepositoryModel = palRepositoryModel_ss;
|
palRepositoryModel = palRepositoryModel_ss;
|
||||||
@ -138,8 +139,8 @@ public class ReadTable {
|
|||||||
} else {
|
} else {
|
||||||
String id = palRepositoryModel.getId();
|
String id = palRepositoryModel.getId();
|
||||||
logMaps.put("PALID", id);
|
logMaps.put("PALID", id);
|
||||||
|
logMaps.put("PALNAME", palRepositoryModel.getName());
|
||||||
String shpId = "";
|
String shpId = "";
|
||||||
String fileName_shap = "";
|
|
||||||
if (palRepositoryModel.getMethodId().contains("form")) {
|
if (palRepositoryModel.getMethodId().contains("form")) {
|
||||||
logMaps.put("MODLETYPE", "表单模型");
|
logMaps.put("MODLETYPE", "表单模型");
|
||||||
// 查询对应绩效模型中数据模型进行填充数据
|
// 查询对应绩效模型中数据模型进行填充数据
|
||||||
@ -176,6 +177,10 @@ public class ReadTable {
|
|||||||
// 将文件挂载到附件里面
|
// 将文件挂载到附件里面
|
||||||
DCContext dcContextorigin = new DCContext(userContext, dcProfilepdfdoc,
|
DCContext dcContextorigin = new DCContext(userContext, dcProfilepdfdoc,
|
||||||
"com.actionsoft.apps.coe.pal.datamigration", groupValue, fileValue, fileName);
|
"com.actionsoft.apps.coe.pal.datamigration", groupValue, fileValue, fileName);
|
||||||
|
|
||||||
|
if(fileName.contains("-附件")) {
|
||||||
|
fileName = fileName.substring(fileName.lastIndexOf("-附件")+4);
|
||||||
|
}
|
||||||
// 删除已有文件
|
// 删除已有文件
|
||||||
StringBuffer sql = new StringBuffer();
|
StringBuffer sql = new StringBuffer();
|
||||||
sql.append("delete from ").append(UpfileModel.DATABASE_ENTITY)
|
sql.append("delete from ").append(UpfileModel.DATABASE_ENTITY)
|
||||||
@ -206,6 +211,10 @@ public class ReadTable {
|
|||||||
// 将文件挂载到附件里面
|
// 将文件挂载到附件里面
|
||||||
DCContext dcContextorigin = new DCContext(userContext, dcProfilepdfdoc,
|
DCContext dcContextorigin = new DCContext(userContext, dcProfilepdfdoc,
|
||||||
"com.actionsoft.apps.coe.pal.datamigration", groupValue, fileValue, fileName);
|
"com.actionsoft.apps.coe.pal.datamigration", groupValue, fileValue, fileName);
|
||||||
|
|
||||||
|
if(fileName.contains("-附件")) {
|
||||||
|
fileName = fileName.substring(fileName.lastIndexOf("-附件")+4);
|
||||||
|
}
|
||||||
// 删除已有文件
|
// 删除已有文件
|
||||||
StringBuffer sql = new StringBuffer();
|
StringBuffer sql = new StringBuffer();
|
||||||
sql.append("delete from ").append(UpfileModel.DATABASE_ENTITY)
|
sql.append("delete from ").append(UpfileModel.DATABASE_ENTITY)
|
||||||
@ -244,7 +253,7 @@ public class ReadTable {
|
|||||||
logMaps.put("FILENAME", fileName);
|
logMaps.put("FILENAME", fileName);
|
||||||
try {
|
try {
|
||||||
String substring = fileName.substring(0,fileName.indexOf(".xml"));
|
String substring = fileName.substring(0,fileName.indexOf(".xml"));
|
||||||
PALRepositoryModel palRepositoryModel = ReadWordUtil.getRepositoryByName(wsId, substring);
|
PALRepositoryModel palRepositoryModel = ReadWordUtil.getRepositoryByName2(wsId, substring);
|
||||||
if(null==palRepositoryModel) {
|
if(null==palRepositoryModel) {
|
||||||
logMaps.put("UPFILESTATE", "文件没有匹配到制度模型!");
|
logMaps.put("UPFILESTATE", "文件没有匹配到制度模型!");
|
||||||
}else {
|
}else {
|
||||||
@ -428,7 +437,7 @@ public class ReadTable {
|
|||||||
}
|
}
|
||||||
String title = fileFieldMap.get("标题").getData().toString();
|
String title = fileFieldMap.get("标题").getData().toString();
|
||||||
//解析文档附件
|
//解析文档附件
|
||||||
PALRepositoryModel palRepositoryModel = ReadWordUtil.getRepositoryByName(wsId, title);
|
PALRepositoryModel palRepositoryModel = ReadWordUtil.getRepositoryByName2(wsId, title);
|
||||||
if (palRepositoryModel == null) {
|
if (palRepositoryModel == null) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -495,7 +504,7 @@ public class ReadTable {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String createOneMap2(String plId, String name, UserContext userContext) {
|
public String createOneMap2(String plId, String name, UserContext userContext) {
|
||||||
PALRepositoryModel palRepositoryModel = ReadWordUtil.getRepositoryByName(plId, name);
|
PALRepositoryModel palRepositoryModel = ReadWordUtil.getRepositoryByName2(plId, name);
|
||||||
if (palRepositoryModel == null) {
|
if (palRepositoryModel == null) {
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
@ -548,7 +557,7 @@ public class ReadTable {
|
|||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
String title = fileFieldMap.get("标题").getData().toString();
|
String title = fileFieldMap.get("标题").getData().toString();
|
||||||
PALRepositoryModel palRepositoryModel = ReadWordUtil.getRepositoryByName(plId, title);
|
PALRepositoryModel palRepositoryModel = ReadWordUtil.getRepositoryByName2(plId, title);
|
||||||
if (palRepositoryModel == null) {
|
if (palRepositoryModel == null) {
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|||||||
@ -806,12 +806,33 @@ public class ReadWordUtil {
|
|||||||
public static PALRepositoryModel getRepositoryByName(String wsId, String repositoryName) {
|
public static PALRepositoryModel getRepositoryByName(String wsId, String repositoryName) {
|
||||||
List<PALRepositoryModel> palRepositoryModels = CoeProcessLevelDaoFacotory.createCoeProcessLevel().getAllCoeProcessLevelByWsId(wsId);
|
List<PALRepositoryModel> palRepositoryModels = CoeProcessLevelDaoFacotory.createCoeProcessLevel().getAllCoeProcessLevelByWsId(wsId);
|
||||||
for (PALRepositoryModel palRepositoryModel : palRepositoryModels) {
|
for (PALRepositoryModel palRepositoryModel : palRepositoryModels) {
|
||||||
|
|
||||||
if (palRepositoryModel.getName().equals(repositoryName)&&palRepositoryModel.isUse()) {
|
if (palRepositoryModel.getName().equals(repositoryName)&&palRepositoryModel.isUse()) {
|
||||||
return palRepositoryModel;
|
return palRepositoryModel;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 根据名字寻找palmode
|
||||||
|
*
|
||||||
|
* @param wsId
|
||||||
|
* @param repositoryName
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
public static PALRepositoryModel getRepositoryByName2(String wsId, String repositoryName) {
|
||||||
|
List<PALRepositoryModel> palRepositoryModels = CoeProcessLevelDaoFacotory.createCoeProcessLevel().getAllCoeProcessLevelByWsId(wsId);
|
||||||
|
for (PALRepositoryModel palRepositoryModel : palRepositoryModels) {
|
||||||
|
|
||||||
|
if (palRepositoryModel.getName().equals(repositoryName)&&palRepositoryModel.isUse()&&!"org.role".equals(palRepositoryModel.getMethodId())) {
|
||||||
|
return palRepositoryModel;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public String getVersion() {
|
public String getVersion() {
|
||||||
return version;
|
return version;
|
||||||
|
|||||||
@ -1,26 +1,30 @@
|
|||||||
package com.actionsoft.apps.coe.pal.pal.repository.job;
|
package com.actionsoft.apps.coe.pal.pal.repository.job;
|
||||||
|
|
||||||
|
|
||||||
import com.actionsoft.apps.coe.pal.batch.constant.BatchConst;
|
import java.sql.Connection;
|
||||||
import com.actionsoft.apps.coe.pal.batch.util.LogUtil;
|
import java.sql.Timestamp;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Iterator;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
import org.quartz.JobExecutionContext;
|
||||||
|
import org.quartz.JobExecutionException;
|
||||||
|
|
||||||
import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryCache;
|
import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryCache;
|
||||||
import com.actionsoft.apps.coe.pal.pal.repository.dao.CoeProcessLevelDaoFacotory;
|
import com.actionsoft.apps.coe.pal.pal.repository.dao.CoeProcessLevelDaoFacotory;
|
||||||
import com.actionsoft.apps.coe.pal.pal.repository.dao.PALRepository;
|
import com.actionsoft.apps.coe.pal.pal.repository.dao.PALRepository;
|
||||||
import com.actionsoft.apps.coe.pal.pal.repository.dao.PALRepositoryPropertyDao;
|
|
||||||
import com.actionsoft.apps.coe.pal.pal.repository.designer.manage.CoeDesignerAPIManager;
|
import com.actionsoft.apps.coe.pal.pal.repository.designer.manage.CoeDesignerAPIManager;
|
||||||
import com.actionsoft.apps.coe.pal.pal.repository.designer.model.BaseModel;
|
import com.actionsoft.apps.coe.pal.pal.repository.designer.model.BaseModel;
|
||||||
import com.actionsoft.apps.coe.pal.pal.repository.designer.relation.dao.DesignerShapeRelationDao;
|
|
||||||
import com.actionsoft.apps.coe.pal.pal.repository.designer.relation.model.DesignerShapeRelationModel;
|
|
||||||
import com.actionsoft.apps.coe.pal.pal.repository.designer.util.CoeDesignerUtil;
|
import com.actionsoft.apps.coe.pal.pal.repository.designer.util.CoeDesignerUtil;
|
||||||
import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryModel;
|
import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryModel;
|
||||||
import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryPropertyModel;
|
|
||||||
import com.actionsoft.apps.coe.pal.pal.repository.model.impl.PALRepositoryModelImpl;
|
import com.actionsoft.apps.coe.pal.pal.repository.model.impl.PALRepositoryModelImpl;
|
||||||
import com.actionsoft.apps.coe.pal.pal.repository.util.CoeProcessLevelUtil;
|
import com.actionsoft.apps.coe.pal.pal.repository.util.CoeProcessLevelUtil;
|
||||||
import com.actionsoft.apps.coe.pal.pal.repository.util.CoeRepositoryImportUtil;
|
import com.actionsoft.apps.coe.pal.pal.repository.util.CoeRepositoryImportUtil;
|
||||||
import com.actionsoft.apps.coe.pal.pal.repository.util.DiagramsUtil;
|
import com.actionsoft.apps.coe.pal.pal.repository.util.DiagramsUtil;
|
||||||
import com.actionsoft.apps.coe.pal.pal.repository.util.ShapeUtil;
|
import com.actionsoft.apps.coe.pal.pal.repository.util.ShapeUtil;
|
||||||
import com.actionsoft.bpms.commons.database.RowMap;
|
import com.actionsoft.bpms.commons.database.RowMap;
|
||||||
import com.actionsoft.bpms.commons.mvc.view.ResponseObject;
|
|
||||||
import com.actionsoft.bpms.schedule.IJob;
|
import com.actionsoft.bpms.schedule.IJob;
|
||||||
import com.actionsoft.bpms.server.Quota;
|
import com.actionsoft.bpms.server.Quota;
|
||||||
import com.actionsoft.bpms.server.UserContext;
|
import com.actionsoft.bpms.server.UserContext;
|
||||||
@ -29,13 +33,8 @@ import com.actionsoft.bpms.util.UUIDGener;
|
|||||||
import com.actionsoft.sdk.local.SDK;
|
import com.actionsoft.sdk.local.SDK;
|
||||||
import com.alibaba.fastjson.JSONArray;
|
import com.alibaba.fastjson.JSONArray;
|
||||||
import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSONObject;
|
||||||
import jodd.util.StringUtil;
|
|
||||||
import org.quartz.JobExecutionContext;
|
|
||||||
import org.quartz.JobExecutionException;
|
|
||||||
|
|
||||||
import java.sql.Connection;
|
import jodd.util.StringUtil;
|
||||||
import java.sql.Timestamp;
|
|
||||||
import java.util.*;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user