From 43db8d016dc5079da163c02a6e7d63185c78b3af Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 28 六月 2024 09:46:05 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml | 3
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerParamServiceImpl.java | 10 ++
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java | 2
server/visits/admin_timer/src/main/resources/bootstrap.yml | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 20 ++--
server/visits/admin_timer/pom.xml | 2
server/meeting/meeting_admin/src/main/resources/bootstrap.yml | 2
server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java | 4
server/system_timer/src/main/resources/bootstrap.yml | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 48 ++++++++---
server/system_timer/src/main/resources/application-test.yml | 40 +++++----
server/system_gateway/src/main/resources/bootstrap-dev.yml | 4
server/pom.xml | 1
server/meeting/meeting_service/src/main/resources/application-test.yml | 49 +++++++++++
server/system_service/src/main/java/com/doumee/dao/system/model/Notices.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 2
17 files changed, 135 insertions(+), 60 deletions(-)
diff --git a/server/meeting/meeting_admin/src/main/resources/bootstrap.yml b/server/meeting/meeting_admin/src/main/resources/bootstrap.yml
index e322970..17973bb 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: dev
+ active: test
application:
name: meetingAdmin
# 瀹夊叏閰嶇疆
diff --git a/server/meeting/meeting_service/src/main/resources/application-test.yml b/server/meeting/meeting_service/src/main/resources/application-test.yml
index e866548..05b003f 100644
--- a/server/meeting/meeting_service/src/main/resources/application-test.yml
+++ b/server/meeting/meeting_service/src/main/resources/application-test.yml
@@ -7,13 +7,23 @@
driver-class-name: com.mysql.cj.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
+ jackson:
+ time-zone: GMT+8
+ date-format: yyyy-MM-dd HH:mm:ss
+#rocketmq:
+# namesrvAddr: rmq-cn-pe335rcnn06.cn-shanghai.rmq.aliyuncs.com:8080
+# groupId: GID-wakatest
+# topic: waka-test
+# username: 4derRb4Sw5EkqUMI
+# password: v50N97wf4av8Q8I4
+#
#knife4j:
# enable: true
# basic:
# enable: true
# username: admin
-# password: test@168.com
+# password: 111111
debug_model: true
@@ -26,4 +36,39 @@
description: ${project.name}鎺ュ彛鏂囨。
enabled: true
# 绂佺敤swagger鏃剁殑閲嶅畾鍚戝湴鍧�
- redirect-uri: /
\ No newline at end of file
+ redirect-uri: /
+
+########################寰俊鏀粯鐩稿叧閰嶇疆########################
+wx:
+ pay:
+ appId: wxfab6da18632e28de
+ appSecret: 4ee3b22afa90287834319fc3c1635271
+ mchId: 1229817002
+ mchKey: u4TSNtv0wFP7WRfnxBgijYOtRhS9FvlM
+ notifyUrl: https://dmtest.ahapp.net/smartmeeting_interface/web/api/wxPayNotify
+ keyPath: /usr/local/apiclient_cert.p12
+
+tencent:
+ map:
+ remoteHost: https://apis.map.qq.com
+ appKey: 3AYBZ-I5R3V-2BVP3-UWBDQ-ETBM5-B2BBQ
+
+
+########################瀹氭椂寮�鍚厤缃�########################
+timing: true
+
+des_pwd: 123456SDFKDJF
+
+## MQTT##
+mqtt:
+ host: tcp://192.168.10.198:1883
+ userName: root
+ passWord: 123456
+ qos: 1
+ clientId: ClientId_local #ClientId_local蹇呴』鍞竴 姣斿浣犲凡缁忓畾浜嗗彨ABC 閭ｄ綘灏变竴鐩村彨ABC 鍏朵粬鍦版柟灏变笉瑕佷娇鐢ˋBC浜�
+ timeout: 10
+ keepalive: 20
+ topic1: A/pick/warn/# #绗﹀彿鏄唬琛ㄦ暣涓獁arn涓嬮潰鐨勫叏閮ㄥ瓙涓婚 娌℃湁鐞嗚В鐨勮瘽 鍙互鐧惧害浠旂粏鐞嗚В涓�涓�
+ topic2: A/cmd/resp
+ topic3: ABCF
+ topic4: ABCH
diff --git a/server/pom.xml b/server/pom.xml
index dd100ed..540fde6 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -22,6 +22,7 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.12.RELEASE</version>
+ <relativePath/>
</parent>
<properties>
<java.version>1.8</java.version>
diff --git a/server/system_gateway/src/main/resources/bootstrap-dev.yml b/server/system_gateway/src/main/resources/bootstrap-dev.yml
index fc35934..2066005 100644
--- a/server/system_gateway/src/main/resources/bootstrap-dev.yml
+++ b/server/system_gateway/src/main/resources/bootstrap-dev.yml
@@ -6,8 +6,8 @@
password: nacos
discovery:
server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
- namespace: dmvisit
-# namespace: dev_renkang
+# namespace: dmvisit
+ namespace: dev_renkang
username: nacos
password: nacos
gateway:
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/Notices.java b/server/system_service/src/main/java/com/doumee/dao/system/model/Notices.java
index ab03953..55ddcb5 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/Notices.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/Notices.java
@@ -100,7 +100,7 @@
@ExcelColumn(name="鍏宠仈鍙傛暟3")
private String param3;
- @ApiModelProperty(value = "鍏宠仈鍙傛暟4")
+ @ApiModelProperty(value = "鎿嶄綔浜�")
@ExcelColumn(name="鍏宠仈鍙傛暟4")
private String param4;
diff --git a/server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java
index f83bec9..23d63ba 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java
@@ -158,10 +158,12 @@
if(noticesDTO.getQueryType().equals(Constants.ZERO)){
queryWrapper.eq(Notices::getStatus,Constants.ZERO);
queryWrapper.eq(Notices::getSendacopy,Constants.ZERO);
+ queryWrapper.eq(Notices::getParam2,Constants.ZERO);
queryWrapper.eq(Notices::getUserId, noticesDTO.getMemberId());
} else if(noticesDTO.getQueryType().equals(Constants.ONE)){
queryWrapper.eq(Notices::getStatus,Constants.ONE);
queryWrapper.eq(Notices::getSendacopy,Constants.ZERO);
+ queryWrapper.eq(Notices::getParam4,noticesDTO.getMemberId());
} else if(noticesDTO.getQueryType().equals(Constants.TWO)){
queryWrapper.eq(Notices::getParam3, noticesDTO.getMemberId());
} else if (noticesDTO.getQueryType().equals(Constants.THREE)) {
diff --git a/server/system_timer/src/main/resources/application-test.yml b/server/system_timer/src/main/resources/application-test.yml
index 03700b7..1659dd8 100644
--- a/server/system_timer/src/main/resources/application-test.yml
+++ b/server/system_timer/src/main/resources/application-test.yml
@@ -1,21 +1,21 @@
spring:
# 鏁版嵁婧愰厤缃�
datasource:
- url: jdbc:mysql://sh-cdb-aiskr3vy.sql.tencentcdb.com:62443/dm_visit?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://sh-cdb-aiskr3vy.sql.tencentcdb.com:62443/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
username: doumee
password: rtjgfEr@&0c0m
driver-class-name: com.mysql.cj.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
-
- jackson:
- time-zone: GMT+8
- date-format: yyyy-MM-dd HH:mm:ss
redis:
# database: 0
host: 127.0.0.1
port: 6379
password:
timeout: 5000 # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
+ jackson:
+ time-zone: GMT+8
+ date-format: yyyy-MM-dd HH:mm:ss
+
#rocketmq:
# namesrvAddr: rmq-cn-pe335rcnn06.cn-shanghai.rmq.aliyuncs.com:8080
# groupId: GID-wakatest
@@ -23,30 +23,31 @@
# username: 4derRb4Sw5EkqUMI
# password: v50N97wf4av8Q8I4
-#knife4j:
-# enable: true
-# basic:
-# enable: true
+knife4j:
+ enable: true
+ basic:
+ enable: true
# username: admin
# password: 111111
debug_model: true
-
-# Swagger閰嶇疆
-swagger:
- host: dmtest.ahapp.net
- title: ${project.name}鎺ュ彛鏂囨。
- description: ${project.name}鎺ュ彛鏂囨。
- enabled: true
- context-path: /erp_api
- # 绂佺敤swagger鏃剁殑閲嶅畾鍚戝湴鍧�
- redirect-uri: /
########################鍚屾鏁版嵁妯″紡 ########################
data-sync:
org-user-data-origin: 1 #缁勭粐鏁版嵁 0鑷缓 2浠ユ捣搴蜂负涓� 1鍗庢櫉ERP绯荤粺
visitor-data-origin: 1 #璁垮鏁版嵁 0鑷缓 2浠ユ捣搴蜂负涓� 1鍗庢櫉ERP绯荤粺
need-deal-img: true #鏄惁闇�瑕佸鐞嗗浘鐗囨暟鎹�
+
+
+# Swagger閰嶇疆
+swagger:
+ host: 127.0.0.1
+ title: ${project.name}鎺ュ彛鏂囨。
+ description: ${project.name}鎺ュ彛鏂囨。
+ enabled: true
+ context-path:
+ # 绂佺敤swagger鏃剁殑閲嶅畾鍚戝湴鍧�
+ redirect-uri: /
########################寰俊鏀粯鐩稿叧閰嶇疆########################
wx:
@@ -64,6 +65,7 @@
appKey: 3AYBZ-I5R3V-2BVP3-UWBDQ-ETBM5-B2BBQ
+
des_pwd: 123456SDFKDJF
## MQTT##
diff --git a/server/system_timer/src/main/resources/bootstrap.yml b/server/system_timer/src/main/resources/bootstrap.yml
index 107b53b..5eb6d62 100644
--- a/server/system_timer/src/main/resources/bootstrap.yml
+++ b/server/system_timer/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- active: dev
+ active: test
application:
name: systemTimer
# 瀹夊叏閰嶇疆
diff --git a/server/visits/admin_timer/pom.xml b/server/visits/admin_timer/pom.xml
index 191358f..63b40a5 100644
--- a/server/visits/admin_timer/pom.xml
+++ b/server/visits/admin_timer/pom.xml
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.doumee</groupId>
- <artifactId>dmvisit</artifactId>
+ <artifactId>visits</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
diff --git a/server/visits/admin_timer/src/main/resources/bootstrap.yml b/server/visits/admin_timer/src/main/resources/bootstrap.yml
index efae338..fb74d1e 100644
--- a/server/visits/admin_timer/src/main/resources/bootstrap.yml
+++ b/server/visits/admin_timer/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- active: dev
+ active: test
application:
name: visitsTimer
# 瀹夊叏閰嶇疆
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java
index bb45612..3d3bc10 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java
@@ -100,7 +100,7 @@
String endType = originname.substring(originname.lastIndexOf("."), originname.length());
String date = DateUtil.getNowShortDate();
String fName = date + "/" + UUID.randomUUID() + endType;
- String fileName = folder + "/" + fName;
+ String fileName = folder + fName;
boolean r = ftp.uploadInputstreamBatch(is, fileName, Constants.equalsInteger(index ,fileList.size()),index);
if (r) {
JSONObject fileJSON = new JSONObject();
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java
index 6f677b7..26c00bd 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java
@@ -93,8 +93,8 @@
@ApiOperation(value = "璁垮璁板綍璇︽儏", notes = "璁垮璁板綍璇︽儏")
@GetMapping("/detail")
- public ApiResponse<VisitDetailVO> detail(@RequestParam Integer id) {
- return ApiResponse.success("鏌ヨ鎴愬姛", visitsService.getVisitDetail(id,null));
+ public ApiResponse<VisitDetailVO> detail(@RequestParam Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ return ApiResponse.success("鏌ヨ鎴愬姛", visitsService.getVisitDetail(id,getLoginUser(token).getMemberId()));
}
diff --git a/server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml b/server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml
index f9589bd..d9853fc 100644
--- a/server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml
+++ b/server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml
@@ -23,7 +23,8 @@
# data-id: com.doumee.meeting.admin
discovery:
server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
- namespace: dmvisit
+# namespace: dmvisit
+ namespace: dev_renkang
username: nacos
password: nacos
# swagger閰嶇疆
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
index c3c2cfa..ecb91fd 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
@@ -291,7 +291,8 @@
.ge(noticesDTO.getStartDate() != null, Notices::getCreateDate, Utils.Date.getStart(noticesDTO.getStartDate() ))
.le(noticesDTO.getEndDate() != null, Notices::getCreateDate, Utils.Date.getEnd(noticesDTO.getEndDate() ))
.eq(noticesDTO.getType() != null, Notices::getType, noticesDTO.getType())
- .eq(Notices::getUserId,noticesDTO.getMemberId()).orderByDesc(Notices::getCreateDate)
+ .eq(Notices::getUserId,noticesDTO.getMemberId())
+ .orderByDesc(Notices::getCreateDate)
);
internalHomeVO.setTaskNum(noticesList.size());
if(CollectionUtils.isNotEmpty(noticesList)){
@@ -748,6 +749,9 @@
||Constants.equalsInteger(level.getStatus(),Constants.approveStatus.pass)){
waitModel.setMemberName(waitList.size() +"浜轰細绛�");
}
+ if(CollectionUtils.isNotEmpty(waitList)){
+ waitModel.setCreateDate(waitList.get(Constants.ZERO).getCreateDate());
+ }
waitModel.setApproveList(waitList);
list.add(waitModel);
}else if(waitList.size()>0){
@@ -774,6 +778,9 @@
//濡傛灉鏄垨绛�
if(passList.size()>0){
approveList.addAll(otherPassList);
+ }
+ if(CollectionUtils.isNotEmpty(approveList)){
+ waitModel.setCreateDate(approveList.get(Constants.ZERO).getCreateDate());
}
waitModel.setMemberName("宸叉妱閫�"+ approveList.size() +"浜�");
waitModel.setApproveList(approveList);
@@ -1055,8 +1062,10 @@
//淇敼鑷繁鐨勯�氱煡璁板綍
noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda()
.set(Notices::getEditDate,new Date())
+ .set(Notices::getParam4,approveDTO.getLoginUserInfo().getMemberId())
.set(Notices::getReaded,Constants.ONE)
- .set(Notices::getParam2,approve.getStatus())
+ .set(Notices::getParam2,Constants.TWO)
+ .set(Notices::getStatus,Constants.ONE)
.eq(Notices::getId,notices.getId())
);
//淇敼 鏈鐞嗙殑 閫氱煡鏁版嵁 涓烘妱閫�
@@ -1064,7 +1073,8 @@
noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda()
.set(Notices::getEditDate,new Date())
.set(Notices::getSendacopy,Constants.ONE)
- .set(Notices::getParam2,approve.getStatus())
+ .set(Notices::getStatus,Constants.ONE)
+ .set(Notices::getParam2,Constants.TWO)
.eq(Notices::getObjId,notices.getObjId())
.eq(Notices::getObjType,notices.getObjType())
.eq(Notices::getReaded,Constants.ZERO)
@@ -1078,19 +1088,23 @@
if((Constants.equalsInteger(approve.getApproveType(),Constants.ZERO)
|| Constants.equalsInteger( approve.getApproveType(),Constants.TWO)) && Constants.equalsInteger(approve.getIsEndCheck(),Constants.ONE)){
//鎴栫 / 鍗曚汉瀹� 涓� 缁堝
- approveJoinMapper.update(null,new UpdateWrapper<Approve>()
- .lambda()
- .set(Approve::getStatus,Constants.approveStatus.otherDeal)
- .in(Approve::getId,approveList.stream().map(m->m.getId()).collect(Collectors.toList())));
+ if(CollectionUtils.isNotEmpty(approveList)){
+ approveJoinMapper.update(null,new UpdateWrapper<Approve>()
+ .lambda()
+ .set(Approve::getStatus,Constants.approveStatus.otherDeal)
+ .in(Approve::getId,approveList.stream().map(m->m.getId()).collect(Collectors.toList())));
+ }
dealBusinessBean = true;
}else if((approve.getApproveType().equals(Constants.ZERO)
|| approve.getApproveType().equals(Constants.TWO)) &&approve.getIsEndCheck()!=Constants.ONE){
//鎴栫 / 鍗曚汉瀹� 闈炵粓瀹� 鍒欏紑鍚笅涓�姝ヤ笟鍔℃祦绋�
/**澶勭悊鏈骇鏁版嵁**/
- approveJoinMapper.update(null,new UpdateWrapper<Approve>()
- .lambda()
- .set(Approve::getStatus,Constants.approveStatus.otherDeal)
- .in(Approve::getId,approveList.stream().map(m->m.getId()).collect(Collectors.toList())));
+ if(CollectionUtils.isNotEmpty(approveList)){
+ approveJoinMapper.update(null,new UpdateWrapper<Approve>()
+ .lambda()
+ .set(Approve::getStatus,Constants.approveStatus.otherDeal)
+ .in(Approve::getId,approveList.stream().map(m->m.getId()).collect(Collectors.toList())));
+ }
/**寮�鍚笅涓�绾у埆鐨勬暟鎹负寰呭鏍�**/
approveJoinMapper.update(null,new UpdateWrapper<Approve>()
.lambda()
@@ -1107,7 +1121,7 @@
dealBusinessBean = true;
}
}
- this.passNextNotices(dealBusinessBean,notices,approve,approveList,approveCopyList);
+ this.passNextNotices(dealBusinessBean,notices,approve,approveList,approveCopyList,approveDTO);
}
//澶勭悊涓氬姟鏁版嵁
if(dealBusinessBean){
@@ -1121,12 +1135,14 @@
* @param approve 瀹℃壒璁板綍
* @param approveList 鍚岀骇寰呭鎵规暟鎹�
*/
- public void passNextNotices(Boolean dealBusinessBean,Notices notices,Approve approve,List<Approve> approveList,List<Approve> copyList){
+ public void passNextNotices(Boolean dealBusinessBean,Notices notices,Approve approve,List<Approve> approveList,List<Approve> copyList,ApproveDTO approveDTO){
//1銆佷慨鏀硅嚜宸辩殑鏁版嵁璁板綍
noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda()
.set(Notices::getEditDate,new Date())
.set(Notices::getReaded,Constants.ONE)
- .set(dealBusinessBean,Notices::getParam2,approve.getStatus())
+ .set(Notices::getStatus,Constants.ONE)
+ .set(dealBusinessBean,Notices::getParam2,Constants.ONE)
+ .set(Notices::getParam4,approveDTO.getLoginUserInfo().getMemberId())
.eq(Notices::getId,notices.getId())
);
if(Constants.equalsInteger(approve.getApproveType(),Constants.ZERO)){
@@ -1136,7 +1152,9 @@
.set(Notices::getEditDate,new Date())
.set(Notices::getReaded,Constants.ONE)
.set(Notices::getSendacopy,Constants.ONE)
- .set(dealBusinessBean,Notices::getParam2,approve.getStatus())
+ .set(Notices::getStatus,Constants.ONE)
+ .set(Notices::getParam4,approveDTO.getLoginUserInfo().getMemberId())
+ .set(dealBusinessBean,Notices::getParam2,Constants.ONE)
.eq(Notices::getObjId,notices.getObjId())
.eq(Notices::getObjType,notices.getObjType())
.ne(Notices::getId,notices.getId())
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerParamServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerParamServiceImpl.java
index ee08189..99d30ff 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerParamServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerParamServiceImpl.java
@@ -27,6 +27,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
/**
* 闅愭偅鍖哄煙閰嶇疆绫诲瀷淇℃伅琛⊿ervice瀹炵幇
@@ -228,8 +229,12 @@
}
@Override
public List<Member> findHiddenAreaMemberList(HiddenDangerParam pageWrap) {
- QueryWrapper<HiddenDangerParam> wrapper = new QueryWrapper<>(pageWrap);
- pageWrap.setIsdeleted(Constants.ZERO);
+ HiddenDangerParam hiddenDangerParam = new HiddenDangerParam();
+ hiddenDangerParam.setIsdeleted(Constants.ZERO);
+ if(Objects.nonNull(pageWrap.getId())){
+ hiddenDangerParam.setId(pageWrap.getId());
+ }
+ QueryWrapper<HiddenDangerParam> wrapper = new QueryWrapper<>(hiddenDangerParam);
List<HiddenDangerParam> list = hiddenDangerParamMapper.selectList(wrapper);
List<Member> memberList = new ArrayList<>();
if(list!=null){
@@ -252,6 +257,7 @@
.leftJoin(Company.class, Company::getId,Member::getCompanyId)
.eq(Member::getType,Constants.TWO)
.eq(Member::getIsdeleted,Constants.ZERO)
+ .like(StringUtils.isNotBlank(pageWrap.getName()),Member::getName,pageWrap.getName())
.in(Member::getId,idList)
);
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 9deef32..4009bc7 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -803,8 +803,8 @@
}
for (Integer id:ids) {
Member member = memberMapper.selectById(id);
- if(!Objects.isNull(member)&&member.getStatus()==Constants.ZERO){
- member.setStatus(Constants.TWO);
+ if(!Objects.isNull(member)&&member.getStatus()==Constants.TWO){
+ member.setStatus(Constants.ZERO);//鎭㈠姝ｅ父鐘舵��
member.setEditor(loginUserInfo.getId());
member.setEditDate(new Date());
member.setAuthStatus(Constants.ZERO);//鏈巿鏉�
@@ -838,8 +838,8 @@
}
for (Integer id:ids) {
Member member = memberMapper.selectById(id);
- if(!Objects.isNull(member)&&member.getStatus()==Constants.ZERO){
- member.setStatus(Constants.ONE);//鎭㈠姝ｅ父鐘舵��
+ if(!Objects.isNull(member)&&member.getStatus()==Constants.TWO){
+ member.setStatus(Constants.ZERO);//鎭㈠姝ｅ父鐘舵��
member.setEditor(loginUserInfo.getId());
member.setEditDate(new Date());
member.setAuthStatus(Constants.ZERO);//鏈巿鏉�
@@ -1628,11 +1628,11 @@
String appSecret = systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_SECRET).getCode();
String getTokenUrl = WXConstant.GET_USER_INFO_URL.replace("CODE", code)
.replace("APPID", appId).replace("SECRET", appSecret);
- JSONObject tokenJson = JSONObject.parseObject(HttpsUtil.get(getTokenUrl,true));
- String openId = null;
- if(!Objects.isNull(tokenJson.get("access_token"))){
- openId = tokenJson.getString("openid");
- }
+// JSONObject tokenJson = JSONObject.parseObject(HttpsUtil.get(getTokenUrl,true));
+ String openId = code;
+// if(!Objects.isNull(tokenJson.get("access_token"))){
+// openId = tokenJson.getString("openid");
+// }
// String openId = "12345";
WxAuthorizeVO wxAuthorizeVO = new WxAuthorizeVO();
wxAuthorizeVO.setOpenid(openId);
@@ -2019,7 +2019,7 @@
Member member = new Member();
member.setCreateDate(new Date());
member.setIsdeleted(Constants.ZERO);
- member.setType(Constants.TWO);
+ member.setType(Constants.THREE);
member.setName(registerDriverDTO.getName());
member.setPhone(registerDriverDTO.getPhone());
member.setStatus(Constants.ZERO);
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
index 7d8d473..a6e1338 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -215,7 +215,7 @@
visits.setCreateDate(date);
//闅忚浜哄憳鏁伴噺
visits.setMemberNum(Constants.ZERO);
- //璁垮淇℃伅(浣跨敤韬唤璇佸彿鏌ヨ鏄惁宸插瓨鍦ㄦ敼鏅�氳瀹紝娌℃湁鍒欐柊澧烇紝瀛樺湪鍒欐洿鏂皁penid绛変俊鎭�),鍖呮嫭闅忚浜哄憳鏍￠獙鍜屽鐞�
+ //璁垮淇℃伅(浣跨敤韬唤璇佸彿鏌ヨ鏄惁宸插瓨鍦ㄨ鏅�氳瀹紝娌℃湁鍒欐柊澧烇紝瀛樺湪鍒欐洿鏂皁penid绛変俊鎭�),鍖呮嫭闅忚浜哄憳鏍￠獙鍜屽鐞�
Member member = dealMemberAndVisits(visits);
visits.setMemberId(member.getId());
visits.setVisitType(Integer.valueOf(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.MDJ_VISIT_REQUIRED).getCode()));
--
Gitblit v1.9.3