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_1

Browse Source
This commit is contained in:
yanyizhou
2021-08-25 17:03:28 +08:00
parent 74167d2d76 4dd609cd75
commit dbac199130
18 changed files with 612 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-main/src/main/resources/application-dev.properties
+6 -6
View File
@@ -3,8 +3,8 @@
# 数据库配置 # 数据库配置
#============================================= #=============================================
spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver
#spring.datasource.url = jdbc:mysql://39.100.23.127:3306/foton_slrs_test2?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false spring.datasource.url = jdbc:mysql://39.100.23.127:3306/foton_slrs_test2?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
spring.datasource.url = jdbc:mysql://10.96.10.171/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false #spring.datasource.url = jdbc:mysql://10.96.10.171/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
spring.datasource.username = root spring.datasource.username = root
spring.datasource.password = root spring.datasource.password = root
@@ -12,7 +12,7 @@ spring.datasource.password = root
#============================================== #==============================================
# 应用设置 # 应用设置
spring.application.name=FotonLAWSSystem spring.application.name=FotonLAWSSystem-w
application.code=20200101 application.code=20200101
application.center=1 application.center=1
#============================================== #==============================================
@@ -44,10 +44,10 @@ spring.mail.port=587
#spring.rabbitmq.username=uat_pcms #spring.rabbitmq.username=uat_pcms
#spring.rabbitmq.password=VxsBLL5bJruwzXfS #spring.rabbitmq.password=VxsBLL5bJruwzXfS
# spring.rabbitmq.publisher-confirms=true # spring.rabbitmq.publisher-confirms=true
spring.rabbitmq.host=62.234.118.181 spring.rabbitmq.host=62.234.136.153
spring.rabbitmq.port=5672 spring.rabbitmq.port=5672
spring.rabbitmq.username=admin spring.rabbitmq.username=guest
spring.rabbitmq.password=admin spring.rabbitmq.password=guest
spring.rabbitmq.listener.simple.acknowledge-mode= manual spring.rabbitmq.listener.simple.acknowledge-mode= manual
#消费失败消息干掉 #消费失败消息干掉
spring.rabbitmq.listener.simple.default-requeue-rejected= true spring.rabbitmq.listener.simple.default-requeue-rejected= true
adc-da-search/src/main/java/com/adc/da/search/entity/SeniorSearchInfoEO.java
+7
View File
@@ -40,6 +40,9 @@ public class SeniorSearchInfoEO extends BasePage {
@ApiModelProperty(value = "标准编号") @ApiModelProperty(value = "标准编号")
private String standNumber; private String standNumber;
@ApiModelProperty(value = "企标编号")
private String standCode;
@ApiModelProperty(value = "标准年份") @ApiModelProperty(value = "标准年份")
private String standYear; private String standYear;
@@ -107,6 +110,9 @@ public class SeniorSearchInfoEO extends BasePage {
@ApiModelProperty(value = "文本状态") @ApiModelProperty(value = "文本状态")
private String textStatus; private String textStatus;
@ApiModelProperty(value = "文本状态-企标")
private String textStatusBuss;
@ApiModelProperty(value = "标准体系") @ApiModelProperty(value = "标准体系")
private String standSystem; private String standSystem;
@@ -223,6 +229,7 @@ public class SeniorSearchInfoEO extends BasePage {
private String advanceSearchVOStr; private String advanceSearchVOStr;
private String CLLX; private String CLLX;
private String CYSD; private String CYSD;
private String QCDW;
private String CBCD; private String CBCD;
private String ZRLX; private String ZRLX;
private String SYCLLX; private String SYCLLX;
adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java
+59 -143
View File
@@ -153,44 +153,20 @@ public class SearchCenterServiceImpl implements SearchCenterService {
.should(QueryBuilders.wildcardQuery("stand_number", "*"+searchInfoEO.getSelectValue()+"*")); .should(QueryBuilders.wildcardQuery("stand_number", "*"+searchInfoEO.getSelectValue()+"*"));
break; break;
case "bussstand": case "bussstand":
multiQueryBuilder = QueryBuilders.multiMatchQuery(searchInfoEO.getSelectValue(), boolQueryShould.should(QueryBuilders.wildcardQuery("standSort.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
numbershowSplit,nameshowSplit,numbershowStr,nameshowStr,"numberExpNull","standstateshow", "standEnName",replaceStandNumStr, .should(QueryBuilders.wildcardQuery("stand_code.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
replacedStandNumStr,"countryShow","synopsis","standSortShow","ZQCBMShow","ZQCBM","stand_status", .should(QueryBuilders.wildcardQuery("standYear.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
"baseSearchContent",content,"numbershow","nameshow","standstateshow","issue_time","replaceStandNum","replacedStandNum","QBMJShow","QBSQShow","XHQBMShow","SVPPSName","XGBMName","ZYQCRShow","ZRBMShow","ZQCBMName","QTQCRShow","content","FSRQString","FZRQString","put_time","XGLC","WFSPJSName","GFXYYWJ","XGBMShow").minimumShouldMatch("100%"); .should(QueryBuilders.wildcardQuery("standName.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
boolQueryMust.must(multiQueryBuilder); .should(QueryBuilders.wildcardQuery("standEnName.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
boolQueryShould.should(QueryBuilders.wildcardQuery(nameshowStr, "*"+searchInfoEO.getSelectValue()+"*")) .should(QueryBuilders.wildcardQuery("textStatusBuss.keyword", "*"+searchInfoEO.getSelectValue()+"*"));
.should(QueryBuilders.wildcardQuery(numbershowStr, "*"+searchInfoEO.getSelectValue()+"*")) if (isRqFormat(searchInfoEO.getSelectValue())) {
.should(QueryBuilders.wildcardQuery(numbershowSplit, "*"+searchInfoEO.getSelectValue()+"*")) Long starttime = dateFormatToStr(searchInfoEO.getSelectValue()).getTime();
.should(QueryBuilders.wildcardQuery(nameshowSplit, "*"+searchInfoEO.getSelectValue()+"*")) Long endtime = dateFormatToStr(searchInfoEO.getSelectValue()).getTime();
.should(QueryBuilders.wildcardQuery("ZQCBMShow", "*"+searchInfoEO.getSelectValue()+"*")) RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery(ISSUE_TIME).format(EPOCH_MILLIS).from(starttime).to(endtime).includeLower(true).includeUpper(true);
.should(QueryBuilders.wildcardQuery("standstateshow", "*"+searchInfoEO.getSelectValue()+"*")) boolQueryShould.should(rangeQueryBuilder);
.should(QueryBuilders.wildcardQuery("ZQCBM", "*"+searchInfoEO.getSelectValue()+"*")) RangeQueryBuilder rangeQueryBuilder2 = QueryBuilders.rangeQuery(PUT_TIME).format(EPOCH_MILLIS).from(starttime).to(endtime).includeLower(true).includeUpper(true);
.should(QueryBuilders.wildcardQuery("stand_status", "*"+searchInfoEO.getSelectValue()+"*")) boolQueryShould.should(rangeQueryBuilder2);
}
.should(QueryBuilders.wildcardQuery("numbershow", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("standEnName", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("content", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("issue_time", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("nameshow", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("standstateshow", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("replaceStandNum", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("replacedStandNum", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("QBMJShow", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("QBSQShow", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("XHQBMShow", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("SVPPSName", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("XGBMName", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("ZYQCRShow", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("ZRBMShow", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("ZQCBMName", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("QTQCRShow", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("FSRQString", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("FZRQString", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("XGLC", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("WFSPJSName", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("GFXYYWJ", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("XGBMShow", "*"+searchInfoEO.getSelectValue()+"*"))
.should(QueryBuilders.wildcardQuery("put_time", "*"+searchInfoEO.getSelectValue()+"*"));
break; break;
default: break; default: break;
} }
@@ -262,6 +238,12 @@ public class SearchCenterServiceImpl implements SearchCenterService {
if(sarStandAttrEOStr == null){ if(sarStandAttrEOStr == null){
collectAttrMap = new TreeMap<>(); collectAttrMap = new TreeMap<>();
if(searchInfoEO.getQCDW() != null && StringUtils.isNotBlank(searchInfoEO.getQCDW())){
List<String> fieldList = Arrays.asList(searchInfoEO.getQCDW() .split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList());
JSONArray array= JSONArray.parseArray(JSON.toJSONString(fieldList));
collectAttrMap.put("QCDW",array);
}
if(searchInfoEO.getCYSD() != null && StringUtils.isNotBlank(searchInfoEO.getCYSD())){ if(searchInfoEO.getCYSD() != null && StringUtils.isNotBlank(searchInfoEO.getCYSD())){
List<String> fieldList = Arrays.asList(searchInfoEO.getCYSD() .split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList()); List<String> fieldList = Arrays.asList(searchInfoEO.getCYSD() .split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList());
JSONArray array= JSONArray.parseArray(JSON.toJSONString(fieldList)); JSONArray array= JSONArray.parseArray(JSON.toJSONString(fieldList));
@@ -277,10 +259,17 @@ public class SearchCenterServiceImpl implements SearchCenterService {
} }
String fieldInfo = InitStandAttrSearchUtil.queryField; String fieldInfo = InitStandAttrSearchUtil.queryField;
String fieldLawsInfo = InitStandAttrSearchUtil.queryFieldLaws;
String fieldBussInfo = InitStandAttrSearchUtil.queryFieldBuss;
List<String> fieldInfoList = Arrays.asList(fieldInfo .split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList()); List<String> fieldInfoList = Arrays.asList(fieldInfo .split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList());
List<String> fieldLawsInfoList = Arrays.asList(fieldLawsInfo .split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList());
List<String> fieldBussInfoList = Arrays.asList(fieldBussInfo .split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList());
List<String> fieldList = new ArrayList<>();
fieldList.addAll(fieldInfoList);
fieldList.addAll(fieldLawsInfoList);
fieldList.addAll(fieldBussInfoList);
// 自动匹配动态属性字段 es 查询 // 自动匹配动态属性字段 es 查询
for (String field : fieldInfoList) { for (String field : fieldList) {
// 关键字查询属性字段 // 关键字查询属性字段
String keyWordField = field + ".keyword"; String keyWordField = field + ".keyword";
String keyWordField2 = field + "Name.keyword"; String keyWordField2 = field + "Name.keyword";
@@ -576,115 +565,42 @@ public class SearchCenterServiceImpl implements SearchCenterService {
* boolQueryBuilder :must * boolQueryBuilder :must
* */ * */
public BoolQueryBuilder queryBussStandMsg(SeniorSearchInfoEO searchInfoEO, BoolQueryBuilder boolQueryBuilder, SearchRequestBuilder searchRequestBuilder) throws Exception{ public BoolQueryBuilder queryBussStandMsg(SeniorSearchInfoEO searchInfoEO, BoolQueryBuilder boolQueryBuilder, SearchRequestBuilder searchRequestBuilder) throws Exception{
String nameshowStr = "nameshow"; if(searchInfoEO.getSelectValue() == null || searchInfoEO.getSelectValue().equals("")){
String replacedStandNumStr = "replaced_stand_num"; // 高级搜索项，只针对标准
String replaceStandNumStr = "replace_stand_num"; if (StringUtils.isNotBlank(searchInfoEO.getStandSort())) {
// 高级搜索项，只针对标准 boolQueryBuilder.must(QueryBuilders.wildcardQuery("standSort.keyword", "*"+searchInfoEO.getStandSort()+"*"));
//分类代号
if (StringUtils.isNotBlank(searchInfoEO.getClassifyCode())) {
boolQueryBuilder.must(QueryBuilders.matchQuery("classifyCode", searchInfoEO.getClassifyCode()));
}
//编号，国内外标准，国内外法规，企业标准 有此属性
if (StringUtils.isNotBlank(searchInfoEO.getStandNumber())) {
boolQueryBuilder.must(QueryBuilders.wildcardQuery("standNumber", "*"+searchInfoEO.getStandNumber()+"*"));
}
//名称，国内外标准，国内外法规，企业标准 有此属性
if (StringUtils.isNotBlank(searchInfoEO.getNameShow())) {
boolQueryBuilder.must(QueryBuilders.wildcardQuery(nameshowStr, "*"+searchInfoEO.getNameShow()+"*"));
}
//标准英文名称
if (StringUtils.isNotBlank(searchInfoEO.getStandEnName())) {
boolQueryBuilder.must(QueryBuilders.matchQuery("standEnName", searchInfoEO.getStandEnName()));
}
if (searchInfoEO.getPutYear() != null && StringUtils.isNotEmpty(searchInfoEO.getPutYear())) {
boolQueryBuilder.must(QueryBuilders.wildcardQuery("putYear", "*"+searchInfoEO.getPutYear()+"*"));
}
//代替标准号
if (StringUtils.isNotBlank(searchInfoEO.getReplaceStandNum())) {
boolQueryBuilder.must(QueryBuilders.matchQuery(replaceStandNumStr, searchInfoEO.getReplaceStandNum()));
}
//主起草部门
if (StringUtils.isNotBlank(searchInfoEO.getZQCBM())) {
boolQueryBuilder.must(QueryBuilders.matchQuery("ZQCBM", searchInfoEO.getZQCBM()));
}
//被代替标准号
if (StringUtils.isNotBlank(searchInfoEO.getReplacedStandNum())) {
boolQueryBuilder.must(QueryBuilders.matchQuery(replacedStandNumStr, searchInfoEO.getReplacedStandNum()));
}
//标准状态，国内外标准，国内外法规，企业标准 有此属性
if (StringUtils.isNotBlank(searchInfoEO.getStandState())) {
// 如果等于All，相当于不限制，查询全部
if (!searchInfoEO.getStandState().equals("all") && !searchInfoEO.getStandState().equals("[]")) {
String[] arrlist = searchInfoEO.getStandState().split(",");
boolQueryBuilder.must(QueryBuilders.termsQuery("statecode.keyword", arrlist));
//boolQueryBuilder.must(QueryBuilders.matchQuery("statecode", searchInfoEO.getStandState()));
} }
} if (StringUtils.isNotBlank(searchInfoEO.getStandCode())) {
//发布日期 boolQueryBuilder.must(QueryBuilders.wildcardQuery("standCode.keyword", "*"+searchInfoEO.getStandCode()+"*"));
if (searchInfoEO.getIssueTime() != null) {
Long starttime = searchInfoEO.getIssueTime().getTime();
Long endtime = searchInfoEO.getIssueTime().getTime();
RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery(ISSUE_TIME).format(EPOCH_MILLIS).from(starttime).to(endtime).includeLower(true).includeUpper(true);
boolQueryBuilder.filter(rangeQueryBuilder);
}
//实施日期，国内外标准，国内外法规，企业标准 有此属性
if (searchInfoEO.getPutTime() != null) {
Long starttime = searchInfoEO.getPutTime().getTime();
Long endtime = searchInfoEO.getPutTime().getTime();
RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery("put_time").format(EPOCH_MILLIS).from(starttime).to(endtime).includeLower(true).includeUpper(true);
boolQueryBuilder.filter(rangeQueryBuilder);
}
//国家，国内外标准，国内外法规有此属性
if (StringUtils.isNotBlank(searchInfoEO.getCountry())) {
// 如果等于All，相当于不限制，查询全部
if (!searchInfoEO.getCountry().equals("all") && !searchInfoEO.getCountry().equals("[]") ) {
String[] arrlist = searchInfoEO.getCountry().split(",");
boolQueryBuilder.must(QueryBuilders.termsQuery("country.keyword", arrlist));
} }
} if (StringUtils.isNotBlank(searchInfoEO.getStandYear())) {
//标准类别，国内外标准有此属性 boolQueryBuilder.must(QueryBuilders.wildcardQuery("standYear.keyword", "*"+searchInfoEO.getStandYear()+"*"));
if (StringUtils.isNotBlank(searchInfoEO.getStandSort())) {
// 如果等于All，相当于不限制，查询全部
if (!searchInfoEO.getStandSort().equals("all")&& !searchInfoEO.getStandSort().equals("[]")) {
String[] arrlist = searchInfoEO.getStandSort().split(",");
boolQueryBuilder.must(QueryBuilders.termsQuery("stand_sort.keyword", arrlist));
//boolQueryBuilder.must(QueryBuilders.matchQuery("stand_sort", searchInfoEO.getStandSort()));
} }
} if (StringUtils.isNotBlank(searchInfoEO.getStandName())) {
//发布时间范围 boolQueryBuilder.must(QueryBuilders.wildcardQuery("standName.keyword", "*"+searchInfoEO.getStandName()+"*"));
if (searchInfoEO.getIssueTimeSt() != null || searchInfoEO.getIssueTimeEd() != null) {
Long starttime = 0L;
Long endtime = 0L;
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
if (searchInfoEO.getIssueTimeSt() != null) {
starttime = searchInfoEO.getIssueTimeSt().getTime();
} else {
starttime = sdf.parse("1970-01-01 00:00:00").getTime();
} }
if (searchInfoEO.getIssueTimeEd() != null) { if (StringUtils.isNotBlank(searchInfoEO.getStandEnName())) {
endtime = searchInfoEO.getIssueTimeEd().getTime(); boolQueryBuilder.must(QueryBuilders.wildcardQuery("standEnName.keyword", "*"+searchInfoEO.getStandEnName()+"*"));
} else {
endtime = sdf.parse("2999-01-01 00:00:00").getTime();
} }
RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery(ISSUE_TIME).format(EPOCH_MILLIS).from(starttime).to(endtime).includeLower(true).includeUpper(true);
boolQueryBuilder.filter(rangeQueryBuilder); if (StringUtils.isNotBlank(searchInfoEO.getTextStatusBuss())) {
} boolQueryBuilder.must(QueryBuilders.wildcardQuery("textStatusBuss.keyword", "*"+searchInfoEO.getTextStatusBuss()+"*"));
if (searchInfoEO.getPutTimeSt() != null || searchInfoEO.getPutTimeEd() != null) {
Long starttime = 0L;
Long endtime = 0L;
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
if (searchInfoEO.getPutTimeSt() != null) {
starttime = searchInfoEO.getPutTimeSt().getTime();
} else {
starttime = sdf.parse("1970-01-01 00:00:00").getTime();
} }
if (searchInfoEO.getPutTimeEd() != null) {
endtime = searchInfoEO.getPutTimeEd().getTime(); if (searchInfoEO.getIssueTime() != null) {
} else { Long starttime = searchInfoEO.getIssueTime().getTime();
endtime = sdf.parse("2999-01-01 00:00:00").getTime(); Long endtime = searchInfoEO.getIssueTime().getTime();
RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery(ISSUE_TIME).format(EPOCH_MILLIS).from(starttime).to(endtime).includeLower(true).includeUpper(true);
boolQueryBuilder.filter(rangeQueryBuilder);
} }
RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery(PUT_TIME).format(EPOCH_MILLIS).from(starttime).to(endtime).includeLower(true).includeUpper(true);
boolQueryBuilder.filter(rangeQueryBuilder); if (searchInfoEO.getPutTime() != null) {
Long starttime = searchInfoEO.getPutTime().getTime();
Long endtime = searchInfoEO.getPutTime().getTime();
RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery(PUT_TIME).format(EPOCH_MILLIS).from(starttime).to(endtime).includeLower(true).includeUpper(true);
boolQueryBuilder.filter(rangeQueryBuilder);
}
} }
querySeniorMsg(searchInfoEO,boolQueryBuilder); querySeniorMsg(searchInfoEO,boolQueryBuilder);
return boolQueryBuilder; return boolQueryBuilder;
@@ -734,7 +650,7 @@ public class SearchCenterServiceImpl implements SearchCenterService {
String[] seniortypeLaws = {"country","statecode","SYCLLX","ZRLX","WSSFCY"}; String[] seniortypeLaws = {"country","statecode","SYCLLX","ZRLX","WSSFCY"};
seniortype = seniortypeLaws.clone(); seniortype = seniortypeLaws.clone();
} else if ("bussstand".equals(searchInfoEO.getSelectIndex())) { } else if ("bussstand".equals(searchInfoEO.getSelectIndex())) {
String[] seniortypeBuss = {"statecode","ZQCBM"}; String[] seniortypeBuss = {"textStatusBuss","QCDW"};
seniortype = seniortypeBuss.clone(); seniortype = seniortypeBuss.clone();
} else { } else {
String[] seniortypeMsg = {"module"}; String[] seniortypeMsg = {"module"};
adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java
+26 -40
View File
@@ -277,7 +277,7 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService {
String con = String.valueOf(attrInfoMap.get("content")); String con = String.valueOf(attrInfoMap.get("content"));
con = con.replace(",",""); con = con.replace(",","");
if (StringUtils.isBlank(con)){ if (StringUtils.isBlank(con)){
attrInfoMap.put("content","--"); attrInfoMap.put("content","");
} }
} }
} }
@@ -288,7 +288,7 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService {
if (null != attrInfoMap.get("issue_time") && !"".equals(attrInfoMap.get("issue_time")) && !"null".equals(attrInfoMap.get("issue_time"))) { if (null != attrInfoMap.get("issue_time") && !"".equals(attrInfoMap.get("issue_time")) && !"null".equals(attrInfoMap.get("issue_time"))) {
fullTextSearchEO.put("issue_time", attrInfoMap.get("issue_time")); fullTextSearchEO.put("issue_time", attrInfoMap.get("issue_time"));
}else { }else {
fullTextSearchEO.put("issue_time", "--"); fullTextSearchEO.put("issue_time", "");
} }
}else if ("bussstand".equals(attrInfoMap.get("type"))){ }else if ("bussstand".equals(attrInfoMap.get("type"))){
@@ -297,42 +297,28 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService {
attrInfoMap.put(key, "null"); attrInfoMap.put(key, "null");
} }
} }
fullTextSearchEO.put("title",attrInfoMap.get("standNumber")+" - 《"+attrInfoMap.get("nameshow")+"》"); fullTextSearchEO.put("title",attrInfoMap.get("stand_code"));
StringBuilder contentBuilder = new StringBuilder(); StringBuilder contentBuilder = new StringBuilder();
SimpleDateFormat format = new SimpleDateFormat("yyyy-M-dd HH:mm:ss"); contentBuilder.append("企标类别:").append(attrInfoMap.get("standSort")).append(" ");
contentBuilder.append("企标编号: ").append(String.valueOf(attrInfoMap.get("numbershow"))).append(" "); contentBuilder.append("标准年份:").append(attrInfoMap.get("standYear")).append(" ");
contentBuilder.append("企标名称: ").append(String.valueOf(attrInfoMap.get("nameshow"))).append(" "); contentBuilder.append("企标名称:").append(attrInfoMap.get("standName")).append(" ");
contentBuilder.append("英文名称: ").append(attrInfoMap.get("standEnName")).append(" "); contentBuilder.append("企标英文名称:").append(attrInfoMap.get("standName")).append(" ");
contentBuilder.append("标准状态: ").append(String.valueOf(attrInfoMap.get("standstateshow"))).append(" "); contentBuilder.append("文本状态:").append(attrInfoMap.get("textStatusBussName")).append(" ");
// contentBuilder.append("发布日期:"+String.valueOf(attrInfoMap.get("issue_time"))+" "); contentBuilder.append("企标实施日期:").append(attrInfoMap.get("putTime")).append(" ");
contentBuilder.append("标准实施日期: "); contentBuilder.append("废止日期:").append(attrInfoMap.get("FZRQBUSSName")).append(" ");
contentBuilder.append(String.valueOf(attrInfoMap.get("put_time"))); contentBuilder.append("复审日期:").append(attrInfoMap.get("FSRQBUSSName")).append(" ");
contentBuilder.append("代替企标编号: ").append(attrInfoMap.get("replaceStandNum")); contentBuilder.append("起草部门:").append(attrInfoMap.get("QCDWName")).append(" ");
contentBuilder.append("被代替企标编号: ").append(attrInfoMap.get("replacedStandNum")); contentBuilder.append("起草人:").append(attrInfoMap.get("QCRBUSSName")).append(" ");
contentBuilder.append("废止日期: "); contentBuilder.append("文件上传人员:").append(attrInfoMap.get("WJSCRYBUSSName")).append(" ");
if (StringUtils.isNotBlank(String.valueOf(attrInfoMap.get("FZRQString")).trim())) { contentBuilder.append("适用车型:").append(attrInfoMap.get("SYCXCLASSName")).append(" ");
contentBuilder.append(String.valueOf(attrInfoMap.get("FZRQString"))).append(" "); contentBuilder.append("能源类型:").append(attrInfoMap.get("NYLXCLASSName")).append(" ");
}else{ contentBuilder.append("适用产品线:").append(attrInfoMap.get("SYCPXCLASSName")).append(" ");
contentBuilder.append("--").append(" "); contentBuilder.append("体系类别:").append(attrInfoMap.get("TXLBBUSSName")).append(" ");
} contentBuilder.append("关联模块VPPS编码:").append(attrInfoMap.get("VPPSBMBUSSName")).append(" ");
contentBuilder.append("复审日期: "); contentBuilder.append("关联模块中文名称:").append(attrInfoMap.get("VPPSCNBUSSName")).append(" ");
if (StringUtils.isNotBlank(String.valueOf(attrInfoMap.get("FSRQString")).trim())) { contentBuilder.append("代替企标编号:").append(attrInfoMap.get("DTQBBHBUSSName")).append(" ");
contentBuilder.append(String.valueOf(attrInfoMap.get("FSRQString"))).append(" "); contentBuilder.append("被代替企标编号:").append(attrInfoMap.get("BDTQBBHBUSSName")).append(" ");
}else{
contentBuilder.append("--").append(" ");
}
contentBuilder.append("密级: ").append(String.valueOf(attrInfoMap.get("QBMJShow"))).append(" ");
contentBuilder.append("授权: ").append(String.valueOf(attrInfoMap.get("QBSQShow"))).append(" ");
contentBuilder.append("涉及会签部门: ").append(String.valueOf(attrInfoMap.get("XHQBMShow"))).append(" ");
contentBuilder.append("SVPPS: ").append(String.valueOf(attrInfoMap.get("SVPPSName"))).append(" ");
contentBuilder.append("相关部门: ").append(String.valueOf(attrInfoMap.get("XGBMShow"))).append(" ");
contentBuilder.append("主起草人: ").append(String.valueOf(attrInfoMap.get("ZYQCRShow"))).append(" ");
contentBuilder.append("起草部门: ").append(String.valueOf(attrInfoMap.get("ZRBMShow"))).append(" ");
contentBuilder.append("主起草部门: ").append(String.valueOf(attrInfoMap.get("ZQCBMName"))).append(" ");
contentBuilder.append("其他起草人: ").append(String.valueOf(attrInfoMap.get("QTQCRShow"))).append(" ");
contentBuilder.append("外发审批角色: ").append(String.valueOf(attrInfoMap.get("WFSPJSShow"))).append(" ");
contentBuilder.append("规范性引用文件: ").append(String.valueOf(attrInfoMap.get("GFXYYWJ"))).append(" ");
contentBuilder.append("相关流程: ").append(String.valueOf(attrInfoMap.get("XGLC"))).append(" ");
if (attrInfoMap.containsKey("content")){ if (attrInfoMap.containsKey("content")){
if (null !=attrInfoMap.get("content") && StringUtils.isNotBlank(String.valueOf(attrInfoMap.get("content")))){ if (null !=attrInfoMap.get("content") && StringUtils.isNotBlank(String.valueOf(attrInfoMap.get("content")))){
String con = String.valueOf(attrInfoMap.get("content")); String con = String.valueOf(attrInfoMap.get("content"));
@@ -347,10 +333,10 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService {
StringBuilder textContent = replaceAll(contentBuilder, "null", "--"); StringBuilder textContent = replaceAll(contentBuilder, "null", "--");
fullTextSearchEO.put("textContent",textContent.toString()); fullTextSearchEO.put("textContent",textContent.toString());
if (null != attrInfoMap.get("issue_time") && !"".equals(attrInfoMap.get("issue_time")) && !"null".equals(attrInfoMap.get("issue_time"))) { if (null != attrInfoMap.get("issueTime") && !"".equals(attrInfoMap.get("issueTime")) && !"null".equals(attrInfoMap.get("issueTime"))) {
fullTextSearchEO.put("issue_time", attrInfoMap.get("issue_time")); fullTextSearchEO.put("issue_time", attrInfoMap.get("issueTime"));
}else { }else {
fullTextSearchEO.put("issue_time", "--"); fullTextSearchEO.put("issue_time", "");
} }
} }
return fullTextSearchEO; return fullTextSearchEO;
adc-da-slrs/src/main/java/com/adc/da/mq/CreateStandMQService.java
+1 -1
View File
@@ -43,7 +43,7 @@ public class CreateStandMQService {
this.rabbitTemplate.convertAndSend("laws-exchange_SQ_GSAR", "laws-key_SQ_GSAR", lawsMap); this.rabbitTemplate.convertAndSend("laws-exchange_SQ_GSAR", "laws-key_SQ_GSAR", lawsMap);
} }
public void sendBussStandMQ(SarBussionessStand sarBussionessStandEO, String addOrUpdate) throws Exception{ public void sendBussStandMQ(Object sarBussionessStandEO, String addOrUpdate) throws Exception{
JSONObject json = JSONObject.fromObject(sarBussionessStandEO); JSONObject json = JSONObject.fromObject(sarBussionessStandEO);
String sarBussInfoStr = json.toString(); String sarBussInfoStr = json.toString();
Map<String,Object> bussMap = new HashMap<String,Object>(); Map<String,Object> bussMap = new HashMap<String,Object>();
adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java
+23 -44
View File
@@ -69,81 +69,57 @@ public class SendBussMQService {
public void insertOrUpdateBussInfo(Map<String,Object> bussMap) throws Exception { public void insertOrUpdateBussInfo(Map<String,Object> bussMap) throws Exception {
String addOrUpdate = bussMap.get("addOrUpdate").toString(); String addOrUpdate = bussMap.get("addOrUpdate").toString();
String sarBuss = bussMap.get("sarBuss").toString();
JSONObject jsonobject = JSONObject.fromObject(sarBuss);
SarBussionessStand infoEO = (SarBussionessStand) JSONObject.toBean(jsonobject,SarBussionessStand.class);
String FZRQFSRQ = null; String FZRQFSRQ = null;
if ("updateFromAct".equals(addOrUpdate)){ if ("updateFromAct".equals(addOrUpdate)){
addOrUpdate = "update"; addOrUpdate = "update";
FZRQFSRQ = "1"; FZRQFSRQ = "1";
} }
String sarBuss = bussMap.get("sarBuss").toString();
JSONObject jsonobject = JSONObject.fromObject(sarBuss); String sarStandAttrEOStr = infoEO.getSarStandAttrEOStr();
SarBussionessStand infoEO = (SarBussionessStand) JSONObject.toBean(jsonobject, SarBussionessStand.class); Map<String,Object> attrInfoMap = JSONObject.fromObject(sarStandAttrEOStr);
String jsonobject1 = infoEO.getSarStandAttrEOStr(); Map<String,Object> infoMap = infoEO.getAttrInfoCaseMap();
Map<String,Object> map1 = new HashMap<>();
if (StringUtils.isEmpty(jsonobject1)){
map1.put("null","null");
}else {
map1 = JSONObject.fromObject(jsonobject1);
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
//修改索引信息表 //修改索引信息表
// 往索引表中插入数据 // 往索引表中插入数据
String baseSearchContent = ""; String baseSearchContent = "";
String getCodeName = ""; String getCodeName = "";
Map<String,Object> saveMap = new HashMap<>(); Map<String,Object> saveMap = new HashMap<>();
String a = null;
try{
a = sdf.format(infoEO.getIssueTime());
saveMap.put("issue_time"," "+a);
}catch (Exception e){
saveMap.put("issue_time"," ");
}
//发布日期 高级查询 //发布日期 高级查询
saveMap.put("issueTime",dateFormatToStr(infoEO.getIssueTime()));
Date issue_time_data = null; Date issue_time_data = null;
if (StringUtils.isNotBlank(a)) { if (StringUtils.isNotBlank(infoEO.getIssueTime())) {
try { try {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
issue_time_data = format.parse(saveMap.get("issue_time")+" 00:00:00"); issue_time_data = format.parse(dateFormatToStr(infoEO.getIssueTime())+" 00:00:00");
} catch (ParseException ignored) { } catch (ParseException ignored) {
} }
} }
if (issue_time_data != null) { if (issue_time_data != null) {
Calendar calendar = Calendar.getInstance(); saveMap.put("issue_time_data",issue_time_data.getTime());
calendar.setTime(issue_time_data);
int month = calendar.get(Calendar.MONTH)+1;
String times = calendar.get(Calendar.YEAR) + String.format("%02d", month) + String.format("%02d",calendar.get(Calendar.DAY_OF_MONTH));
saveMap.put("issue_time_data",Long.valueOf(times));
}else{ }else{
saveMap.put("issue_time_data",-1000000000000000000L); saveMap.put("issue_time_data",-1000000000000000000L);
} }
try{
saveMap.put("put_time"," "+ sdf.format(infoEO.getPutTime()));
}catch (Exception e){
saveMap.put("put_time"," ");
}
//实施日期 高级查询 //实施日期 高级查询
saveMap.put("putTime",dateFormatToStr(infoEO.getPutTime()));
Date put_time_data = null; Date put_time_data = null;
if (StringUtils.isNotBlank(a)) { if (StringUtils.isNotBlank(infoEO.getPutTime())) {
try { try {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
put_time_data = format.parse(saveMap.get("put_time")+" 00:00:00"); put_time_data = format.parse(dateFormatToStr(infoEO.getIssueTime())+" 00:00:00");
} catch (ParseException ignored) { } catch (ParseException ignored) {
} }
} }
if (put_time_data != null) { if (put_time_data != null) {
Calendar calendar = Calendar.getInstance(); saveMap.put("put_time_data",put_time_data.getTime());
calendar.setTime(put_time_data);
int month = calendar.get(Calendar.MONTH)+1;
String times = calendar.get(Calendar.YEAR) + String.format("%02d", month) + String.format("%02d",calendar.get(Calendar.DAY_OF_MONTH));
saveMap.put("put_time_data",Long.valueOf(times));
}else{ }else{
saveMap.put("put_time_data",-1000000000000000000L); saveMap.put("put_time_data",-1000000000000000000L);
} }
// saveMap.put("put_time",sdf.format(infoEO.getPutTime()));
saveMap.put("id",infoEO.getId()); saveMap.put("id",infoEO.getId());
saveMap.put("standSort",infoEO.getStandSort()); saveMap.put("standSort",infoEO.getStandSort());
@@ -172,6 +148,13 @@ public class SendBussMQService {
String codeName = sysInfoEOService.getDicNamesByCodes(infoEO.getStandStatus()); String codeName = sysInfoEOService.getDicNamesByCodes(infoEO.getStandStatus());
saveMap.put("standstateshow",codeName); saveMap.put("standstateshow",codeName);
} }
String textStatusBussName = "";
if(infoEO.getTextStatusBuss() != null && StringUtils.isNotBlank(infoEO.getTextStatusBuss())){
List<String> valArr = Arrays.asList(infoEO.getTextStatusBuss().split(","));
textStatusBussName = dicTypeEODao.getDicNamesByCodes(valArr);
}
saveMap.put("textStatusBuss",infoEO.getTextStatusBuss());
saveMap.put("textStatusBussName",textStatusBussName);
//新加字段 //新加字段
saveMap.put("country",infoEO.getApplyCountry()); saveMap.put("country",infoEO.getApplyCountry());
if(StringUtils.isNotEmpty(infoEO.getApplyCountry())){ if(StringUtils.isNotEmpty(infoEO.getApplyCountry())){
@@ -179,10 +162,6 @@ public class SendBussMQService {
saveMap.put("countryShow",codeName); saveMap.put("countryShow",codeName);
} }
// 自定义属性字段 // 自定义属性字段
String sarStandAttrEOStr = infoEO.getSarStandAttrEOStr();
Map<String,Object> attrInfoMap = JSONObject.fromObject(sarStandAttrEOStr);
Map<String,Object> infoMap = infoEO.getAttrInfoMap();
if (attrInfoMap != null && !attrInfoMap.isEmpty()) { if (attrInfoMap != null && !attrInfoMap.isEmpty()) {
attrInfoMap = sysInfoEOService.changeSelectInfo(attrInfoMap, "stand",baseSearchContent); attrInfoMap = sysInfoEOService.changeSelectInfo(attrInfoMap, "stand",baseSearchContent);
saveMap.putAll(attrInfoMap); saveMap.putAll(attrInfoMap);
adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java
+5 -8
View File
@@ -80,14 +80,11 @@ public class ScheduledJob {
*/ */
System.out.println("开始执行预警!!!"); System.out.println("开始执行预警!!!");
//预警期限 //预警期限
DataDTO dataDTO = new DataDTO(); DataDTO term = new DataDTO();
dataDTO.setStartDate(LocalDate.now().plusDays(1)) //系统日期的下一天
.setEndDate(LocalDate.now().plusMonths(3).plusDays(1));//系统日期3个月后
LinkedList<WarningEO> warningList = new LinkedList<>(); LinkedList<WarningEO> warningList = new LinkedList<>();
//分解单(条款) 新车型 mark=1 //分解单(条款) 新车型 mark=1
List<WarningEO> itemForXCXSSRQ = sarStandardItemDao.select(dataDTO, "XCXSSRQ"); List<WarningEO> itemForXCXSSRQ = sarStandardItemDao.select(term, "XCXSSRQ");
for (WarningEO warningEO : itemForXCXSSRQ) { for (WarningEO warningEO : itemForXCXSSRQ) {
warningEO.setId(UUIDUtils.randomUUID20()) warningEO.setId(UUIDUtils.randomUUID20())
.setPower("1") .setPower("1")
@@ -97,7 +94,7 @@ public class ScheduledJob {
warningList.addAll(itemForXCXSSRQ); warningList.addAll(itemForXCXSSRQ);
//分解单(条款) 在产车型 mark=2 //分解单(条款) 在产车型 mark=2
List<WarningEO> itemForZCCSSRQ = sarStandardItemDao.select(dataDTO, "ZCCSSRQ"); List<WarningEO> itemForZCCSSRQ = sarStandardItemDao.select(term, "ZCCSSRQ");
for (WarningEO warningEO : itemForZCCSSRQ) { for (WarningEO warningEO : itemForZCCSSRQ) {
warningEO.setId(UUIDUtils.randomUUID20()) warningEO.setId(UUIDUtils.randomUUID20())
.setPower("1") .setPower("1")
@@ -107,7 +104,7 @@ public class ScheduledJob {
warningList.addAll(itemForZCCSSRQ); warningList.addAll(itemForZCCSSRQ);
//标准 新车型 预警 mark=3 //标准 新车型 预警 mark=3
List<WarningEO> standInfoXCXSSRQ = sarStandardInfoDao.select(dataDTO, "XCXSSRQ"); List<WarningEO> standInfoXCXSSRQ = sarStandardInfoDao.select(term, "XCXSSRQ");
for (WarningEO warningEO : standInfoXCXSSRQ) { for (WarningEO warningEO : standInfoXCXSSRQ) {
warningEO.setId(UUIDUtils.randomUUID20()) warningEO.setId(UUIDUtils.randomUUID20())
.setPower("1") .setPower("1")
@@ -118,7 +115,7 @@ public class ScheduledJob {
//标准 在产车型 mark=4 //标准 在产车型 mark=4
List<WarningEO> standInfoZCCSSRQ = sarStandardInfoDao.select(dataDTO, "ZCCSSRQ"); List<WarningEO> standInfoZCCSSRQ = sarStandardInfoDao.select(term, "ZCCSSRQ");
for (WarningEO warningEO : standInfoZCCSSRQ) { for (WarningEO warningEO : standInfoZCCSSRQ) {
warningEO.setId(UUIDUtils.randomUUID20()) warningEO.setId(UUIDUtils.randomUUID20())
.setPower("1") .setPower("1")
adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/DataDTO.java
+10 -1
View File
@@ -1,5 +1,6 @@
package com.adc.da.scheduled.entity; package com.adc.da.scheduled.entity;
import com.adc.da.base.entity.BaseEntity;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
@@ -8,11 +9,19 @@ import java.time.LocalDate;
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
public class DataDTO { public class DataDTO {
/**
* 预警的期限为系统日期的次日至3个月后
*/
private LocalDate startDate; private LocalDate startDate;
private LocalDate endDate; private LocalDate endDate;
private String str; // private String str;
public DataDTO() {
this.startDate =LocalDate.now().plusDays(1); //系统日期的下一天
this.endDate = LocalDate.now().plusMonths(3).plusDays(1);//系统日期3个月后
}
} }
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandMenu/dao/SarBussStandMenuDao.java
+2
View File
@@ -31,4 +31,6 @@ public interface SarBussStandMenuDao extends BaseMapper<SarBussStandMenu> {
int deleteByStandIdAndMenuId (SarBussStandMenu sarStandMenuEO); int deleteByStandIdAndMenuId (SarBussStandMenu sarStandMenuEO);
int insertSelective (SarBussStandMenu sarStandMenuEO);
} }
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java
+2
View File
@@ -97,6 +97,8 @@ public interface SarBussionessStandDao extends BaseMapper<SarBussionessStand> {
int updateByPrimaryKeySelective(SarBussionessStand sarBussionessStandEO); int updateByPrimaryKeySelective(SarBussionessStand sarBussionessStandEO);
int insertSelective(SarBussionessStand sarBussionessStandEO);
} }
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java
+340 -3
View File
@@ -52,13 +52,12 @@ public class SarBussionessStand extends BaseEntity {
@ApiModelProperty(value = "发布日期") @ApiModelProperty(value = "发布日期")
@TableField("ISSUE_TIME") @TableField("ISSUE_TIME")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") private String issueTime;
private Date issueTime;
@ApiModelProperty(value = "实施日期") @ApiModelProperty(value = "实施日期")
@TableField("PUT_TIME") @TableField("PUT_TIME")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
private Date putTime; private String putTime;
@ApiModelProperty(value = "代替标准号") @ApiModelProperty(value = "代替标准号")
@TableField("REPLACE_STAND_NUM") @TableField("REPLACE_STAND_NUM")
@@ -192,5 +191,343 @@ public class SarBussionessStand extends BaseEntity {
@TableField(exist = false) @TableField(exist = false)
private List<SarStandAttrDetailsEO> attrInfoList = new ArrayList<>(); private List<SarStandAttrDetailsEO> attrInfoList = new ArrayList<>();
public static long getSerialVersionUID() {
return serialVersionUID;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getStandCode() {
return standCode;
}
public void setStandCode(String standCode) {
this.standCode = standCode;
}
public String getStandName() {
return standName;
}
public void setStandName(String standName) {
this.standName = standName;
}
public String getStandEnName() {
return standEnName;
}
public void setStandEnName(String standEnName) {
this.standEnName = standEnName;
}
public String getIssueTime() {
return issueTime;
}
public void setIssueTime(String issueTime) {
this.issueTime = issueTime;
}
public String getPutTime() {
return putTime;
}
public void setPutTime(String putTime) {
this.putTime = putTime;
}
public String getReplaceStandNum() {
return replaceStandNum;
}
public void setReplaceStandNum(String replaceStandNum) {
this.replaceStandNum = replaceStandNum;
}
public String getReplacedStandNum() {
return replacedStandNum;
}
public void setReplacedStandNum(String replacedStandNum) {
this.replacedStandNum = replacedStandNum;
}
public String getStandStatus() {
return standStatus;
}
public void setStandStatus(String standStatus) {
this.standStatus = standStatus;
}
public String getApplyCountry() {
return applyCountry;
}
public void setApplyCountry(String applyCountry) {
this.applyCountry = applyCountry;
}
public String getStandNature() {
return standNature;
}
public void setStandNature(String standNature) {
this.standNature = standNature;
}
public String getStandSort() {
return standSort;
}
public void setStandSort(String standSort) {
this.standSort = standSort;
}
public String getStandYear() {
return standYear;
}
public void setStandYear(String standYear) {
this.standYear = standYear;
}
public Integer getValidFlag() {
return validFlag;
}
public void setValidFlag(Integer validFlag) {
this.validFlag = validFlag;
}
public Date getCreationTime() {
return creationTime;
}
public void setCreationTime(Date creationTime) {
this.creationTime = creationTime;
}
public Date getModifyTime() {
return modifyTime;
}
public void setModifyTime(Date modifyTime) {
this.modifyTime = modifyTime;
}
public String getTextStatusBuss() {
return textStatusBuss;
}
public void setTextStatusBuss(String textStatusBuss) {
this.textStatusBuss = textStatusBuss;
}
public String getFirstPutTime() {
return firstPutTime;
}
public void setFirstPutTime(String firstPutTime) {
this.firstPutTime = firstPutTime;
}
public String getPutTimeShow() {
return putTimeShow;
}
public void setPutTimeShow(String putTimeShow) {
this.putTimeShow = putTimeShow;
}
public String getIssueTimeShow() {
return issueTimeShow;
}
public void setIssueTimeShow(String issueTimeShow) {
this.issueTimeShow = issueTimeShow;
}
public String getIssueTimeStr() {
return issueTimeStr;
}
public void setIssueTimeStr(String issueTimeStr) {
this.issueTimeStr = issueTimeStr;
}
public String getPutTimeStr() {
return putTimeStr;
}
public void setPutTimeStr(String putTimeStr) {
this.putTimeStr = putTimeStr;
}
public String getMenuId() {
return menuId;
}
public void setMenuId(String menuId) {
this.menuId = menuId;
}
public String getMenuParentId() {
return menuParentId;
}
public void setMenuParentId(String menuParentId) {
this.menuParentId = menuParentId;
}
public String getStandStatusShow() {
return standStatusShow;
}
public void setStandStatusShow(String standStatusShow) {
this.standStatusShow = standStatusShow;
}
public String getStandNatrueShow() {
return standNatrueShow;
}
public void setStandNatrueShow(String standNatrueShow) {
this.standNatrueShow = standNatrueShow;
}
public String getStandSortShow() {
return standSortShow;
}
public void setStandSortShow(String standSortShow) {
this.standSortShow = standSortShow;
}
public String getApplyCountryShow() {
return applyCountryShow;
}
public void setApplyCountryShow(String applyCountryShow) {
this.applyCountryShow = applyCountryShow;
}
public List<AttFileVo> getStandFileList() {
return standFileList;
}
public void setStandFileList(List<AttFileVo> standFileList) {
this.standFileList = standFileList;
}
public List<AttFileVo> getOpinionFilesList() {
return opinionFilesList;
}
public void setOpinionFilesList(List<AttFileVo> opinionFilesList) {
this.opinionFilesList = opinionFilesList;
}
public List<AttFileVo> getRelevanceFileList() {
return relevanceFileList;
}
public void setRelevanceFileList(List<AttFileVo> relevanceFileList) {
this.relevanceFileList = relevanceFileList;
}
public String getCollectId() {
return collectId;
}
public void setCollectId(String collectId) {
this.collectId = collectId;
}
public String getStandFileClassify() {
return standFileClassify;
}
public void setStandFileClassify(String standFileClassify) {
this.standFileClassify = standFileClassify;
}
public String getAttId() {
return attId;
}
public void setAttId(String attId) {
this.attId = attId;
}
public int getUpReplaceNumFlag() {
return upReplaceNumFlag;
}
public void setUpReplaceNumFlag(int upReplaceNumFlag) {
this.upReplaceNumFlag = upReplaceNumFlag;
}
public int getUpNumFlag() {
return upNumFlag;
}
public void setUpNumFlag(int upNumFlag) {
this.upNumFlag = upNumFlag;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public Map<String, Object> getAttrInfoMap() {
return attrInfoMap;
}
public void setAttrInfoMap(Map<String, Object> attrInfoMap) {
this.attrInfoMap = attrInfoMap;
}
public Map<String, Object> getAttrInfoCaseMap() {
return attrInfoCaseMap;
}
public void setAttrInfoCaseMap(Map<String, Object> attrInfoCaseMap) {
this.attrInfoCaseMap = attrInfoCaseMap;
}
public String getSarStandAttrEOStr() {
return sarStandAttrEOStr;
}
public void setSarStandAttrEOStr(String sarStandAttrEOStr) {
this.sarStandAttrEOStr = sarStandAttrEOStr;
}
public String getFileIds() {
return fileIds;
}
public void setFileIds(String fileIds) {
this.fileIds = fileIds;
}
public List<SarStandAttrDetailsEO> getAttrInfoList() {
return attrInfoList;
}
public void setAttrInfoList(List<SarStandAttrDetailsEO> attrInfoList) {
this.attrInfoList = attrInfoList;
}
} }
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+68 -18
View File
@@ -187,6 +187,49 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
return Result.success("0", "删除成功", sarStandardsInfoEO); return Result.success("0", "删除成功", sarStandardsInfoEO);
} }
public ResponseMessage<SarBussionessStand> createSarBussionessStand(SarBussionessStand sarBussionessStandEO) throws Exception {
//标准信息表中插入一条数据
sarBussionessStandEO.setValidFlag(ValueStateEnum.VALUE_TRUE.getValue());
sarBussionessStandEO.setCreationTime(new Date());
sarBussionessStandEO.setModifyTime(new Date());
sarBussionessStandEO.setId(UUIDUtils.randomUUID20());
//根据新建标准所在目录，确定此处是否需要在标准目录关联表中插入数据
if (StringUtils.isNotEmpty(sarBussionessStandEO.getMenuId())) {
SarBussStandMenu sarStandMenuEO = new SarBussStandMenu();
sarStandMenuEO.setBussStandId(sarBussionessStandEO.getId());
sarStandMenuEO.setMenuId(sarBussionessStandEO.getMenuId());
sarStandMenuEO.setValidFlag(ValueStateEnum.VALUE_TRUE.getValue());
sarStandMenuEO.setId(UUIDUtils.randomUUID20());
sarBussStandMenuEODao.insertSelective(sarStandMenuEO);
}
int insertresult = sarBussionessStandEODao.insertSelective(sarBussionessStandEO);
if (insertresult >= 1) {
// 根据代替标准号 ，修改代替标准号标准中的，被代替标准号
updateReplaceConnect(sarBussionessStandEO);
//编写预警信息
// writeWarnings(sarBussionessStandEO);
// 处理属性表信息
if (StringUtils.isNotBlank(sarBussionessStandEO.getSarStandAttrEOStr())) {
createStandAttrInfo(sarBussionessStandEO);
}
// 增加关联事件
String sortName = sysInfoEOService.getDicNamesByCodes(sarBussionessStandEO.getStandSort());
String number = sortName + " " + sarBussionessStandEO.getStandCode();
if (StringUtils.isNotBlank(sarBussionessStandEO.getStandYear())) {
number += "-" + sarBussionessStandEO.getStandYear();
}
String content = "新增" + number + " 《" + sarBussionessStandEO.getStandName() + "》";
sarUpdLogEOService.createBaseLog(sarBussionessStandEO.getId(),"BUSINESS",content);
if(elasflag) {
attrInfoShowSearchDetails(sarBussionessStandEO,"add");
createStandMQService.sendBussStandMQ(sarBussionessStandEO,"add");
}
return Result.success("00", "插入数据成功", sarBussionessStandEO);
} else {
return Result.error("01", "插入输入过程中出错");
}
}
@Override @Override
public List<SarBussionessStand> getSarBussionessStand(String exportType, String exportContent,String userId) throws Exception { public List<SarBussionessStand> getSarBussionessStand(String exportType, String exportContent,String userId) throws Exception {
@@ -324,6 +367,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
// 记录修改日志 // 记录修改日志
saveUpdateLog(sarBussionessStandEO,beforeStandEO); saveUpdateLog(sarBussionessStandEO,beforeStandEO);
if (elasflag) { if (elasflag) {
attrInfoShowSearchDetails(sarBussionessStandEO,"upd");
createStandMQService.sendBussStandMQ(sarBussionessStandEO, "update"); createStandMQService.sendBussStandMQ(sarBussionessStandEO, "update");
} }
} }
@@ -349,29 +393,35 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
} }
public Map<String,Object> changeMap (SarBussionessStand sarStandardsInfoEO,Map<String,Object> map) { public Map<String,Object> changeMap (SarBussionessStand sarStandardsInfoEO,Map<String,Object> map) {
map.put("country",sarStandardsInfoEO.getApplyCountry()); map.put("country",verifyObj(sarStandardsInfoEO.getApplyCountry()));
map.put("standSort",sarStandardsInfoEO.getStandSort()); map.put("standSort",verifyObj(sarStandardsInfoEO.getStandSort()));
map.put("standNumber",sarStandardsInfoEO.getStandCode()); map.put("standNumber",verifyObj(sarStandardsInfoEO.getStandCode()));
map.put("standYear",sarStandardsInfoEO.getStandYear()); map.put("standYear",verifyObj(sarStandardsInfoEO.getStandYear()));
map.put("standName",sarStandardsInfoEO.getStandName()); map.put("standName",verifyObj(sarStandardsInfoEO.getStandName()));
map.put("standEnName",sarStandardsInfoEO.getStandEnName()); map.put("standEnName",verifyObj(sarStandardsInfoEO.getStandEnName()));
map.put("standNature",sarStandardsInfoEO.getStandNature()); map.put("standNature",verifyObj(sarStandardsInfoEO.getStandNature()));
map.put("standState",sarStandardsInfoEO.getStandStatus()); map.put("standState",verifyObj(sarStandardsInfoEO.getStandStatus()));
if (sarStandardsInfoEO.getIssueTime() != null) { // if (sarStandardsInfoEO.getIssueTime() != null) {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); // SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
String issueStr = format.format(sarStandardsInfoEO.getIssueTime()); // String issueStr = format.format(sarStandardsInfoEO.getIssueTime());
map.put("issueTime",issueStr); // map.put("issueTime",issueStr);
} // }
if (sarStandardsInfoEO.getPutTime() != null) { map.put("issueTime", verifyObj(sarStandardsInfoEO.getIssueTime()));
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); map.put("putTime", verifyObj(sarStandardsInfoEO.getPutTime()));
String issueStr = format.format(sarStandardsInfoEO.getPutTime()); // if (sarStandardsInfoEO.getPutTime() != null) {
map.put("putTime",issueStr); // SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
} // String issueStr = format.format(sarStandardsInfoEO.getPutTime());
// map.put("putTime",issueStr);
// }
map.put("replaceStandNum",sarStandardsInfoEO.getReplaceStandNum()); map.put("replaceStandNum",sarStandardsInfoEO.getReplaceStandNum());
map.put("replacedStandNum",sarStandardsInfoEO.getReplacedStandNum()); map.put("replacedStandNum",sarStandardsInfoEO.getReplacedStandNum());
return map; return map;
} }
private Object verifyObj(Object str){
return str == null ? "" : str;
}
public void updateCollectAndShare(SarBussionessStand sarBussionessStandEO) throws Exception { public void updateCollectAndShare(SarBussionessStand sarBussionessStandEO) throws Exception {
//修改收藏表中 //修改收藏表中
String number = sarBussionessStandEO.getStandCode()+ "）"; String number = sarBussionessStandEO.getStandCode()+ "）";
adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/controller/TsResourceController.java
+1 -1
View File
@@ -81,7 +81,7 @@ public class TsResourceController extends BaseController<TsResource> {
} }
@ApiOperation("删除资源") @ApiOperation("删除资源")
@DeleteMapping @PutMapping("/delResourceById")
public ResponseMessage<Object> delResource(@RequestParam String resourceId){ public ResponseMessage<Object> delResource(@RequestParam String resourceId){
return tsResourceService.delResource(resourceId); return tsResourceService.delResource(resourceId);
} }
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/controller/SarStandAttrDetailsController.java
+1 -1
View File
@@ -101,7 +101,7 @@ public class SarStandAttrDetailsController extends BaseController<SarStandAttrDe
String resultMsg = sarStandAttrDetailsEOService.createStandAttrDetails(sarStandAttrDetailsEO); String resultMsg = sarStandAttrDetailsEOService.createStandAttrDetails(sarStandAttrDetailsEO);
if ("success".equals(resultMsg)) { if ("success".equals(resultMsg)) {
// 重新加载数据 // 重新加载数据
// sarStandAttrDetailsEOService.getAttrDetails(); sarStandAttrDetailsEOService.getAttrDetails();
return Result.success("0","新增成功",sarStandAttrDetailsEO); return Result.success("0","新增成功",sarStandAttrDetailsEO);
} else { } else {
return Result.error("0","新增失败,"+resultMsg); return Result.error("0","新增失败,"+resultMsg);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java
+5
View File
@@ -41,6 +41,8 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
private SarLawsAttrDetailedListDao sarLawsAttrDetailedListDao; private SarLawsAttrDetailedListDao sarLawsAttrDetailedListDao;
@Autowired @Autowired
private SarStandardsInfoController sarStandardsInfoController; private SarStandardsInfoController sarStandardsInfoController;
@Autowired
private SarStandItemsDao sarStandItemsDao;
public List<ActSarItemsEO> queryItemsByList(SarStandItemsEOPage page, String resType){ public List<ActSarItemsEO> queryItemsByList(SarStandItemsEOPage page, String resType){
List<SarStandItems> itemsEOList = dao.queryItemsByList(page); List<SarStandItems> itemsEOList = dao.queryItemsByList(page);
@@ -179,6 +181,9 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
@Override @Override
public String sarStandItemsaveBatch(List<SarStandItems> sarStandItems) { public String sarStandItemsaveBatch(List<SarStandItems> sarStandItems) {
if (null!=sarStandItems && sarStandItems.size()>0) {
sarStandItemsDao.deleteByStandIdAndFileType(sarStandItems.get(0).getStandId(), sarStandItems.get(0).getFileType());
}
boolean flag=this.saveBatch(sarStandItems); boolean flag=this.saveBatch(sarStandItems);
if (flag){ if (flag){
return "0"; return "0";
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java
+4 -1
View File
@@ -1,6 +1,7 @@
package com.adc.da.slrs.sarStandWarning.service.Impl; package com.adc.da.slrs.sarStandWarning.service.Impl;
import com.adc.da.scheduled.entity.DataDTO;
import com.adc.da.slrs.sarStandWarning.dao.EarlyWarningEODao; import com.adc.da.slrs.sarStandWarning.dao.EarlyWarningEODao;
import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO;
import com.adc.da.slrs.sarStandWarning.service.EarlyWarningEOService; import com.adc.da.slrs.sarStandWarning.service.EarlyWarningEOService;
@@ -107,7 +108,9 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl<EarlyWarningEODao, Ea
return "更改成功"; return "更改成功";
} }
private IPage<EarlyWarningEO> getEarlyWarningEOIPage(int current,int pageSize, QueryWrapper<EarlyWarningEO> wrapper) { private IPage<EarlyWarningEO> getEarlyWarningEOIPage(int current,int pageSize, QueryWrapper<EarlyWarningEO> wrapper) {
wrapper.eq("power",1); DataDTO dataDTO = new DataDTO();
wrapper.eq("power",1)
.between("PUT_TIME",dataDTO.getStartDate(),dataDTO.getEndDate());
Page<EarlyWarningEO> page = new Page<>(current, pageSize); Page<EarlyWarningEO> page = new Page<>(current, pageSize);
IPage<EarlyWarningEO> userIPage = earlyWarningEODao.selectPage(page, wrapper); IPage<EarlyWarningEO> userIPage = earlyWarningEODao.selectPage(page, wrapper);
System.out.println("总条数"+userIPage.getTotal()); System.out.println("总条数"+userIPage.getTotal());
adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml
+3 -3
View File
@@ -463,7 +463,7 @@
<!-- 根据角色分页查询条件 --> <!-- 根据角色分页查询条件 -->
<sql id="SarBussionInfoRole_Where_Clause"> <sql id="SarBussionInfoRole_Where_Clause">
left join TS_DICTYPE dicstandStatus ON ( dicstandStatus.dic_type_code = SAR_BUSSIONESS_STAND.STAND_STATUS AND dicstandStatus.dic_id IS NOT NULL and dicstandStatus.valid_flag = 0) left join TS_DICTYPE dicstandStatus ON ( dicstandStatus.dic_type_code = SAR_BUSSIONESS_STAND.TEXT_STATUS_BUSS AND dicstandStatus.dic_id IS NOT NULL and dicstandStatus.valid_flag = 0)
left join TS_DICTYPE dicstandNature ON ( dicstandNature.dic_type_code = SAR_BUSSIONESS_STAND.STAND_NATURE AND dicstandNature.dic_id IS NOT NULL and dicstandNature.valid_flag = 0) left join TS_DICTYPE dicstandNature ON ( dicstandNature.dic_type_code = SAR_BUSSIONESS_STAND.STAND_NATURE AND dicstandNature.dic_id IS NOT NULL and dicstandNature.valid_flag = 0)
left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0) left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0)
left join TS_DICTYPE dicapplyCountry ON ( dicapplyCountry.dic_type_code = SAR_BUSSIONESS_STAND.APPLY_COUNTRY AND dicapplyCountry.dic_id IS NOT NULL and dicapplyCountry.valid_flag = 0) left join TS_DICTYPE dicapplyCountry ON ( dicapplyCountry.dic_type_code = SAR_BUSSIONESS_STAND.APPLY_COUNTRY AND dicapplyCountry.dic_id IS NOT NULL and dicapplyCountry.valid_flag = 0)
@@ -546,7 +546,7 @@
<!-- 企标复审使用--> <!-- 企标复审使用-->
<sql id="SarBussionInfoRole_Where_Clause_Qbfs"> <sql id="SarBussionInfoRole_Where_Clause_Qbfs">
left join TS_DICTYPE dicstandStatus ON ( dicstandStatus.dic_type_code = SAR_BUSSIONESS_STAND.STAND_STATUS AND dicstandStatus.dic_id IS NOT NULL and dicstandStatus.valid_flag = 0) left join TS_DICTYPE dicstandStatus ON ( dicstandStatus.dic_type_code = SAR_BUSSIONESS_STAND.TEXT_STATUS_BUSS AND dicstandStatus.dic_id IS NOT NULL and dicstandStatus.valid_flag = 0)
left join TS_DICTYPE dicstandNature ON ( dicstandNature.dic_type_code = SAR_BUSSIONESS_STAND.STAND_NATURE AND dicstandNature.dic_id IS NOT NULL and dicstandNature.valid_flag = 0) left join TS_DICTYPE dicstandNature ON ( dicstandNature.dic_type_code = SAR_BUSSIONESS_STAND.STAND_NATURE AND dicstandNature.dic_id IS NOT NULL and dicstandNature.valid_flag = 0)
left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0) left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0)
left join TS_DICTYPE dicapplyCountry ON ( dicapplyCountry.dic_type_code = SAR_BUSSIONESS_STAND.APPLY_COUNTRY AND dicapplyCountry.dic_id IS NOT NULL and dicapplyCountry.valid_flag = 0) left join TS_DICTYPE dicapplyCountry ON ( dicapplyCountry.dic_type_code = SAR_BUSSIONESS_STAND.APPLY_COUNTRY AND dicapplyCountry.dic_id IS NOT NULL and dicapplyCountry.valid_flag = 0)
@@ -659,7 +659,7 @@
<select id="selectStandardsInfoByKey" resultMap="BaseResultMap" parameterType="java.lang.String"> <select id="selectStandardsInfoByKey" resultMap="BaseResultMap" parameterType="java.lang.String">
select <include refid="Base_Column_List_show" /> select <include refid="Base_Column_List_show" />
from SAR_BUSSIONESS_STAND from SAR_BUSSIONESS_STAND
left join TS_DICTYPE dicstandStatus ON ( dicstandStatus.dic_type_code = SAR_BUSSIONESS_STAND.STAND_STATUS AND dicstandStatus.dic_id IS NOT NULL and dicstandStatus.valid_flag = 0) left join TS_DICTYPE dicstandStatus ON ( dicstandStatus.dic_type_code = SAR_BUSSIONESS_STAND.TEXT_STATUS_BUSS AND dicstandStatus.dic_id IS NOT NULL and dicstandStatus.valid_flag = 0)
left join TS_DICTYPE dicstandNature ON ( dicstandNature.dic_type_code = SAR_BUSSIONESS_STAND.STAND_NATURE AND dicstandNature.dic_id IS NOT NULL and dicstandNature.valid_flag = 0) left join TS_DICTYPE dicstandNature ON ( dicstandNature.dic_type_code = SAR_BUSSIONESS_STAND.STAND_NATURE AND dicstandNature.dic_id IS NOT NULL and dicstandNature.valid_flag = 0)
left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0) left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0)
left join TS_DICTYPE dicapplyCountry ON ( dicapplyCountry.dic_type_code = SAR_BUSSIONESS_STAND.APPLY_COUNTRY AND dicapplyCountry.dic_id IS NOT NULL and dicapplyCountry.valid_flag = 0) left join TS_DICTYPE dicapplyCountry ON ( dicapplyCountry.dic_type_code = SAR_BUSSIONESS_STAND.APPLY_COUNTRY AND dicapplyCountry.dic_id IS NOT NULL and dicapplyCountry.valid_flag = 0)
adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OCRRestfulServiceImpl.java
+49 -2
View File
@@ -32,6 +32,10 @@ import org.springframework.web.multipart.MultipartFile;
import com.adc.da.sys.util.LoginUserUtil; import com.adc.da.sys.util.LoginUserUtil;
import java.io.File; import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
@@ -155,17 +159,24 @@ public class OCRRestfulServiceImpl implements OCRRestfulService {
//首先将文件保存至本地 //首先将文件保存至本地
String saveWordFilePath=null; String saveWordFilePath=null;
String saveWordFileName=null; String saveWordFileName=null;
logger.info("将文件保存至本地");
if(wordFile!=null && !wordFile.isEmpty()){ if(wordFile!=null && !wordFile.isEmpty()){
saveWordFileName=UUIDUtils.randomUUID20()+"_"+wordFile.getOriginalFilename(); saveWordFileName=UUIDUtils.randomUUID20()+"_"+wordFile.getOriginalFilename();
saveWordFilePath=ocrFilePath+saveWordFileName; saveWordFilePath=ocrFilePath+saveWordFileName;
FileUtils.copyInputStreamToFile(wordFile.getInputStream(),new File(saveWordFilePath)); logger.info(saveWordFilePath);
//FileUtils.copyInputStreamToFile(wordFile.getInputStream(),new File(saveWordFilePath));
savePic(wordFile.getInputStream(),saveWordFilePath);
logger.info("word存储完成");
} }
String saveJsonFilePath=null; String saveJsonFilePath=null;
String saveJsonFileName=null; String saveJsonFileName=null;
if(jsonFile!=null && !jsonFile.isEmpty()){ if(jsonFile!=null && !jsonFile.isEmpty()){
saveJsonFileName=UUIDUtils.randomUUID20()+"_"+jsonFile.getOriginalFilename(); saveJsonFileName=UUIDUtils.randomUUID20()+"_"+jsonFile.getOriginalFilename();
saveJsonFilePath=ocrFilePath+saveJsonFileName; saveJsonFilePath=ocrFilePath+saveJsonFileName;
FileUtils.copyInputStreamToFile(jsonFile.getInputStream(),new File(saveJsonFilePath)); logger.info(saveJsonFilePath);
//FileUtils.copyInputStreamToFile(jsonFile.getInputStream(),new File(saveJsonFilePath));
savePic(jsonFile.getInputStream(),saveJsonFilePath);
logger.info("Json存储完成");
} }
//开始将文件保存至数据库中 //开始将文件保存至数据库中
if(StringUtils.isNotEmpty(saveWordFilePath) && StringUtils.isNotEmpty(saveJsonFilePath)){ if(StringUtils.isNotEmpty(saveWordFilePath) && StringUtils.isNotEmpty(saveJsonFilePath)){
@@ -186,4 +197,40 @@ public class OCRRestfulServiceImpl implements OCRRestfulService {
return "{\"result\":\"error:File does not exist\"}";//文件不存在 return "{\"result\":\"error:File does not exist\"}";//文件不存在
} }
} }
private void savePic(InputStream inputStream, String filePath) {
OutputStream os = null;
try {
// 2、保存到临时文件
// 1K的数据缓冲
byte[] bs = new byte[1024];
// 读取到的数据长度
int len;
// 输出的文件流保存到本地文件
File tempFile = new File(ocrFilePath);
if (!tempFile.exists()) {
tempFile.mkdirs();
}
os = new FileOutputStream(filePath);
// 开始读取
while ((len = inputStream.read(bs)) != -1) {
os.write(bs, 0, len);
}
} catch (IOException e) {
e.printStackTrace();
} catch (Exception e) {
e.printStackTrace();
} finally {
// 完毕，关闭所有链接
try {
os.close();
inputStream.close();
} catch (IOException e) {
e.printStackTrace();
}
}
}
} }