From d0d5e25bfab469a826279fbf877fd7730c9a76e9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 26 五月 2025 18:20:09 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/DeviceService.java | 2 +-
server/visits/admin_timer/src/main/java/com/doumee/api/HkDeviceTimerController.java | 6 +++---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 2 +-
server/system_service/src/main/java/com/doumee/core/annotation/pr/PreventRepeatInterceptor.java | 3 ++-
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java | 2 ++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java | 27 +++++++++++++++++----------
server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java | 4 ++--
7 files changed, 28 insertions(+), 18 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/core/annotation/pr/PreventRepeatInterceptor.java b/server/system_service/src/main/java/com/doumee/core/annotation/pr/PreventRepeatInterceptor.java
index 1e1ccad..fe0703c 100644
--- a/server/system_service/src/main/java/com/doumee/core/annotation/pr/PreventRepeatInterceptor.java
+++ b/server/system_service/src/main/java/com/doumee/core/annotation/pr/PreventRepeatInterceptor.java
@@ -42,7 +42,8 @@
// 鑾峰彇楠岃瘉瀵硅薄鍜屾柟娉�
PreventRepeatAdapter adapter = (PreventRepeatAdapter)applicationContext.getBean(prAnnotation.value());
// 楠岃瘉鏆村姏璇锋眰
- if(prAnnotation.limit() > 0 && prAnnotation.lockTime() > 0 && adapter.massive(request, prAnnotation.limit(), prAnnotation.lockTime())) {
+ if(prAnnotation.limit() > 0 && prAnnotation.lockTime() > 0
+ && adapter.massive(request, prAnnotation.limit(), prAnnotation.lockTime())) {
log.warn("Eva Intercept a massive request锛寀rl锛歿}", request.getRequestURI());
response.setHeader("content-type", "application/json;charset=UTF-8");
ApiResponse apiResponse = ApiResponse.failed(ResponseStatus.MASSIVE_REQUEST);
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 e4f8ab8..76b0cb4 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
@@ -29,8 +29,8 @@
@GetMapping("/timer/device/getAscDeviceStatus")
ApiResponse getAscDeviceStatus() ;
@ApiOperation("銆愯瀹㈢郴缁熴�戣缃叏閮↙ED灞忔樉鍐呭涓洪粯璁ゅ唴瀹�")
- @GetMapping("/timer/device/setAllLedDefualtContent")
- ApiResponse setAllLedDefualtContent() ;
+ @GetMapping("/timer/device/allLedDefualtContent")
+ ApiResponse allLedDefualtContent();
@ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃跺浠芥暟鎹簱")
@GetMapping("/timer/db/backupDatabase")
ApiResponse backupDatabase() ;
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 a25a46a..ead9815 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
@@ -29,9 +29,9 @@
return ApiResponse.success("寮�鍚畾鏃舵煡璇㈣澶囩姸鎬佹垚鍔�");
}
@ApiOperation("鏇存柊鍏ㄩ儴LED灞忔樉鍐呭涓洪粯璁ゅ唴瀹�")
- @GetMapping("/setAllLedDefualtContent")
- public ApiResponse setAllLedDefualtContent() {
- deviceService.setAllLedDefualtContent();
+ @GetMapping("/allLedDefualtContent")
+ public ApiResponse allLedDefualtContent() {
+ deviceService.allLedDefualtContent();
return ApiResponse.success("鏇存柊鍏ㄩ儴LED灞忔樉鍐呭涓洪粯璁ゅ唴瀹�");
}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java
index d405af2..151b50f 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java
@@ -18,6 +18,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.annotation.Repeat;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -142,6 +143,7 @@
@ApiOperation(value = "PC绔瀹㈣褰曟彁浜�", notes = "璁垮鎻愪氦")
@PostMapping("/createFk")
+ @PreventRepeat(interval = 2000)
public ApiResponse createFk(@RequestBody Visits visits) {
visits.setSourceType(Constants.ZERO);
return ApiResponse.success("鏌ヨ鎴愬姛", visitsService.createFk(visits,false,Constants.ONE));
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/DeviceService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/DeviceService.java
index b83aa6d..b447ed3 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/DeviceService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/DeviceService.java
@@ -104,5 +104,5 @@
long count(Device device);
void setLedContent(TransparentChannelSingleRequest body);
- void setAllLedDefualtContent();
+ void allLedDefualtContent();
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
index de7ca96..b8c1545 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
@@ -254,7 +254,8 @@
}
}
@Override
- public void setAllLedDefualtContent() {
+ public void allLedDefualtContent() {
+ log.error( "灞忓箷鍐呭璁剧疆=======================寮�濮�========" );
int speed = 13;
try {
speed = Integer.parseInt(systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.LED_CONTENT_SPEED).getCode());
@@ -262,7 +263,7 @@
}
//鎵�鏈夋湀鍙板叧鑱旇澶囦俊鎭�
List<PlatformDevice> list = platformDeviceMapper.selectList(new MPJLambdaWrapper<PlatformDevice>().
- selectAll(PlatformDevice.class)
+ selectAll(PlatformDevice.class)
.selectAs(Platform::getLedContent,PlatformDevice::getLedContent)
.leftJoin(Platform.class,Platform::getId,PlatformDevice::getPlatformId)
.eq(PlatformDevice::getType,Constants.ZERO)
@@ -273,15 +274,21 @@
return;
}
for(PlatformDevice device :list){
- String content = device.getLedContent();
- if(StringUtils.isBlank(content)){
- continue;
+ try {
+ String content = device.getLedContent();
+ if(StringUtils.isBlank(content)){
+ continue;
+ }
+ PlatformBroadcastLog log1 = HkSyncPushServiceImpl.dealLedContentBiz(0,device.getHkNo(),device.getName(),content,speed,1);
+ platformBroadcastLogMapper.insert(log1);
+ if(log1.getHkStatus() == null || !Constants.equalsInteger(log1.getHkStatus(), Constants.TWO)){
+ log.error( "瀵逛笉璧凤紝灞忓箷鍐呭璁剧疆澶辫触"+(log1!=null?log1.getHkInfo():""));
+ }
+ }catch (Exception e){
+ log.error( "瀵逛笉璧凤紝灞忓箷鍐呭璁剧疆寮傚父"+ device.getName());
}
- PlatformBroadcastLog log1 = HkSyncPushServiceImpl.dealLedContentBiz(device.getPlatformId(),device.getHkNo(),device.getName(),content,speed,1);
- platformBroadcastLogMapper.insert(log1);
- if(log1.getHkStatus() == null || !Constants.equalsInteger(log1.getHkStatus(), Constants.TWO)){
- log.error( "瀵逛笉璧凤紝灞忓箷鍐呭璁剧疆澶辫触"+(log1!=null?log1.getHkInfo():""));
- }
+
}
+ log.error( "灞忓箷鍐呭璁剧疆=======================缁撴潫========" );
}
}
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 2cd7077..e6c13b7 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
@@ -565,7 +565,7 @@
insert.setParentId(member.getParentId());
memberMapper.insert(insert);
- /* TrainTime trainTime = new TrainTime();
+ /* TrainTime trainTime = new TrainTime();
trainTime.setCreator(loginUserInfo.getId().toString());
trainTime.setCreateDate(new Date());
trainTime.setEdirot(loginUserInfo.getId().toString());
--
Gitblit v1.9.3