FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop_master' into develop_master

Browse Source
This commit is contained in:
CD
2022-10-14 10:46:46 +08:00
parent 8edad2bcd3 730a3e153f
commit 01986f8b1c
13 changed files with 504 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/exportWkExcel.java
+23 -3
View File
@@ -11,6 +11,7 @@ import com.adc.da.sys.service.IDicTypeEOService;
import com.adc.da.util.exception.AdcDaBaseException;
import com.adc.da.util.http.ResponseMessage;
import com.adc.da.util.http.Result;
import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -52,9 +53,10 @@ public class exportWkExcel {
ExportParams exportParams = new ExportParams();
exportParams.setType(ExcelType.HSSF);
exportParams.setSheetName(exportName);
List<String> types=new ArrayList<>();
types.add("BUSSSTANDCLASS");
Map<String, Object> dicTypeEO = dicTypeEOService.getDicTypeListCodeByType(types);
// List<String> types=new ArrayList<>();
// types.add("BUSSSTANDCLASS");
// Map<String, Object> dicTypeEO = dicTypeEOService.getDicTypeListCodeByType(types);
Map<String, Object> dicTypeEO = getBussStandTypeData();
workbook = ExcelExportUtilByWk.getHSSFWorkbook(exportParams, exportExcel.class,workbook,"1",dicTypeEO);
os = response.getOutputStream();
workbook.write(os);
@@ -66,6 +68,24 @@ public class exportWkExcel {
}
}
/**
* 静态加载企标类别下拉框
* @return
*/
private static Map<String,Object> getBussStandTypeData(){
Map<String,Object> resultMap = new HashMap<>();
List<Map<String,String>> bussStandTypeList = new ArrayList<>();
char letter = 'A';
for(letter = 'A'; letter <= 'Z'; ++letter){
Map<String,String> typeMap = new HashMap<>();
typeMap.put("Q/FT "+letter,"Q/FT "+letter);
bussStandTypeList.add(typeMap);
}
resultMap.put("BUSSSTANDCLASS",bussStandTypeList);
return resultMap;
}
@ApiOperation(value = "|SarFileSplitItemsEO|导入")
@PostMapping(value = "/importData")
public ResponseMessage<?> importSplitItemsZip(@RequestParam(value = "importFileId", required = false) String importFileId) throws Exception {
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
+4
View File
@@ -365,5 +365,9 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
return "1";
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java
+3
View File
@@ -51,5 +51,8 @@ public interface ISarBussionessStandService extends IService<SarBussionessStand>
List<SarBussionessStand> getSarBussionStandPageQd(SarBussionessStandEOPage page) throws Exception;
void convertDocAllQB(List<SarBussStandFile> list);
void checkFileByEncrypt();
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+72 -4
View File
@@ -57,10 +57,7 @@ import com.adc.da.sys.sarMenuStandard.entity.SarMenuStandard;
import com.adc.da.sys.sarMenuStandard.service.ISarMenuStandardService;
import com.adc.da.sys.util.LoginUserUtil;
import com.adc.da.util.UUIDUtils;
import com.adc.da.utils.util.FieldConvertUtil;
import com.adc.da.utils.util.InitStandAttrUtil;
import com.adc.da.utils.util.SarAdvanceSearchUtil;
import com.adc.da.utils.util.Utils;
import com.adc.da.utils.util.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import net.sf.json.JSONObject;
@@ -71,6 +68,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import java.sql.Clob;
@@ -170,6 +168,10 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
@Autowired
private ISarBussStandSnService iSarBussStandSnService;
@Autowired
private EncryptFileUtils encryptFileUtils;
@Override
public SarBussionessStand getStandInfoByReviseStatus(String reviseStatus,String standSort,String taskId){
SarBussionessStand bussionessStand = new SarBussionessStand();
@@ -1808,5 +1810,71 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
}
}
/**
* 判断文件是否是加密文件
*/
@Override
public void checkFileByEncrypt() {
/**
* 1、获取所有的原始文件
* 2、判断文件头信息
* 3、记录状态
* 4、最后将所有涉及到的文件全部记录到文件中保存到本地
*/
QueryWrapper<SarBussionessStand> standQueryWrapper = new QueryWrapper<>();
standQueryWrapper.eq("VALID_FLAG",0);
List<SarBussionessStand> sarBussionessStands = sarBussionessStandEODao.selectList(standQueryWrapper);
int checkStandNum = 0;
List<String> outLogList = new ArrayList<>();
if(sarBussionessStands!=null && !sarBussionessStands.isEmpty()){
for (SarBussionessStand data:sarBussionessStands) {
logger.info("开始处理第 "+(checkStandNum++)+" 个企标： "+data.getId()+" "+data.getStandCode());
QueryWrapper<SarBussStandFile> fileQueryWrapper = new QueryWrapper<>();
fileQueryWrapper.eq("STAND_ID",data.getId());
fileQueryWrapper.eq("USE_MODEL","SOURCE_FILE");
fileQueryWrapper.eq("VALID_FLAG",0);
List<SarBussStandFile> sarBussStandFiles = sarBussStandFileEODao.selectList(fileQueryWrapper);
if(sarBussStandFiles!=null && !sarBussStandFiles.isEmpty()){
for(SarBussStandFile file : sarBussStandFiles){
StringBuilder fileLog = new StringBuilder();
String fileAttId = file.getAttId();
if(StringUtils.isNotBlank(fileAttId)){
fileLog.append("标准 ").append(data.getStandCode()).append(" ").append(data.getId());
fileLog.append(" 下的文件： ").append(file.getId()).append(" ").append(file.getFileName());
//获取文件信息
AttFileEO fileInfo = attFileEOService.getFileInfo(fileAttId);
String checkResult = encryptFileUtils.checkFileIsEncryFile(fileInfo);
logger.debug(checkResult);
switch (checkResult){
case "NOFILE":
fileLog.append(" 检查结果为 不存在该数据 ");
break;
case "READERR":
fileLog.append(" 检查结果为 读取文件失败 ");
break;
case "READNO":
fileLog.append(" 检查结果为 读取文件为空 ");
break;
case "UNENCRYPT":
fileLog.setLength(0);
break;
case "ENCRYPT":
fileLog.append(" 检查结果为 文件加密 ");
break;
}
}
if(fileLog.length()>0){
outLogList.add(fileLog.toString());
}
}
}
}
}
if(!outLogList.isEmpty()){
encryptFileUtils.writeTxt(outLogList);
}
logger.info("================================文件检查完毕==================================================");
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java
+1 -1
View File
@@ -1,6 +1,5 @@
package com.adc.da.slrs.sarStandardsInfo.service;
import com.adc.da.slrs.sarBussStandFile.entity.SarBussStandFile;
import com.adc.da.slrs.sarStandFile.entity.SarStandFile;
import com.adc.da.slrs.sarStandardsInfo.entity.*;
import com.adc.da.http.ResponseMessage;
@@ -71,5 +70,6 @@ public interface ISarStandardsInfoService extends IService<SarStandardsInfo> {
void convertDocAll(List<SarStandFile> list);
void checkFileByEncrypt();
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+69 -35
View File
@@ -11,18 +11,11 @@ import com.adc.da.slrs.regulations.entity.SearchStandContext;
import com.adc.da.slrs.regulations.entity.StandData;
import com.adc.da.slrs.sarBussStandAttrInfo.dao.SarBussStandAttrInfoDao;
import com.adc.da.slrs.sarBussStandAttrInfo.entity.SarBussStandAttrInfo;
import com.adc.da.slrs.sarBussStandAttrInfo.service.ISarBussStandAttrInfoService;
import com.adc.da.slrs.sarBussStandFile.entity.SarBussStandFile;
import com.adc.da.slrs.sarBussStandFile.service.ISarBussStandFileService;
import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand;
import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService;
import com.adc.da.slrs.sarLawsAttrDetailedList.dao.SarLawsAttrDetailedListDao;
import com.adc.da.slrs.sarLawsAttrDetailedList.entity.SarFindDto;
import com.adc.da.slrs.sarPosition.entity.TsPosition;
import com.adc.da.slrs.sarPosition.service.ITsPositionService;
import com.adc.da.slrs.sarStandAttrInfo.service.ISarStandAttrInfoService;
import com.adc.da.slrs.sarStandFile.service.ISarStandFileService;
import com.adc.da.slrs.sarStandWarning.dao.WarningDateDao;
import com.adc.da.slrs.sarStandWarning.entity.WarningDate;
import com.adc.da.slrs.sarStandWarning.service.Impl.WarningDateServiceImpl;
import com.adc.da.slrs.sarUser.entity.TsUser;
@@ -79,10 +72,6 @@ import com.adc.da.slrs.standardSplit.dao.SarFileSplitInfoEODao;
import com.adc.da.slrs.standardSplit.entity.SarFileSplitInfoEO;
import com.adc.da.slrs.standardSplit.entity.SarFileSplitInfoEOPage;
import com.adc.da.slrs.sysInfo.service.SysInfoEOService;
import com.adc.da.slrs.tsDictionaryType.dao.TsDicTypeDao;
import com.adc.da.slrs.tsDictionaryType.dao.TsDictionaryDao;
import com.adc.da.slrs.tsDictionaryType.entity.TsDicType;
import com.adc.da.slrs.tsDictionaryType.entity.TsDictionary;
import com.adc.da.sys.common.SelectionResult;
import com.adc.da.sys.constant.ValueStateEnum;
import com.adc.da.sys.dao.DicTypeEODao;
@@ -97,7 +86,6 @@ import com.alibaba.fastjson.serializer.SerializerFeature;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import net.sf.json.JSONObject;
import org.apache.catalina.User;
import org.apache.commons.lang3.StringUtils;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.util.PDFTextStripper;
@@ -113,8 +101,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
@@ -254,28 +242,6 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
@Autowired
private StandLawsSearchService standLawsSearchService;
@Autowired
private ISarMenuStandardService standardService;
@Autowired
private TsDictionaryDao tsDictionaryDao;
@Autowired
private TsDicTypeDao tsDicTypeDao;
@Autowired
private ISarStandAttrInfoService iSarStandAttrInfoService;
@Autowired
private ISarStandardsInfoService sarStandardsInfoService;
@Autowired
private ISarBussStandAttrInfoService iSarBussStandAttrInfoService;
@Autowired
private ISarBussionessStandService iSarBussionessStandService;
@Autowired
private SarBussStandAttrInfoDao standAttrInfoDao;
@@ -289,6 +255,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
@Autowired
private INewsFeedService iNewsFeedService;
@Autowired
private EncryptFileUtils encryptFileUtils;
// /**
// * 反向操作标准
// */
@@ -539,6 +508,8 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
}
}
@Autowired
private ISarStandFileService sarStandFileService;
@@ -3596,5 +3567,68 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
return sarlist;
}
@Override
public void checkFileByEncrypt() {
/**
* 1、获取所有的原始文件
* 2、判断文件头信息
* 3、记录状态
* 4、最后将所有涉及到的文件全部记录到文件中保存到本地
*/
QueryWrapper<SarStandardsInfo> standQueryWrapper = new QueryWrapper<>();
standQueryWrapper.eq("VALID_FLAG","0");
List<SarStandardsInfo> sarStandardsInfos = dao.selectList(standQueryWrapper);
int checkStandNum = 0;
List<String> outLogList = new ArrayList<>();
if(sarStandardsInfos!=null && !sarStandardsInfos.isEmpty()){
for (SarStandardsInfo data:sarStandardsInfos) {
logger.info("开始处理第 "+(checkStandNum++)+" 个标准： "+data.getId()+" "+data.getStandSort()+" "+data.getStandNumber()+"-"+data.getStandYear());
QueryWrapper<SarStandFile> fileQueryWrapper = new QueryWrapper<>();
fileQueryWrapper.eq("STAND_ID",data.getId());
fileQueryWrapper.eq("USE_MODEL","SOURCE_FILE");
fileQueryWrapper.eq("VALID_FLAG","0");
List<SarStandFile> sarStandFiles = sarStandFileEODao.selectList(fileQueryWrapper);
if(sarStandFiles!=null && !sarStandFiles.isEmpty()){
for(SarStandFile file : sarStandFiles){
StringBuilder fileLog = new StringBuilder();
String fileAttId = file.getAttId();
if(org.apache.commons.lang.StringUtils.isNotBlank(fileAttId)){
fileLog.append("标准 ").append(data.getStandSort()+" "+data.getStandNumber()+"-"+data.getStandYear()).append(" ").append(data.getId());
fileLog.append(" 下的文件： ").append(file.getId()).append(" ").append(file.getFileName());
//获取文件信息
AttFileEO fileInfo = attFileEOService.getFileInfo(fileAttId);
String checkResult = encryptFileUtils.checkFileIsEncryFile(fileInfo);
logger.debug(checkResult);
switch (checkResult){
case "NOFILE":
fileLog.append(" 检查结果为 不存在该数据 ");
break;
case "READERR":
fileLog.append(" 检查结果为 读取文件失败 ");
break;
case "READNO":
fileLog.append(" 检查结果为 读取文件为空 ");
break;
case "UNENCRYPT":
fileLog.setLength(0);
break;
case "ENCRYPT":
fileLog.append(" 检查结果为 文件加密 ");
break;
}
}
if(fileLog.length()>0){
outLogList.add(fileLog.toString());
}
}
}
}
}
if(!outLogList.isEmpty()){
encryptFileUtils.writeTxt(outLogList);
}
logger.info("================================文件检查完毕==================================================");
}
}