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

Merge branch 'FOTON' into 'develop_master'

Browse Source 
# Conflicts:
#   adc-da-main/src/main/resources/application.properties
This commit is contained in:
李雅玮
2022-12-07 16:38:07 +08:00
parent 35cd42ed14 e7faa9ad2a
commit 23d50e06d1
6 changed files with 40 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
+2 -2
View File
@@ -18,8 +18,8 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
@FeignClient(value = "bat-wkflow-test")
//@FeignClient(value = "bat-wkflow")
//@FeignClient(value = "bat-wkflow-test")
@FeignClient(value = "bat-wkflow")
//@FeignClient(value = "shan6")
public interface workFlowFeignClient {
adc-da-jwtLogin/src/main/java/com/adc/da/login/util/IDMUtil.java
+5 -4
View File
@@ -18,10 +18,10 @@ public class IDMUtil {
private OkHttpUtil okHttpUtil;
private final String app_key = "app_slrs";
private final String app_secret = "wj5iDTqyguQCxnsoo5VU21BoRSZqevhI";
private final String access_url = "http://testsso1.foton.com.cn/oauth2.0/accessTokenByJson";
private final String profile_ur = "http://testsso1.foton.com.cn/oauth2.0/profileByJson";
private final String redirect_url = "http://127.0.0.1:9090";
private final String app_secret = "Fxi5LHbI5yGbQQDpVp86GcCdXeC5Bjfe";
private final String access_url = "http://sso.foton.com.cn/oauth2.0/accessTokenByJson";
private final String profile_ur = "http://sso.foton.com.cn/oauth2.0/profileByJson";
private final String redirect_url = "https://srms.foton.com.cn";
public String idmLogin(String code){
try{
@@ -66,6 +66,7 @@ public class IDMUtil {
}
}catch(Exception e){
log.error("单点登录获取用户信息失败");
e.printStackTrace();
}
return "";
}
adc-da-main/src/main/resources/application-dev.properties
+7 -7
View File
@@ -3,22 +3,22 @@
# 数据库配置
#=============================================
spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver
spring.datasource.url = jdbc:mysql://121.36.69.172:3307/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
spring.datasource.username = root
spring.datasource.password = hzwlsoft.com
spring.datasource.url = jdbc:mysql://10.100.5.111:3306/foton_slrs?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
spring.datasource.username = tempuser
spring.datasource.password = Fting&8g35g#geg2
#==============================================
# 应用设置
spring.application.name=FotonLAWSSystem-test
spring.application.name=FotonLAWSSystem
application.code=20200101
application.center=1
#==============================================
#Eureka
eureka.client.allow-redirects=true
eureka.client.register-with-eureka=true
eureka.client.service-url.defaultZone=http://127.0.0.1:8123/eureka/
eureka.client.service-url.defaultZone=http://10.100.5.117:4201/eureka/
#==============================================
# 邮箱配置1
@@ -37,10 +37,10 @@ spring.mail.port=587
#==============================================
# MQ配置
#==============================================
spring.rabbitmq.host=121.36.69.172
spring.rabbitmq.host=10.100.5.119
spring.rabbitmq.port=5672
spring.rabbitmq.username=admin
spring.rabbitmq.password=hzwlsoft.com
spring.rabbitmq.password=foton@admin
spring.rabbitmq.listener.simple.acknowledge-mode= manual
# 生产者 默认关闭 发版 需改为 true
spring.rabbitmq.listener.direct.auto-startup=true
adc-da-main/src/main/resources/application.properties
+5 -5
View File
@@ -8,9 +8,9 @@ spring.profiles.active=dev
##############################################
server.compression.enabled=true
server.compression.mime-types=application/json,application/xml,text/html,text/plain,text/css,application/x-javascript
# \u7AEF\u53E3\u53F7\u8BBE\u7F6E
server.port=10086
#\u4E3B\u670D\u52A1session\u8D85\u65F6
# 端口号设置
server.port=4202
#主服务session超时
server.servlet.session.timeout =600
#tomcat /resource/local/version-manager \u521B\u5EFAtomcat\u6307\u5B9A\u4E34\u65F6\u76EE\u5F55
@@ -145,8 +145,8 @@ upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg,pptx,ppt,pdg,rar,zip
# elasticsearch \u914D\u7F6E
# =============================================================================
elasticsearch.clustername=elasticsearch
elasticsearch.ip=127.0.0.1
elasticsearch.port=9306
elasticsearch.ip=10.100.5.122
elasticsearch.port=9300
elasticsearch.poolSize=5
elas.flag=true
adc-da-main/src/main/resources/logback-spring.xml
+3 -1
View File
@@ -8,7 +8,9 @@
<!-- 项目名称 -->
<property name="PROJECT_NAME" value="adc-da" />
<!-- 定义日志文件的存储地址,勿在 LogBack的配置中使用相对路径 -->
<property name="LOG_HOME" value="/tmp/applog/pcms-rest-system" />
<!-- <property name="LOG_HOME" value="/data/slrs/system-server/logs" />-->
<property name="LOG_HOME" value="./logs" />
<!-- <property name="LOG_HOME" value="../logs/pcms-rest" />-->
<!-- 定义系统日志文件的存储地址,勿在 LogBack的配置中使用相对路径 -->
<property name="LOG_HOME_SYSTEM" value="system" />
adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java
+18 -12
View File
@@ -559,7 +559,7 @@ public class ResetSearchCenterService {
List<Map<String, Object>> searchListData = elasticsearchService.searchAll("stand",search);
List<String> esIdList = searchListData.stream().map(stringObjectMap -> stringObjectMap.get("id").toString()).collect(Collectors.toList());
logger.info("esIdList 的id集合" + esIdList);
page.setValidFlag("0");
if(searchCenter.getIdList() != null && !searchCenter.getIdList().isEmpty()){
String[] result = searchCenter.getIdList().toArray(new String[0]);
@@ -572,6 +572,7 @@ public class ResetSearchCenterService {
page.setPageSize(count);
page.setMenuId("nomenu");
page.setStandType("ALL");
logger.info("国内外标准查询：" + page.toString());
List<SarStandardsInfo> rowsStand = iSarStandardsInfoService.getSarStandardsInfoPage(page);
//如果时自动触发，删除需要根据全部的结果进行数据处理
SarStandardsInfoEOPage infoEOPage = new SarStandardsInfoEOPage();
@@ -641,7 +642,7 @@ public class ResetSearchCenterService {
for(SarStandardsInfo sarStandardsInfoEO : updList){
countUpdateSuccess++;
standFunc(sarStandardsInfoEO);
// createStandMQService.sendStandMQ(sarStandardsInfoEO,"update");
createStandMQService.sendStandMQ(sarStandardsInfoEO,"update");
}
}
@@ -652,12 +653,12 @@ public class ResetSearchCenterService {
if (sarStandardsInfoEO.getAttrInfoMap() != null) {
sarStandardsInfoEO.setSarStandAttrEOStr(JSONObject.toJSONString(sarStandardsInfoEO.getAttrInfoMap()));
}
// createStandMQService.sendStandMQ(sarStandardsInfoEO,"add");
createStandMQService.sendStandMQ(sarStandardsInfoEO,"add");
}
}
if(!delList.isEmpty() && !"sync".equals(page.getSyncParam()) && ("DEL".equals(searchCenter.getExecType().toUpperCase()) || "ALL".equals(searchCenter.getExecType().toUpperCase()))){
// elasticsearchService.deleteBatchId(delList,"stand");
// elasticsearchService.deleteBatchId(delList,"fulltextserch");
elasticsearchService.deleteBatchId(delList,"stand");
elasticsearchService.deleteBatchId(delList,"fulltextserch");
logger.info("重置国内外标准：删除-共"+delList.size()+"条数据");
}else{
logger.info("重置国内外标准：没有删除数据，但应该删除"+delList.size()+"条数据");
@@ -879,7 +880,12 @@ public class ResetSearchCenterService {
getAttrMap.put(clobField, fieldValue);
}
}
getAttrMap.put("updateAuth","1");
logger.info("getAttrMap 查询1前: " + getAttrMap);
if (null == getAttrMap){
logger.info("国内外标准详情表查询出了null");
}else {
getAttrMap.put("updateAuth", "1");
}
row.setAttrInfoMap(getAttrMap);
}
@@ -1200,7 +1206,7 @@ public class ResetSearchCenterService {
if (sarLawsInfoEO.getAttrInfoMap() != null) {
sarLawsInfoEO.setSarStandAttrEOStr(JSONObject.toJSONString(sarLawsInfoEO.getAttrInfoMap()));
}
// createStandMQService.sendLawsMQ(sarLawsInfoEO,"update");
createStandMQService.sendLawsMQ(sarLawsInfoEO,"update");
}
}
@@ -1230,13 +1236,13 @@ public class ResetSearchCenterService {
if (sarLawsInfoEO.getAttrInfoMap() != null) {
sarLawsInfoEO.setSarStandAttrEOStr(JSONObject.toJSONString(sarLawsInfoEO.getAttrInfoMap()));
}
// createStandMQService.sendLawsMQ(sarLawsInfoEO,"add");
createStandMQService.sendLawsMQ(sarLawsInfoEO,"add");
}
}
if(!delList.isEmpty() && !"sync".equals(sarLawsInfoEOPage.getSyncParam()) && ("DEL".equals(searchCenter.getExecType().toUpperCase()) || "ALL".equals(searchCenter.getExecType().toUpperCase()))){
// elasticsearchService.deleteBatchId(delList,"laws");
// elasticsearchService.deleteBatchId(delList,"fulltextserch");
elasticsearchService.deleteBatchId(delList,"laws");
elasticsearchService.deleteBatchId(delList,"fulltextserch");
logger.info("重置国内外政策：删除-共"+delList.size()+"条数据");
}else{
logger.info("重置国内外政策：没有删除数据，但应该删除"+delList.size()+"条数据");
@@ -1693,7 +1699,7 @@ public class ResetSearchCenterService {
List<Map<String, Object>> searchListData = elasticsearchService.searchAll("bussstand",search);
List<String> esIdList = searchListData.stream().map(stringObjectMap -> stringObjectMap.get("id").toString()).collect(Collectors.toList());
logger.info("企标查询ids" + esIdList);
sarBussionessStandEOPage.setValidFlag("0");
sarBussionessStandEOPage.setOrderBy("SAR_BUSSIONESS_STAND.issue_time is null,SAR_BUSSIONESS_STAND.issue_time desc,SAR_BUSSIONESS_STAND.id");
sarBussionessStandEOPage.setMenuRoleList(null);
@@ -1709,7 +1715,7 @@ public class ResetSearchCenterService {
QueryWrapper qw3 = new QueryWrapper();
qw3.eq("VALID_FLAG","0");
int count3 = iSarBussionessStandService.count(qw3);
logger.info("企标查询数量" + count3);
if(count3 > 0){
sarBussionessStandEOPage.setPageSize(count3);