From f9c24ba3d5eba45afef222dcd72b6383893efc76 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 07 一月 2025 17:23:32 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 6 ++++++
server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java | 26 +++++++++++++-------------
server/meeting/meeting_admin/src/main/resources/bootstrap.yml | 2 +-
server/meeting/meeting_admin/src/main/resources/bootstrap-self.yml | 2 +-
server/meeting/meeting_admin/src/main/resources/application.yml | 8 --------
5 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/server/meeting/meeting_admin/src/main/resources/application.yml b/server/meeting/meeting_admin/src/main/resources/application.yml
index 1a1a785..aca7641 100644
--- a/server/meeting/meeting_admin/src/main/resources/application.yml
+++ b/server/meeting/meeting_admin/src/main/resources/application.yml
@@ -57,14 +57,6 @@
doumeemes.dao: debug
-swagger:
- host:
- title: ${project.name}鎺ュ彛鏂囨。
- description: ${project.name}鎺ュ彛鏂囨。
- enabled: true
- # 绂佺敤swagger鏃剁殑閲嶅畾鍚戝湴鍧�
- redirect-uri: /
-
# WEB鏈嶅姟鍣ㄩ厤缃�
server:
compression:
diff --git a/server/meeting/meeting_admin/src/main/resources/bootstrap-self.yml b/server/meeting/meeting_admin/src/main/resources/bootstrap-self.yml
index 8223992..64c4ffa 100644
--- a/server/meeting/meeting_admin/src/main/resources/bootstrap-self.yml
+++ b/server/meeting/meeting_admin/src/main/resources/bootstrap-self.yml
@@ -25,7 +25,7 @@
discovery:
server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
# namespace: dev_renkang
- namespace: dmvisit
+ namespace: dmvisit_dev
username: nacos
password: nacos
# 瀹夊叏閰嶇疆
diff --git a/server/meeting/meeting_admin/src/main/resources/bootstrap.yml b/server/meeting/meeting_admin/src/main/resources/bootstrap.yml
index 3407346..db21389 100644
--- a/server/meeting/meeting_admin/src/main/resources/bootstrap.yml
+++ b/server/meeting/meeting_admin/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- active: pro
+ active: self
application:
name: meetingAdmin
# 瀹夊叏閰嶇疆
diff --git a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
index 527883a..7a2a9fa 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
@@ -403,19 +403,19 @@
throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT);
}
//娉ㄥ唽鍙告満
- if((Constants.equalsInteger(user.getType(),Constants.ZERO)
+ if(!((Constants.equalsInteger(user.getType(),Constants.ZERO)
||Constants.equalsInteger(user.getType(),Constants.TWO))
- && Objects.nonNull(user.getMemberId())){
- if(Constants.equalsInteger(user.getType(),Constants.TWO)){
- if(Objects.isNull(user.getCompanyId())){
- throw new BusinessException(ResponseStatus.NO_ALLOW_LOGIN);
- }
- Company company = companyMapper.selectById(user.getCompanyId());
- if(Objects.isNull(company) || Constants.equalsInteger(company.getType(),Constants.ONE)){
- throw new BusinessException(ResponseStatus.NO_ALLOW_LOGIN);
- }
- }
- }else{
+ && Objects.nonNull(user.getMemberId()))){
+// if(Constants.equalsInteger(user.getType(),Constants.TWO)){
+// if(Objects.isNull(user.getCompanyId())){
+// throw new BusinessException(ResponseStatus.NO_ALLOW_LOGIN);
+// }
+// Company company = companyMapper.selectById(user.getCompanyId());
+// if(Objects.isNull(company) || Constants.equalsInteger(company.getType(),Constants.ONE)){
+// throw new BusinessException(ResponseStatus.NO_ALLOW_LOGIN);
+// }
+// }
+// }else{
throw new BusinessException(ResponseStatus.NO_ALLOW_LOGIN);
}
if(StringUtils.isNotBlank(password)){
@@ -473,7 +473,7 @@
if (systemUser == null) {
systemUser = autoRegisterUser(Constants.memberType.driver,param.getPhone(),param.getOpenid(),true);
}else{
- if(!Constants.equalsInteger(systemUser.getType(),Constants.memberType.driver)){
+ if(!(Constants.equalsInteger(systemUser.getType(),Constants.memberType.driver)||Constants.equalsInteger(systemUser.getType(),Constants.memberType.internal))){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇蜂娇鐢ㄦ纭殑鍙告満璐﹀彿鐧婚檰锛�");
}
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
index a4fdea4..cf32481 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -515,6 +515,12 @@
String privateIp =systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.EVENT_FILES_PRIVATE_DOMAIN).getCode();
String publicIp =systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.EVENT_FILES_PUBLIC_DOMAIN).getCode();
for(RuleEventSearchDataResponse r :rlist){
+ try {
+ if(DateUtil.getISO8601DateByStr(r.getHappen_time()).getTime() >= Utils.Date.getStart(new Date()).getTime()){
+ continue;
+ }
+ }catch (Exception e){
+ }
WaningEventDataListVO data = new WaningEventDataListVO();
data.setAddr(r.getSrc_name());
data.setImg(r.getImage_url());
--
Gitblit v1.9.3