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

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

Browse Source
This commit is contained in:
gaojiabao
2023-03-20 09:20:23 +08:00
parent 59e8462d23 cd61f6a2fb
commit 17c526d396
7 changed files with 76 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-base/src/main/java/com/adc/da/http/Result.java
+4
View File
@@ -20,6 +20,10 @@ public class Result {
return new ResponseMessage(code, message, true, t);
}
public static ResponseMessage success(String code, String message,Boolean t) {
return new ResponseMessage(code, message, true);
}
public static <T> ResponseMessage<T> success(T t) {
return new ResponseMessage(ResponseMessageCodeEnum.SUCCESS.getCode(), "", true, t);
}
adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java
+1 -1
View File
@@ -151,6 +151,7 @@ public class WebMvcConfig implements WebMvcConfigurer {
addInterceptor.excludePathPatterns("/api/att/attFile/downloadFileForSarNew");
addInterceptor.excludePathPatterns("/api/att/attFile/downloadFileForSarWaterMarkNew");
addInterceptor.excludePathPatterns("/api/att/attFile/uploadNew");
addInterceptor.excludePathPatterns("/api/lawss/sarBussionessStand/importSarBussionessStandFile");
addInterceptor.excludePathPatterns("/api/sarLawsDetailedList/sar-laws-detailed-list/importData");
//doc文檔重新轉換
@@ -164,7 +165,6 @@ public class WebMvcConfig implements WebMvcConfigurer {
addInterceptor.excludePathPatterns("/api/search/resetSearchCenter/resetALLSearchCenterForExits");
//// //测试接口使用
// addInterceptor.excludePathPatterns("/api/**");
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java
+25 -1
View File
@@ -85,7 +85,7 @@ public class SarBussStandAttrInfoExecl extends BaseEntity {
private String xgjh;
//附件
private String fbgBuss;
private String qtwjbuss;
//标准中文名称
private String standName;
@@ -147,6 +147,30 @@ public class SarBussStandAttrInfoExecl extends BaseEntity {
//上传时间
private String xcsjbuss;
//关联模块-乘用车VPPS编码
private String cycvppsbmbuss;
//关联模块--乘用车vpps中文名称
private String cycvppscnbuss;
//关联模块--卡车VPPS编码
private String kcvppsbmbuss;
//关联模块--卡车vpps中文名称
private String kcvppscnbuss;
//采用标准
private String cybz;
//采标程度
private String cycd;
//引用标准
private String yybz;
//备案日期
private String barq;
@TableField(exist = false)
private Map<String, Object> attrInfoMap = new LinkedHashMap<>();
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
+3 -4
View File
@@ -416,11 +416,10 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
@ApiOperation(value = "导入功能")
@PostMapping("/importSarBussionessStandFile")
public ResponseMessage<SarBussionessStand> importSarBussionessStandFile(@RequestParam(value = "file",required = false)MultipartFile file) throws Exception{
public ResponseMessage<String> importSarBussionessStandFile(@RequestParam(value = "file",required = false)MultipartFile file) throws Exception{
sarBussionessStandEOService.importSarBussionessStandFile(file);
return Result.success();
}
return sarBussionessStandEOService.importSarBussionessStandFile(file);
}
@ApiOperation(value = "|SarBussionessStand|判断原文译文")
@GetMapping("/emptyFileAnewStorage")
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java
+1 -1
View File
@@ -58,7 +58,7 @@ public interface ISarBussionessStandService extends IService<SarBussionessStand>
ResponseMessage emptyFileAnewStorage(String type);
ResponseMessage<SarBussionessStand> importSarBussionessStandFile(MultipartFile file)throws Exception;
ResponseMessage<String> importSarBussionessStandFile(MultipartFile file)throws Exception;
ResponseMessage repetitionFile();
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+40 -87
View File
@@ -2017,7 +2017,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
* @throws Exception
*/
@Override
public ResponseMessage<SarBussionessStand> importSarBussionessStandFile(MultipartFile file)throws Exception {
public ResponseMessage<String> importSarBussionessStandFile(MultipartFile file)throws Exception {
//给出头部信息
String[] headerExcel = {"企标编号,中文名称,英文名称,文本状态,发布日期,企标实施日期,企标制修订状态,起草部门,废止日期,代替企标编号,复审日期,起草人,被代替企标编号,采用标准,文件上传人员,采标程度,引用标准,适用车型,能源类型,适用产品线,上传时间,体系类别,备案日期,关联模块-乘用车VPPS编码,关联模块--乘用车vpps中文名称,关联模块--卡车VPPS编码,关联模块--卡车vpps中文名称,附件,企标类型,标准年份,"};
@@ -2055,6 +2055,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
//File excelfile = fileList.get(0);
int excel = 0;
for (File fileInfo:fileList){
String infoJson = "";
if (fileInfo.getName().contains(".xls") || fileInfo.getName().contains(".xlsx")) {
excel =excel+1;
if (excel > 1){
@@ -2071,7 +2072,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
//获取总条数
int rowNum = sheet.getLastRowNum();
//循环遍历
for (int i = 0;i < rowNum;i++){
for (int i = 0;i <= rowNum;i++){
Row row = sheet.getRow(i);
Row headerRow = sheet.getRow(0);
boolean isBlank = sarLawsInfoEOService.isRowEmpty(row);
@@ -2112,8 +2113,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
return Result.error("输入的标准名称过长");
}
sarBussStandAttrInfo.setStandName(standName);
}else {
return Result.error("标准名称不能为空");
}
String standEnName = rowList.get("英文名称");
@@ -2125,8 +2124,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
return Result.error("输入的文本状态过长");
}
sarBussStandAttrInfo.setTextStatusBuss(textStatusBuss);
}else {
return Result.error("文本状态不能为空");
}
SimpleDateFormat sdfs = new SimpleDateFormat("yyyy-MM-dd");
@@ -2135,8 +2132,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
String issueTimeStr = sdfs.format(issueTime);
if (StringUtils.isNotBlank(issueTimeStr)){
sarBussStandAttrInfo.setIssueTime(issueTimeStr);
}else {
return Result.error("发布日期不能为空");
}
@@ -2144,8 +2139,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
String putTimeStr = sdfs.format(putTime);
if (StringUtils.isNotBlank(putTimeStr)){
sarBussStandAttrInfo.setPutTime(putTimeStr);
}else {
return Result.error("企标实施日期不能为空");
}
@@ -2158,15 +2151,11 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
return Result.error("输入的起草部门过长");
}
sarBussStandAttrInfo.setQcdw(qcdw);
}else {
return Result.error("起草部门不能为空");
}
String fzrqbuss = rowList.get("废止日期");
if (StringUtils.isNotBlank(fzrqbuss)){
sarBussStandAttrInfo.setFzrqbuss(fzrqbuss);
}else {
return Result.error("废止日期不能为空");
}
@@ -2176,8 +2165,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
String fsrqbuss = rowList.get("复审日期");
if (StringUtils.isNotBlank(fsrqbuss)){
sarBussStandAttrInfo.setFsrqbuss(fsrqbuss);
}else {
return Result.error("复审日期不能为空");
}
@@ -2187,20 +2174,25 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
return Result.error("输入的起草人过长");
}
sarBussStandAttrInfo.setQcrbuss(qcrbuss);
}else {
return Result.error("起草人不能为空");
}
String bdtqbbhbuss = rowList.get("被代替企标编号");
sarBussStandAttrInfo.setBdtqbbhbuss(bdtqbbhbuss);
//// //采用标准 13
String cybz = rowList.get("采用标准");
sarBussStandAttrInfo.setCybz(cybz);
String wjscrybuss = rowList.get("文件上传人员");
sarBussStandAttrInfo.setWjscrybuss(wjscrybuss);
//// //采标程度 15
String cycd = rowList.get("采标程度");
sarBussStandAttrInfo.setCycd(cycd);
//// //引用标准 16
String yybz = rowList.get("引用标准");
sarBussStandAttrInfo.setYybz(yybz);
String sycxclass = rowList.get("适用车型");
sarBussStandAttrInfo.setSycxclass(sycxclass);
@@ -2214,8 +2206,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
String xcsjbuss = rowList.get("上传时间");
if (StringUtils.isNotBlank(xcsjbuss)){
sarBussStandAttrInfo.setXcsjbuss(xcsjbuss);
}else {
return Result.error("上传时间不能为空");
}
@@ -2223,13 +2213,27 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
sarBussStandAttrInfo.setTxlbbuss(txlbbuss);
//// //备案日期 22
//// //关联模块-乘用车VPPS编码 23
//// //关联模块--乘用车vpps中文名称 24
//// //关联模块--卡车VPPS编码 25
//// //关联模块--卡车vpps中文名称 26
String barq = rowList.get("备案日期");
sarBussStandAttrInfo.setBarq(barq);
String fbgBuss = rowList.get("附件");
String[] split = fbgBuss.split(",");
//// //关联模块-乘用车VPPS编码 23
String cycvppsbmbuss = rowList.get("关联模块-乘用车VPPS编码");
sarBussStandAttrInfo.setCycvppsbmbuss(cycvppsbmbuss);
//// //关联模块--乘用车vpps中文名称 24
String cycvppscnbuss = rowList.get("关联模块--乘用车vpps中文名称");
sarBussStandAttrInfo.setCycvppscnbuss(cycvppscnbuss);
//// //关联模块--卡车VPPS编码 25
String kcvppsbmbuss = rowList.get("关联模块--卡车VPPS编码");
sarBussStandAttrInfo.setKcvppsbmbuss(kcvppsbmbuss);
//// //关联模块--卡车vpps中文名称 26
String kcvppscnbuss = rowList.get("关联模块--卡车vpps中文名称");
sarBussStandAttrInfo.setKcvppscnbuss(kcvppscnbuss);
String qtwjbuss = rowList.get("附件");
String[] split = qtwjbuss.split(",");
String s = "";
if (split.length != 0){
for (int j = 0;j < split.length;j++){
@@ -2238,14 +2242,12 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
File files = new File(split1[0]+split[j]);
AttFileVo attFileVo = attFileEOService.saveFileInfo(files);
if (StringUtils.isNotBlank(attFileVo.getId())){
s = "," + attFileVo.getAttId();
s += "," + attFileVo.getAttId();
}else {
s = attFileVo.getAttId();
}
sarBussStandAttrInfo.setFbgBuss(s);
}
}else {
sarBussStandAttrInfo.setFbgBuss(StringUtils.join(split));
sarBussStandAttrInfo.setQtwjbuss(s);
}
String standSort = rowList.get("企标类型");
@@ -2254,8 +2256,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
return Result.error("企标类型输入过长");
}
sarBussStandAttrInfo.setStandSort(standSort);
}else {
return Result.error("企标类型不能为空");
}
String standYear = rowList.get("标准年份");
@@ -2264,22 +2264,18 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
return Result.error("标准年份输入过长");
}
sarBussStandAttrInfo.setStandYear(standYear);
}else {
return Result.error("标准年份不能为空");
}
List<SarBussStandAttrInfoExecl> list = new ArrayList<>();
list.add(sarBussStandAttrInfo);
//进行转义
attrInfoShowImport(list);
com.alibaba.fastjson.JSONArray json = com.alibaba.fastjson.JSONArray.parseArray(JSON.toJSONString(list));
com.alibaba.fastjson.JSONObject jsonObjects = null;
for (int j = 0; j < json.size(); j++) {
jsonObjects = json.getJSONObject(j);
}
String infoJson = String.valueOf(jsonObjects);
infoJson = String.valueOf(jsonObjects);
//入库
processCreateBuss(infoJson);
}
@@ -2297,17 +2293,15 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
}
}catch (Exception e){
FileUnZip.deleteDir(saveDirectory);
return Result.error("导入失败");
return Result.error("导入失败,请查看需要导入的企标标准号和企标名称是否已存在");
}
}
}
}catch (Exception e){
FileUnZip.deleteDir(saveDirectory);
return Result.error("导入失败,没有可导入的数据,请检查!");
}
return null;
return Result.success("","导入完成",true);
}
private static List<File> readImpExcelFile(String path) {
@@ -2371,7 +2365,8 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
.eq(sarBussionessStand.getStandName() != null,"STAND_NAME",sarBussionessStand.getStandName());
Integer count = iSarBussionessStandService.count(queryWrapper);
if (count > 0){
throw new AdcDaBaseException("当前企标标准号和企标名称已存在");
//return Result.error("当前企标标准号和企标名称已存在");
throw new AdcDaBaseException("企标标准号"+ sarBussionessStand.getStandCode() +"或企标名称"+ sarBussionessStand.getStandName() +"已存在");
}
String standCode = "";
@@ -2415,52 +2410,10 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
} else {//标准号、ID都不存在的情况
// 新增方法
sarBussionessStand.setStandCode(standCode);
// sarBussionessStand.setStandNumber("");
// sarBussionessStand.setStandSn("");
// sarBussionessStand.setReviseStatus("");
ResponseMessage<SarBussionessStand> responseMessage = iSarBussionessStandService.createSarBussionessStand(sarBussionessStand);
if(responseMessage.isOk()){
SarBussionessStand bussionessStand = responseMessage.getData();
bussId = bussionessStand.getId() == null ? "":bussionessStand.getId();
}
}
List<BusProcessEvaluationHis> evaluationHis = new ArrayList<>();
Map<String, List<BusProcessEvaluationHis>> listMap = new TreeMap<>();
List<QualityEvaluation> evaluations = new ArrayList<>();
if(!listMap.isEmpty()){
SimpleDateFormat sdf=new SimpleDateFormat("yyy-MM-dd HH:mm:ss");
listMap.forEach((key, value) -> {
if(!value.isEmpty()){
evaluationHis.add(value.get(0));
}
});
String finalBussId = bussId;
Date date = new Date();
evaluationHis.forEach(busProcessEvaluationHis -> {
List<com.alibaba.fastjson.JSONObject> valueArr = com.alibaba.fastjson.JSONArray.parseArray(busProcessEvaluationHis.getMesg(), com.alibaba.fastjson.JSONObject.class);
if(!valueArr.isEmpty()){
valueArr.forEach(object -> {
QualityEvaluation evaluation = new QualityEvaluation();
evaluation.setId(UUIDUtils.randomUUID20());
evaluation.setLawId(finalBussId);
evaluation.setUserId(object.getString("userId"));
evaluation.setScore(object.getString("score"));
evaluation.setReason(object.getString("reason"));
evaluation.setEvaluationIndex(object.getString("code"));
evaluation.setProcessNode(object.getString("processNode"));
evaluation.setEvaluationType(object.getString("indexType"));
evaluation.setCreateTime(date);
evaluation.setModifyTime(date);
evaluations.add(evaluation);
});
}
});
qualityEvaluationService.saveBatch(evaluations);
iSarBussionessStandService.createSarBussionessStand(sarBussionessStand);
}
}
return bussId;
return null;
}
/**
adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java
+2 -2
View File
@@ -144,9 +144,9 @@ public class PersonCollectEOServiceImpl extends ServiceImpl<PersonCollectEODao,
List<String> ids = new ArrayList<>(Arrays.asList(modeType.split(",")));
wrapper.in("collect_type",ids);
}
if (validFlag != null && !validFlag.equals("") && validFlag == 0){
if (validFlag != null && !validFlag.equals("") && validFlag == 0){//有效
wrapper.eq("valid_flag",validFlag);
}else if (validFlag != null && !validFlag.equals("") && validFlag == 1){
}else if (validFlag != null && !validFlag.equals("") && validFlag == 1){//无效
wrapper.eq("valid_flag",validFlag);
}
wrapper.orderByDesc("creation_Time");