From 15950f3c8123c40c28050c0bd7d5d774cad4728a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 29 五月 2025 14:38:04 +0800
Subject: [PATCH] 最新版本541200007
---
server/system_timer/src/main/resources/bootstrap-dev.yml | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/RetentionCloudController.java | 2
admin/src/components/common/Menu.vue | 14 +-
server/system_timer/src/main/resources/bootstrap-pro.yml | 2
server/visits/admin_timer/src/main/java/com/doumee/api/HkDeviceTimerController.java | 7 +
server/visits/admin_timer/src/main/java/com/doumee/api/HkNoticeTimerController.java | 4
server/visits/admin_timer/src/main/java/com/doumee/api/DatabaseController.java | 4
server/visits/admin_timer/src/main/java/com/doumee/api/HkEmpowerTimerController.java | 8 +-
server/visits/admin_timer/src/main/java/com/doumee/api/HkPlatformTimerController.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java | 2
server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java | 59 +++++++-------
server/visits/admin_timer/src/main/java/com/doumee/api/HkParkTimerController.java | 6
server/visits/admin_timer/src/main/java/com/doumee/api/PlatformJobController.java | 12 +-
server/visits/admin_timer/src/main/java/com/doumee/api/InterfaceLogTimerController.java | 4
server/system_timer/src/main/java/com/doumee/jobs/service/TimerBizSevice.java | 5 +
server/visits/admin_timer/src/main/java/com/doumee/api/HkSmsEmailTimerController.java | 4
server/system_service/src/main/java/com/doumee/service/timer/QuartzJobService.java | 2
server/visits/admin_timer/src/main/java/com/doumee/api/WxTokenTimerController.java | 6
server/system_timer/src/main/resources/application-dev.yml | 6
server/visits/admin_timer/src/main/java/com/doumee/api/HkImageTimerController.java | 4
admin/src/router/index.js | 4
server/visits/admin_timer/src/main/java/com/doumee/api/HkUsersTimerController.java | 10 +-
server/visits/admin_timer/src/main/java/com/doumee/api/HkVisitTimerController.java | 12 +-
23 files changed, 98 insertions(+), 85 deletions(-)
diff --git a/admin/src/components/common/Menu.vue b/admin/src/components/common/Menu.vue
index a485a10..02d55e2 100644
--- a/admin/src/components/common/Menu.vue
+++ b/admin/src/components/common/Menu.vue
@@ -106,11 +106,11 @@
computeTableHeight () {
this.$nextTick(() => {
const height = window.innerHeight
- console.log('main_app========================锛�'+height)
+ // console.log('main_app========================锛�'+height)
const height13 = this.getEleHeghtByClassName('common-header',0)
const height5 = document.getElementsByTagName('thead') && document.getElementsByTagName('thead')[0] ? document.getElementsByTagName('thead')[0].clientHeight : 0
if (document.getElementsByClassName('main_app') && document.getElementsByClassName('main_app')[0]) {
- console.log('main_app========================')
+ // console.log('main_app========================')
// alert(height)
const height3 = this.getEleHeghtByClassName('main-header',0)
const height4 = this.getEleHeghtByClassName('table-pagination',0)
@@ -122,16 +122,16 @@
const height11 = this.getEleHeghtByClassName('el-tabs-ele',0)
const height12 = this.getEleHeghtByClassName('platgroup_tabs',0)
this.$router.app.$store.commit('setTableHeightNew', height - height13- height3 - height5 - height6 - height2 - height7 - height4 - height9 - height10 - height11 - height12)
- console.log('gableHeightNew', this.$router.app.$store.state.tableHeightNew)
+ // console.log('gableHeightNew', this.$router.app.$store.state.tableHeightNew)
} else {
- console.log('tableLayout========================')
+ // console.log('tableLayout========================')
const height1 = this.getEleHeghtByClassName('table-search-form', 40,16)
const height3 = this.getEleHeghtByClassName('main-header', 0)
const height4 = this.getEleHeghtByClassName('table-pagination', 0)
const height2 = this.getEleHeghtByClassName('toolbar', 0)
- console.log('defualtlength', document.getElementsByClassName('table-search-form').length)
+ // console.log('defualtlength', document.getElementsByClassName('table-search-form').length)
this.$router.app.$store.commit('setTableHeightNew', height - height4 - height3 - height2 - height1 - height5 - height13)
- console.log('gableHeightNew', this.$router.app.$store.state.tableHeightNew)
+ // console.log('gableHeightNew', this.$router.app.$store.state.tableHeightNew)
}
})
},
@@ -139,7 +139,7 @@
if ((document.getElementsByClassName(name) && document.getElementsByClassName(name)[0])) {
let t = 0
document.getElementsByClassName(name).forEach(e => {
- console.log(name+'========================' + t + ':' + e.clientHeight)
+ // console.log(name+'========================' + t + ':' + e.clientHeight)
t++
})
return document.getElementsByClassName(name)[document.getElementsByClassName(name).length - 1].clientHeight+(margin||0)
diff --git a/admin/src/router/index.js b/admin/src/router/index.js
index 3d06d31..e94e5e1 100644
--- a/admin/src/router/index.js
+++ b/admin/src/router/index.js
@@ -125,7 +125,7 @@
const height11 = getEleHeghtByClassName('el-tabs-ele', 0)
const height12 = getEleHeghtByClassName('platgroup_tabs', 0,20)
router.app.$store.commit('setTableHeightNew', height -10 - height2 - height3 - height4 - height5 - height6 - height7 - height9 - height10 - height11 - height12 - height13)
- console.log('gableHeightNew', router.app.$store.state.tableHeightNew)
+ // console.log('gableHeightNew', router.app.$store.state.tableHeightNew)
} else {
// console.log('tableLayout========================')
const height1 = getEleHeghtByClassName('table-search-form', 40, 16)
@@ -134,7 +134,7 @@
const height2 = getEleHeghtByClassName('toolbar', 0)
console.log('defualtlength', document.getElementsByClassName('table-search-form').length)
router.app.$store.commit('setTableHeightNew', height - height4 - height3 - height2 - height1 - height5 - height13)
- console.log('gableHeightNew', router.app.$store.state.tableHeightNew)
+ // console.log('gableHeightNew', router.app.$store.state.tableHeightNew)
}
}
diff --git a/server/system_service/src/main/java/com/doumee/service/timer/QuartzJobService.java b/server/system_service/src/main/java/com/doumee/service/timer/QuartzJobService.java
index 562139b..930302a 100644
--- a/server/system_service/src/main/java/com/doumee/service/timer/QuartzJobService.java
+++ b/server/system_service/src/main/java/com/doumee/service/timer/QuartzJobService.java
@@ -66,7 +66,7 @@
int flag = quartzJobMapper.updateById(quartzJob);
if (flag > 0){
quartzManage.updateJob(quartzJob);
- }
+ }
return flag ;
}
diff --git a/server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java b/server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java
index 76b0cb4..7db16b1 100644
--- a/server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java
+++ b/server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java
@@ -4,7 +4,8 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PostMapping;
/**
* @author jiangping
@@ -14,89 +15,89 @@
public interface VisitServiceFegin {
@ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃舵煡璇汉鍛樿澶囨巿鏉冪粨鏋�")
- @GetMapping("/timer/empower/syncEmpowerDetailData")
+ @PostMapping("/timer/empower/syncEmpowerDetailData")
ApiResponse syncEmpowerDetailData();
@ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃舵煡璇汉鍛樿澶囨巿鏉冧笅杞借繘搴�")
- @GetMapping("/timer/empower/syncEmpowerResultData")
+ @PostMapping("/timer/empower/syncEmpowerResultData")
ApiResponse syncEmpowerResultData();
@ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃堕噸鏂颁笅鍙戝け璐ョ殑鎺堟潈鏁版嵁")
- @GetMapping("/timeempowerr/syncEmpowerFailData")
+ @PostMapping("/timeempowerr/syncEmpowerFailData")
ApiResponse syncEmpowerFailData();
@ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃跺埛鏂颁汉鍛樿澶囨巿鏉�")
- @GetMapping("/timer/empower/syncEmpowerData")
+ @PostMapping("/timer/empower/syncEmpowerData")
ApiResponse syncEmpowerData();
@ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃舵煡璇㈣澶囩姸鎬�")
- @GetMapping("/timer/device/getAscDeviceStatus")
+ @PostMapping("/timer/device/getAscDeviceStatus")
ApiResponse getAscDeviceStatus() ;
@ApiOperation("銆愯瀹㈢郴缁熴�戣缃叏閮↙ED灞忔樉鍐呭涓洪粯璁ゅ唴瀹�")
- @GetMapping("/timer/device/allLedDefualtContent")
+ @PostMapping("/timer/device/allLedDefualtContent")
ApiResponse allLedDefualtContent();
@ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃跺浠芥暟鎹簱")
- @GetMapping("/timer/db/backupDatabase")
+ @PostMapping("/timer/db/backupDatabase")
ApiResponse backupDatabase() ;
@ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃舵煡璇㈡湀鍙扮姸鎬�")
- @GetMapping("/timer/platform/getPlatformStatus")
+ @PostMapping("/timer/platform/getPlatformStatus")
ApiResponse getPlatformStatus() ;
@ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃朵笅杞芥捣搴风郴缁熷浘鐗囨暟鎹�")
- @GetMapping("/timer/image/downHKImgs")
+ @PostMapping("/timer/image/downHKImgs")
ApiResponse downHKImgs();
@ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃舵帴鍙ｆ棩蹇楁竻鐞�")
- @GetMapping("/timer/log/clearThreeMonthLog")
+ @PostMapping("/timer/log/clearThreeMonthLog")
ApiResponse clearThreeMonthLog();
@ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃惰溅杈嗗寘鏈熸巿鏉�")
- @GetMapping("/timer/park/syncParkBookData")
+ @PostMapping("/timer/park/syncParkBookData")
ApiResponse syncParkBookData();
@ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃舵煡璇㈣溅杈嗘煡璇�")
- @GetMapping("/timer/park/syncVehicleUpdateData")
+ @PostMapping("/timer/park/syncVehicleUpdateData")
ApiResponse syncVehicleUpdateData() ;
@ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃跺悓姝ユ捣搴风粍缁囨暟鎹�")
- @GetMapping("/timer/orguser/syncOrgData")
+ @PostMapping("/timer/orguser/syncOrgData")
ApiResponse syncOrgData() ;
@ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃堕噸鏂颁笅鍙戝垹闄や汉鍛樻暟鎹�")
- @GetMapping("/timer/orguser/syncMemberDelData")
+ @PostMapping("/timer/orguser/syncMemberDelData")
ApiResponse syncMemberDelData() ;
@ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃跺悓姝ユ捣搴蜂汉鍛樻暟鎹�")
- @GetMapping("/timer/orguser/syncUserData")
+ @PostMapping("/timer/orguser/syncUserData")
ApiResponse syncUserData();
@ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃跺喕缁撲汉鍛�")
- @GetMapping("/timer/orguser/memberFreeze")
+ @PostMapping("/timer/orguser/memberFreeze")
ApiResponse memberFreeze();
@ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃朵笅鍙戣瀹㈤绾︾敵璇�")
- @GetMapping("/timer/visit/syncVisitData")
+ @PostMapping("/timer/visit/syncVisitData")
ApiResponse syncVisitData() ;
@ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃舵煡璇㈣瀹㈤绾︾姸鎬�")
- @GetMapping("/timer/visit/getOutTimeVisitRecord")
+ @PostMapping("/timer/visit/getOutTimeVisitRecord")
ApiResponse getOutTimeVisitRecord();
@ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃朵粖鏃ョ殑璁垮棰勭害鏁版嵁")
- @GetMapping("/timer/visit/syncVistAppointData")
+ @PostMapping("/timer/visit/syncVistAppointData")
ApiResponse syncVistAppointData() ;
// @ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃舵洿鏂板井淇″叕浼楀彿accesstoken")
-// @GetMapping("/timer/wxtoken/updateWxAccessToken")
+// @PostMapping("/timer/wxtoken/updateWxAccessToken")
// ApiResponse updateWxAccessToken();
@ApiOperation("銆愯瀹㈢郴缁熴�戣瀹㈡暟鎹嵆灏嗚秴鏃堕璀�")
- @GetMapping("/timer/visit/visitTimeOut")
+ @PostMapping("/timer/visit/visitTimeOut")
ApiResponse visitTimeOut() ;
@ApiOperation("銆愯瀹㈢郴缁熴�戣瀹㈢敵璇峰緟瀹℃壒璁板綍鎴鏃堕棿宸茶繃鑷姩鍙栨秷棰勭害")
- @GetMapping("/timer/visit/visitNoCheckCancel")
+ @PostMapping("/timer/visit/visitNoCheckCancel")
ApiResponse visitNoCheckCancel() ;
@ApiOperation("銆愭暟瀛楀寲鏈堝彴銆戞湀鍙板仠闈犺秴鏃舵姤璀︿笟鍔�")
- @GetMapping("/timer/platformJob/platformJobTimer")
+ @PostMapping("/timer/platformJob/platformJobTimer")
ApiResponse platformJobTimer();
@ApiOperation("銆愭暟瀛楀寲鏈堝彴銆戞湀鍙版鏌ョ數瀛愰攣涓婇攣鐘舵��")
- @GetMapping("/timer/platformJob/platformCheckWmsLockStatus")
+ @PostMapping("/timer/platformJob/platformCheckWmsLockStatus")
ApiResponse platformCheckWmsLockStatusTimer();
@ApiOperation("銆愭暟瀛楀寲鏈堝彴銆戞湀鍙颁綔涓氳秴鏃舵姤璀︿笟鍔�")
- @GetMapping("/timer/platformJob/platformJobWorkTimeOut")
+ @PostMapping("/timer/platformJob/platformJobWorkTimeOut")
ApiResponse platformJobWorkTimeOut();
@ApiOperation("銆愭暟瀛楀寲鏈堝彴銆戞湀鍙扮瓑寰呬綔涓氳秴鏃朵笟鍔�")
- @GetMapping("/timer/platformJob/platformJobWaitTimeOut")
+ @PostMapping("/timer/platformJob/platformJobWaitTimeOut")
ApiResponse platformJobWaitTimeOut();
@ApiOperation("銆愮煭淇￠�氱煡銆戝畾鏃跺彂閫佺瓑寰呯煭淇′换鍔�")
- @GetMapping("/timer/sms/sendWaitingSmsNotice")
+ @PostMapping("/timer/sms/sendWaitingSmsNotice")
ApiResponse sendWaitingSmsNotice();
@ApiOperation("銆愭暟瀛楀寲鏈堝彴銆戞湀鍙颁粖鏃ヤ綔涓氭湭瀹屾垚閫氱煡瀹氭椂")
- @GetMapping("/timer/platformJob/sendUnFinishNotice")
+ @PostMapping("/timer/platformJob/sendUnFinishNotice")
ApiResponse sendUnFinishNotice();
diff --git a/server/system_timer/src/main/java/com/doumee/jobs/service/TimerBizSevice.java b/server/system_timer/src/main/java/com/doumee/jobs/service/TimerBizSevice.java
index 9fcb389..3ec392b 100644
--- a/server/system_timer/src/main/java/com/doumee/jobs/service/TimerBizSevice.java
+++ b/server/system_timer/src/main/java/com/doumee/jobs/service/TimerBizSevice.java
@@ -5,6 +5,7 @@
import com.doumee.dao.timer.entity.QuartzJob;
import com.doumee.dao.timer.mapper.QuartzJobMapper;
import com.doumee.dao.timer.scheduler.QuartzManage;
+import lombok.extern.slf4j.Slf4j;
import org.quartz.CronTrigger;
import org.springframework.stereotype.Service;
@@ -13,6 +14,7 @@
import java.util.List;
import java.util.Objects;
@Service
+@Slf4j
public class TimerBizSevice {
@Resource
private QuartzJobMapper quartzJobMapper ;
@@ -23,11 +25,13 @@
*/
@PostConstruct
public void init () {
+ log.error("================鎵ц"+System.currentTimeMillis());
LambdaQueryWrapper<QuartzJob> queryWrapper = new LambdaQueryWrapper<>() ;
queryWrapper.in(QuartzJob::getState, JobState.JOB_RUN.getStatus(),JobState.JOB_STOP.getStatus());
List<QuartzJob> jobList = quartzJobMapper.selectList(queryWrapper);
jobList.forEach(quartzJob -> {
try {
+ log.error("================鎵ц"+quartzJob.getId());
CronTrigger cronTrigger = quartzManage.getCronTrigger(quartzJob.getId()) ;
if (Objects.isNull(cronTrigger)){
quartzManage.createJob(quartzJob);
@@ -35,6 +39,7 @@
quartzManage.updateJob(quartzJob);
}
}catch (Exception e){
+// log.error("================鎵ц"+quartzJob.getId());
e.printStackTrace();
}
});
diff --git a/server/system_timer/src/main/resources/application-dev.yml b/server/system_timer/src/main/resources/application-dev.yml
index 648aa21..6847d76 100644
--- a/server/system_timer/src/main/resources/application-dev.yml
+++ b/server/system_timer/src/main/resources/application-dev.yml
@@ -1,9 +1,9 @@
spring:
# 鏁版嵁婧愰厤缃�
datasource:
- url: jdbc:mysql://sh-cdb-aiskr3vy.sql.tencentcdb.com:62443/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
- username: doumee
- password: rtjgfEr@&0c0m
+ url: jdbc:mysql://112.26.66.25:3306/antaiwuliu?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8
+ username: root
+ password: Doumee@168&QWERT
driver-class-name: com.mysql.cj.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
redis:
diff --git a/server/system_timer/src/main/resources/bootstrap-dev.yml b/server/system_timer/src/main/resources/bootstrap-dev.yml
index 93754ac..e92bb4a 100644
--- a/server/system_timer/src/main/resources/bootstrap-dev.yml
+++ b/server/system_timer/src/main/resources/bootstrap-dev.yml
@@ -2,6 +2,8 @@
cloud:
loadbalancer:
enabled: true
+ retry:
+ enabled: false
nacos:
# 浣跨敤Nacos璐熻浇绛栫暐锛屽紑鍙戠幆澧冨彲浠ュ埄鐢ㄥ氨杩戣闂満鍒跺畾鍚戣闂紝鍚姩鍙傛暟濡備笅锛�
# -Dspring.cloud.nacos.discovery.cluster-name=鑷畾涔�
diff --git a/server/system_timer/src/main/resources/bootstrap-pro.yml b/server/system_timer/src/main/resources/bootstrap-pro.yml
index b0f16fd..9ed6b72 100644
--- a/server/system_timer/src/main/resources/bootstrap-pro.yml
+++ b/server/system_timer/src/main/resources/bootstrap-pro.yml
@@ -2,6 +2,8 @@
cloud:
loadbalancer:
enabled: true
+ retry:
+ enabled: false
nacos:
# 浣跨敤Nacos璐熻浇绛栫暐锛屽紑鍙戠幆澧冨彲浠ュ埄鐢ㄥ氨杩戣闂満鍒跺畾鍚戣闂紝鍚姩鍙傛暟濡備笅锛�
# -Dspring.cloud.nacos.discovery.cluster-name=鑷畾涔�
diff --git a/server/visits/admin_timer/src/main/java/com/doumee/api/DatabaseController.java b/server/visits/admin_timer/src/main/java/com/doumee/api/DatabaseController.java
index daa238d..53bc14e 100644
--- a/server/visits/admin_timer/src/main/java/com/doumee/api/DatabaseController.java
+++ b/server/visits/admin_timer/src/main/java/com/doumee/api/DatabaseController.java
@@ -10,7 +10,7 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -41,7 +41,7 @@
@ApiOperation("鏁版嵁搴撳浠斤紝淇濈暀鏈�杩�7涓浠絪ql")
- @GetMapping("/backupDatabase")
+ @PostMapping("/backupDatabase")
public ApiResponse backupDatabase() {
try {
String timestamp = DateUtil.getNowLongTime();
diff --git a/server/visits/admin_timer/src/main/java/com/doumee/api/HkDeviceTimerController.java b/server/visits/admin_timer/src/main/java/com/doumee/api/HkDeviceTimerController.java
index ead9815..c6c7ea2 100644
--- a/server/visits/admin_timer/src/main/java/com/doumee/api/HkDeviceTimerController.java
+++ b/server/visits/admin_timer/src/main/java/com/doumee/api/HkDeviceTimerController.java
@@ -1,12 +1,13 @@
package com.doumee.api;
+import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.service.business.DeviceService;
import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.service.business.impl.hksync.HkSyncDeviceServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -23,13 +24,13 @@
@Autowired
private DeviceService deviceService;
@ApiOperation("寮�鍚畾鏃舵煡璇㈣澶囩姸鎬�")
- @GetMapping("/getAscDeviceStatus")
+ @PostMapping("/getAscDeviceStatus")
public ApiResponse getAscDeviceStatus() {
hkSyncDeviceService.getAscDeviceStatus();
return ApiResponse.success("寮�鍚畾鏃舵煡璇㈣澶囩姸鎬佹垚鍔�");
}
@ApiOperation("鏇存柊鍏ㄩ儴LED灞忔樉鍐呭涓洪粯璁ゅ唴瀹�")
- @GetMapping("/allLedDefualtContent")
+ @PostMapping("/allLedDefualtContent")
public ApiResponse allLedDefualtContent() {
deviceService.allLedDefualtContent();
return ApiResponse.success("鏇存柊鍏ㄩ儴LED灞忔樉鍐呭涓洪粯璁ゅ唴瀹�");
diff --git a/server/visits/admin_timer/src/main/java/com/doumee/api/HkEmpowerTimerController.java b/server/visits/admin_timer/src/main/java/com/doumee/api/HkEmpowerTimerController.java
index 87ef93b..4cfd2d0 100644
--- a/server/visits/admin_timer/src/main/java/com/doumee/api/HkEmpowerTimerController.java
+++ b/server/visits/admin_timer/src/main/java/com/doumee/api/HkEmpowerTimerController.java
@@ -22,7 +22,7 @@
public static Integer endId2 = 0;
@ApiOperation("寮�鍚畾鏃舵煡璇汉鍛樿澶囨巿鏉冪粨鏋�")
- @GetMapping("/syncEmpowerDetailData")
+ @PostMapping("/syncEmpowerDetailData")
public ApiResponse syncEmpowerDetailData() {
if(endId2 ==null){
endId2 =0;
@@ -36,14 +36,14 @@
return ApiResponse.success("寮�鍚畾鏃舵煡璇汉鍛樿澶囨巿鏉冪粨鏋滄垚鍔�");
}
@ApiOperation("寮�鍚畾鏃舵煡璇汉鍛樿澶囨巿鏉冧笅杞借繘搴�")
- @GetMapping("/syncEmpowerResultData")
+ @PostMapping("/syncEmpowerResultData")
public ApiResponse syncEmpowerResultData() {
hkSyncEmpowerService.syncEmpowerResultData(0);
return ApiResponse.success("寮�鍚畾鏃舵煡璇汉鍛樿澶囨巿鏉冧笅杞借繘搴︽垚鍔�");
}
@ApiOperation("寮�鍚畾鏃堕噸鏂颁笅鍙戝け璐ョ殑鎺堟潈鏁版嵁")
- @GetMapping("/syncEmpowerFailData")
+ @PostMapping("/syncEmpowerFailData")
public ApiResponse syncEmpowerFailData() {
hkSyncEmpowerService.syncEmpowerFailData(0);
return ApiResponse.success("寮�鍚畾鏃堕噸鏂颁笅鍙戝け璐ョ殑鎺堟潈鏁版嵁鎴愬姛");
@@ -53,7 +53,7 @@
@Autowired
private HkSyncVehicleFromHKServiceImpl hkSyncVehicleFromHKService;
@ApiOperation("寮�鍚畾鏃跺埛鏂颁汉鍛樿澶囨巿鏉�")
- @GetMapping("/syncEmpowerData")
+ @PostMapping("/syncEmpowerData")
public ApiResponse syncEmpowerData() {
if(endId ==null){
endId =0;
diff --git a/server/visits/admin_timer/src/main/java/com/doumee/api/HkImageTimerController.java b/server/visits/admin_timer/src/main/java/com/doumee/api/HkImageTimerController.java
index bfb80c2..0cd0af7 100644
--- a/server/visits/admin_timer/src/main/java/com/doumee/api/HkImageTimerController.java
+++ b/server/visits/admin_timer/src/main/java/com/doumee/api/HkImageTimerController.java
@@ -6,7 +6,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -27,7 +27,7 @@
@Autowired
private HkSyncImgServiceImpl hkSyncImgService;
@ApiOperation("寮�鍚畾鏃朵笅杞芥捣搴风郴缁熷浘鐗囨暟鎹�")
- @GetMapping("/downHKImgs")
+ @PostMapping("/downHKImgs")
public ApiResponse downHKImgs() {
if(dataSyncConfig.getNeedDealImg()!=null && dataSyncConfig.getNeedDealImg()){
hkSyncImgService.downHKImgs(0);
diff --git a/server/visits/admin_timer/src/main/java/com/doumee/api/HkNoticeTimerController.java b/server/visits/admin_timer/src/main/java/com/doumee/api/HkNoticeTimerController.java
index 16bfa85..b3ba7f4 100644
--- a/server/visits/admin_timer/src/main/java/com/doumee/api/HkNoticeTimerController.java
+++ b/server/visits/admin_timer/src/main/java/com/doumee/api/HkNoticeTimerController.java
@@ -7,7 +7,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -27,7 +27,7 @@
private VisitsService visitsService;
@ApiOperation("寮�鍚畾鏃舵煡璇㈡渶鏂颁汉鍛樹唬鍔炴暟鎹姸鎬�")
- @GetMapping("/getNoticeList")
+ @PostMapping("/getNoticeList")
public ApiResponse getNoticeList() {
hkSyncVisitService.syncVisitData();
return ApiResponse.success("寮�鍚畾鏃朵笅鍙戣瀹㈤绾︾敵璇锋垚鍔�");
diff --git a/server/visits/admin_timer/src/main/java/com/doumee/api/HkParkTimerController.java b/server/visits/admin_timer/src/main/java/com/doumee/api/HkParkTimerController.java
index b68f13f..8c3974a 100644
--- a/server/visits/admin_timer/src/main/java/com/doumee/api/HkParkTimerController.java
+++ b/server/visits/admin_timer/src/main/java/com/doumee/api/HkParkTimerController.java
@@ -6,7 +6,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -27,13 +27,13 @@
private HkSyncParkServiceImpl hkSyncParkService;
@ApiOperation("寮�鍚畾鏃惰溅杈嗗寘鏈熸巿鏉�")
- @GetMapping("/syncParkBookData")
+ @PostMapping("/syncParkBookData")
public ApiResponse syncParkBookData() {
hkSyncParkService.syncParkBookData();
return ApiResponse.success("寮�鍚畾鏃惰溅杈嗗寘鏈熸巿鏉冩垚鍔�");
}
@ApiOperation("寮�鍚畾鏃舵煡璇㈣溅杈嗘煡璇�")
- @GetMapping("/syncVehicleUpdateData")
+ @PostMapping("/syncVehicleUpdateData")
public ApiResponse syncVehicleUpdateData() {
hkSyncVehicleFromHKService.syncVehicleUpdateData(new Date(System.currentTimeMillis()-24*60*60*1000));
return ApiResponse.success("寮�鍚畾鏃舵煡璇㈣溅杈嗘煡璇㈡垚鍔�");
diff --git a/server/visits/admin_timer/src/main/java/com/doumee/api/HkPlatformTimerController.java b/server/visits/admin_timer/src/main/java/com/doumee/api/HkPlatformTimerController.java
index 5428eea..a3c843f 100644
--- a/server/visits/admin_timer/src/main/java/com/doumee/api/HkPlatformTimerController.java
+++ b/server/visits/admin_timer/src/main/java/com/doumee/api/HkPlatformTimerController.java
@@ -6,7 +6,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -21,7 +21,7 @@
@Autowired
private HkSyncPlatformsServiceImpl hkSyncPlatformsService;
@ApiOperation("寮�鍚畾鏃舵煡璇㈡湀鍙扮姸鎬�")
- @GetMapping("/getPlatformStatus")
+ @PostMapping("/getPlatformStatus")
public ApiResponse getPlatformStatus() {
hkSyncPlatformsService.getPlatformStatus(new PlatformStatusRequest());
return ApiResponse.success("寮�鍚畾鏃舵煡璇㈡湀鍙扮姸鎬佹垚鍔�");
diff --git a/server/visits/admin_timer/src/main/java/com/doumee/api/HkSmsEmailTimerController.java b/server/visits/admin_timer/src/main/java/com/doumee/api/HkSmsEmailTimerController.java
index 24b464d..2eb6dfb 100644
--- a/server/visits/admin_timer/src/main/java/com/doumee/api/HkSmsEmailTimerController.java
+++ b/server/visits/admin_timer/src/main/java/com/doumee/api/HkSmsEmailTimerController.java
@@ -5,7 +5,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -20,7 +20,7 @@
@Autowired
private SmsEmailService smsEmailService;
@ApiOperation("寮�鍚畾鏃剁煭淇″彂閫佸畾鏃朵换鍔�")
- @GetMapping("/sendWaitingSmsNotice")
+ @PostMapping("/sendWaitingSmsNotice")
public ApiResponse sendWaitingSmsNotice() {
smsEmailService.sendWaitingSmsNotice();
return ApiResponse.success("寮�鍚畾鏃剁煭淇″彂閫佸畾鏃朵换鍔℃垚鍔�");
diff --git a/server/visits/admin_timer/src/main/java/com/doumee/api/HkUsersTimerController.java b/server/visits/admin_timer/src/main/java/com/doumee/api/HkUsersTimerController.java
index 752d844..d27ef52 100644
--- a/server/visits/admin_timer/src/main/java/com/doumee/api/HkUsersTimerController.java
+++ b/server/visits/admin_timer/src/main/java/com/doumee/api/HkUsersTimerController.java
@@ -9,7 +9,7 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -34,7 +34,7 @@
private DataSyncConfig dataSyncConfig;
@ApiOperation("寮�鍚畾鏃跺悓姝ユ捣搴风粍缁囨暟鎹�")
- @GetMapping("/syncOrgData")
+ @PostMapping("/syncOrgData")
public ApiResponse syncOrgData() {
log.info("=========================寮�鍚畾鏃跺悓姝ユ捣搴风粍缁囨暟鎹�===========start===========");
if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.erp
@@ -46,7 +46,7 @@
return ApiResponse.success("寮�鍚畾鏃跺悓姝ユ捣搴风粍缁囨暟鎹垚鍔�");
}
@ApiOperation("寮�鍚畾鏃堕噸鏂颁笅鍙戝垹闄や汉鍛樻暟鎹�")
- @GetMapping("/syncMemberDelData")
+ @PostMapping("/syncMemberDelData")
public ApiResponse syncMemberDelData() {
log.info("=========================寮�鍚畾鏃堕噸鏂颁笅鍙戝垹闄や汉鍛樻暟鎹�===========start===========");
hkSyncOrgUserService.syncMemberDelData();
@@ -55,7 +55,7 @@
return ApiResponse.success("寮�鍚畾鏃堕噸鏂颁笅鍙戝垹闄や汉鍛樻暟鎹垚鍔�");
}
@ApiOperation("寮�鍚畾鏃跺悓姝ユ捣搴蜂汉鍛樻暟鎹�")
- @GetMapping("/syncUserData")
+ @PostMapping("/syncUserData")
public ApiResponse syncUserData() {
log.info("=========================寮�鍚畾鏃跺悓姝ユ捣搴蜂汉鍛樻暟鎹�===========start===========");
if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.erp
@@ -67,7 +67,7 @@
return ApiResponse.success("寮�鍚畾鏃跺悓姝ユ捣搴蜂汉鍛樻暟鎹垚鍔�");
}
@ApiOperation("寮�鍚畾鏃跺喕缁撲汉鍛�")
- @GetMapping("/memberFreeze")
+ @PostMapping("/memberFreeze")
public ApiResponse memberFreeze() {
memberService.memberFreeze();
return ApiResponse.success("寮�鍚畾鏃跺喕缁撲汉鍛樻垚鍔�");
diff --git a/server/visits/admin_timer/src/main/java/com/doumee/api/HkVisitTimerController.java b/server/visits/admin_timer/src/main/java/com/doumee/api/HkVisitTimerController.java
index a4d39cd..6111ce0 100644
--- a/server/visits/admin_timer/src/main/java/com/doumee/api/HkVisitTimerController.java
+++ b/server/visits/admin_timer/src/main/java/com/doumee/api/HkVisitTimerController.java
@@ -8,7 +8,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -31,19 +31,19 @@
private VisitsService visitsService;
@ApiOperation("寮�鍚畾鏃朵笅鍙戣瀹㈤绾︾敵璇�")
- @GetMapping("/syncVisitData")
+ @PostMapping("/syncVisitData")
public ApiResponse syncVisitData() {
hkSyncVisitService.syncVisitData();
return ApiResponse.success("寮�鍚畾鏃朵笅鍙戣瀹㈤绾︾敵璇锋垚鍔�");
}
@ApiOperation("寮�鍚畾鏃舵煡璇㈣瀹㈤绾︾姸鎬�")
- @GetMapping("/getOutTimeVisitRecord")
+ @PostMapping("/getOutTimeVisitRecord")
public ApiResponse getOutTimeVisitRecord() {
hkSyncVisitService.getOutTimeVisitRecordIccm();
return ApiResponse.success("寮�鍚畾鏃舵煡璇㈣瀹㈤绾︾姸鎬佹垚鍔�");
}
@ApiOperation("寮�鍚畾鏃朵粖鏃ョ殑璁垮棰勭害鏁版嵁")
- @GetMapping("/syncVistAppointData")
+ @PostMapping("/syncVistAppointData")
public ApiResponse syncVistAppointData() {
if(!Constants.DEALING_FROM_HK_VISIT){
try {
@@ -60,13 +60,13 @@
}
@ApiOperation("璁垮鍗冲皢瓒呮椂棰勮")
- @GetMapping("/visitTimeOut")
+ @PostMapping("/visitTimeOut")
public ApiResponse visitTimeOut() {
visitsService.syncTimeOutData();
return ApiResponse.success("璁垮鍗冲皢瓒呮椂棰勮");
}
@ApiOperation("寰呭鎵硅褰曡秴鏃惰嚜鍔ㄥ彇娑堥绾�")
- @GetMapping("/visitNoCheckCancel")
+ @PostMapping("/visitNoCheckCancel")
public ApiResponse visitNoCheckCancel() {
visitsService.visitNoCheckCancel();
return ApiResponse.success("寰呭鎵硅褰曡秴鏃惰嚜鍔ㄥ彇娑堥绾�");
diff --git a/server/visits/admin_timer/src/main/java/com/doumee/api/InterfaceLogTimerController.java b/server/visits/admin_timer/src/main/java/com/doumee/api/InterfaceLogTimerController.java
index da6bc90..87a2208 100644
--- a/server/visits/admin_timer/src/main/java/com/doumee/api/InterfaceLogTimerController.java
+++ b/server/visits/admin_timer/src/main/java/com/doumee/api/InterfaceLogTimerController.java
@@ -8,7 +8,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -28,7 +28,7 @@
@Autowired
private PlatformInterfaceLogService platformInterfaceLogService;
@ApiOperation("寮�鍚畾鏃舵帴鍙ｆ棩蹇楁竻鐞�")
- @GetMapping("/clearThreeMonthLog")
+ @PostMapping("/clearThreeMonthLog")
public ApiResponse clearThreeMonthLog() {
interfaceLogService.clearThreeMonthLog();
wmsInterfaceLogService.clearThreeMonthLog();
diff --git a/server/visits/admin_timer/src/main/java/com/doumee/api/PlatformJobController.java b/server/visits/admin_timer/src/main/java/com/doumee/api/PlatformJobController.java
index 1bf85a1..53bf7a9 100644
--- a/server/visits/admin_timer/src/main/java/com/doumee/api/PlatformJobController.java
+++ b/server/visits/admin_timer/src/main/java/com/doumee/api/PlatformJobController.java
@@ -7,7 +7,7 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -26,13 +26,13 @@
@ApiOperation("鏈堝彴鍋滈潬瓒呮椂鎶ヨ涓氬姟")
- @GetMapping("/platformJobTimer")
+ @PostMapping("/platformJobTimer")
public ApiResponse platformJobTimer() {
platformJobService.timeOutReport();
return ApiResponse.success("鏈堝彴鍋滈潬瓒呮椂鎶ヨ涓氬姟");
}
@ApiOperation("鏈堝彴浣滀笟妫�鏌ョ數瀛愰攣涓婇攣鐘舵��")
- @GetMapping("/platformCheckWmsLockStatus")
+ @PostMapping("/platformCheckWmsLockStatus")
public ApiResponse checkWmsLockStatus() {
platformJobService.checkWmsLockStatus();
return ApiResponse.success("鏈堝彴鍋滈潬瓒呮椂鎶ヨ涓氬姟");
@@ -40,7 +40,7 @@
@ApiOperation("鏈堝彴浣滀笟瓒呮椂鎶ヨ涓氬姟")
- @GetMapping("/platformJobWorkTimeOut")
+ @PostMapping("/platformJobWorkTimeOut")
public ApiResponse platformJobWorkTimeOut() {
platformJobService.timeOutWork();
return ApiResponse.success("鏈堝彴浣滀笟瓒呮椂鎶ヨ涓氬姟");
@@ -48,7 +48,7 @@
@ApiOperation("鏈堝彴绛夊緟浣滀笟瓒呮椂涓氬姟")
- @GetMapping("/platformJobWaitTimeOut")
+ @PostMapping("/platformJobWaitTimeOut")
public ApiResponse platformJobWaitTimeOut() {
platformJobService.timeOutCallIn();
return ApiResponse.success("鏈堝彴绛夊緟浣滀笟瓒呮椂涓氬姟");
@@ -58,7 +58,7 @@
@PreventRepeat(interval = 2000)
@ApiOperation("鏈堝彴浠婃棩浣滀笟鏈畬鎴愰�氱煡瀹氭椂")
- @GetMapping("/sendUnFinishNotice")
+ @PostMapping("/sendUnFinishNotice")
public synchronized ApiResponse sendUnFinishNotice() {
log.error("========鏈堝彴浠婃棩浣滀笟鏈畬鎴愰�氱煡瀹氭椂============寮�濮�"+System.currentTimeMillis()+"");
platformJobService.sendUnFinishNotice();
diff --git a/server/visits/admin_timer/src/main/java/com/doumee/api/WxTokenTimerController.java b/server/visits/admin_timer/src/main/java/com/doumee/api/WxTokenTimerController.java
index 65fc408..d8c4c96 100644
--- a/server/visits/admin_timer/src/main/java/com/doumee/api/WxTokenTimerController.java
+++ b/server/visits/admin_timer/src/main/java/com/doumee/api/WxTokenTimerController.java
@@ -18,7 +18,7 @@
import org.apache.shiro.mgt.DefaultSecurityManager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -44,7 +44,7 @@
@Value("${debug_model}")
private Boolean timing;
// @ApiOperation("寮�鍚畾鏃舵洿鏂板井淇″叕浼楀彿accesstoken")
-// @GetMapping("/updateWxAccessToken")
+// @PostMapping("/updateWxAccessToken")
// public ApiResponse updateWxAccessToken() {
// DefaultSecurityManager securityManager = new DefaultSecurityManager();
// SecurityUtils.setSecurityManager(securityManager);
@@ -64,7 +64,7 @@
// return ApiResponse.success("寮�鍚畾鏃舵洿鏂板井淇″叕浼楀彿accesstoken鎴愬姛");
// }
@ApiOperation("寮�鍚畾鏃舵洿鏂板井淇″叕浼楀彿accesstoken")
- @GetMapping("/updateWxAccessTokenOrigin")
+ @PostMapping("/updateWxAccessTokenOrigin")
public ApiResponse updateWxAccessTokenOrigin() {
DefaultSecurityManager securityManager = new DefaultSecurityManager();
SecurityUtils.setSecurityManager(securityManager);
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/RetentionCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/RetentionCloudController.java
index ee6d5ed..09a772b 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/RetentionCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/RetentionCloudController.java
@@ -74,7 +74,7 @@
public ApiResponse<PageData<Retention>> findPage (@RequestBody PageWrap<Retention> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
return ApiResponse.success(retentionService.findTrainTimePage(pageWrap));
}
- @ApiOperation("鍒嗛〉鏌ヨ")
+ @ApiOperation("鍒嗛〉鏌ヨ鍦ㄥ満杞﹁締")
@PostMapping("/pageCars")
@CloudRequiredPermission("business:retention:query")
public ApiResponse<PageData<RetentionCarsVO>> findPageForCars (@RequestBody PageWrap<RetentionCarsVO> pageWrap, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
index e4c6ad1..e3dbf9d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
@@ -235,8 +235,10 @@
.leftJoin(Member.class,Member::getId,Retention::getMemberId)
.leftJoin(Member.class,Member::getId,Retention::getMemberId)
.leftJoin(Company.class,Company::getId,Member::getCompanyId)
+ .leftJoin(Category.class,Category::getId,Retention::getCategoryId)
.selectAs(Company::getCompanyNamePath,Retention::getCompanyName)
.selectAs(Member::getName,Retention::getName)
+ .selectAs(Category::getName,Retention::getCategoryName)
.selectAs(Member::getPhone,Retention::getPhone)
.selectAs(Member::getVisitCompanyName,Retention::getVisitCompanyName)
.and(StringUtils.isNotBlank(pageWrap.getModel().getKeyWords()),w->{
--
Gitblit v1.9.3