From edf0e8e51fad2cca56a75d5e8fd5ba2f0aa2e12e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 21 五月 2025 17:03:08 +0800
Subject: [PATCH] 最新版本541200007
---
admin/src/views/platform/LogisticsRecord/waybill.vue | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/DeviceService.java | 1
server/visits/admin_timer/src/main/java/com/doumee/api/HkDeviceTimerController.java | 9 ++++
admin/src/views/business/internalCompany.vue | 2
admin/src/views/platform/LogisticsRecord/subscribe.vue | 2
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformDevice.java | 5 ++
admin/src/components/business/OperaInternalCompanyWindow.vue | 3 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java | 46 +++++++++++++++++++++--
server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java | 5 ++
9 files changed, 66 insertions(+), 9 deletions(-)
diff --git a/admin/src/components/business/OperaInternalCompanyWindow.vue b/admin/src/components/business/OperaInternalCompanyWindow.vue
index bce73e5..783f6b9 100644
--- a/admin/src/components/business/OperaInternalCompanyWindow.vue
+++ b/admin/src/components/business/OperaInternalCompanyWindow.vue
@@ -90,7 +90,8 @@
parentId: null,
disable: false,
parentName: '',
- parentType:null
+ parentType: null,
+ sortnum: null
}
if (target != null) {
this.form.parentId = target.id
diff --git a/admin/src/views/business/internalCompany.vue b/admin/src/views/business/internalCompany.vue
index f29a75c..ae0e822 100644
--- a/admin/src/views/business/internalCompany.vue
+++ b/admin/src/views/business/internalCompany.vue
@@ -38,7 +38,7 @@
</template>
</el-table-column>
<el-table-column prop="companyNamePath" label="缁勭粐璺緞" min-width="100px"></el-table-column>
- <el-table-column prop="sortnum" label="鎺掑簭鐮�" min-width="100px"></el-table-column>
+ <el-table-column prop="sortnum" align="center" label="鎺掑簭鐮�" min-width="80px"></el-table-column>
<el-table-column prop="editorName" label="鎿嶄綔浜�" width="100px"></el-table-column>
<el-table-column prop="editDate" label="鏈�鍚庢洿鏂版椂闂�" min-width="100px"></el-table-column>
<el-table-column label="鎿嶄綔" width="230" fixed="right">
diff --git a/admin/src/views/platform/LogisticsRecord/subscribe.vue b/admin/src/views/platform/LogisticsRecord/subscribe.vue
index cedb20e..a245df0 100644
--- a/admin/src/views/platform/LogisticsRecord/subscribe.vue
+++ b/admin/src/views/platform/LogisticsRecord/subscribe.vue
@@ -202,7 +202,7 @@
{ value: 7, label: '杞Щ涓�' },
{ value: 8, label: '寮傚父鎸傝捣' },
{ value: 9, label: '宸叉巿鏉冪鍥�' },
- { value: 10, label: '宸茬鍥�' },
+ // { value: 10, label: '宸茬鍥�' },
{ value: 11, label: '宸茶繃鍙�' },
{ value: 12, label: '宸插彇娑�' },
]
diff --git a/admin/src/views/platform/LogisticsRecord/waybill.vue b/admin/src/views/platform/LogisticsRecord/waybill.vue
index a4e9be5..37e7e56 100644
--- a/admin/src/views/platform/LogisticsRecord/waybill.vue
+++ b/admin/src/views/platform/LogisticsRecord/waybill.vue
@@ -137,7 +137,7 @@
{ value: 7, label: '杞Щ涓�' },
{ value: 8, label: '寮傚父鎸傝捣' },
{ value: 9, label: '宸叉巿鏉冪鍥�' },
- { value: 10, label: '宸茬鍥�' },
+ // { value: 10, label: '宸茬鍥�' },
{ value: 11, label: '宸茶繃鍙�' },
{ value: 12, label: '宸插彇娑�' },
]
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 1bf2935..e4f8ab8 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
@@ -27,7 +27,10 @@
ApiResponse syncEmpowerData();
@ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃舵煡璇㈣澶囩姸鎬�")
@GetMapping("/timer/device/getAscDeviceStatus")
- ApiResponse getAscDeviceStatus() ;
+ ApiResponse getAscDeviceStatus() ;
+ @ApiOperation("銆愯瀹㈢郴缁熴�戣缃叏閮↙ED灞忔樉鍐呭涓洪粯璁ゅ唴瀹�")
+ @GetMapping("/timer/device/setAllLedDefualtContent")
+ ApiResponse setAllLedDefualtContent() ;
@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 f88f8dc..a25a46a 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,5 +1,6 @@
package com.doumee.api;
+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;
@@ -19,11 +20,19 @@
public class HkDeviceTimerController extends BaseController {
@Autowired
private HkSyncDeviceServiceImpl hkSyncDeviceService;
+ @Autowired
+ private DeviceService deviceService;
@ApiOperation("寮�鍚畾鏃舵煡璇㈣澶囩姸鎬�")
@GetMapping("/getAscDeviceStatus")
public ApiResponse getAscDeviceStatus() {
hkSyncDeviceService.getAscDeviceStatus();
return ApiResponse.success("寮�鍚畾鏃舵煡璇㈣澶囩姸鎬佹垚鍔�");
}
+ @ApiOperation("鏇存柊鍏ㄩ儴LED灞忔樉鍐呭涓洪粯璁ゅ唴瀹�")
+ @GetMapping("/setAllLedDefualtContent")
+ public ApiResponse setAllLedDefualtContent() {
+ deviceService.setAllLedDefualtContent();
+ return ApiResponse.success("鏇存柊鍏ㄩ儴LED灞忔樉鍐呭涓洪粯璁ゅ唴瀹�");
+ }
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformDevice.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformDevice.java
index 80aca22..39575c7 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformDevice.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformDevice.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -82,4 +83,8 @@
@ExcelColumn(name="璁惧绶ㄧ⒓")
private String hkNo;
+ @ApiModelProperty(value = "led绌洪棽鏂囨")
+ @TableField(exist = false)
+ private String ledContent;
+
}
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 beef61f..b83aa6d 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,4 +104,5 @@
long count(Device device);
void setLedContent(TransparentChannelSingleRequest body);
+ void setAllLedDefualtContent();
}
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 8477419..de7ca96 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
@@ -5,25 +5,27 @@
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.haikang.model.param.request.TransparentChannelSingleRequest;
+import com.doumee.dao.business.*;
+import com.doumee.dao.business.model.*;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
-import com.doumee.dao.business.DeviceMapper;
-import com.doumee.dao.business.PlatformBroadcastLogMapper;
-import com.doumee.dao.business.model.Device;
-import com.doumee.dao.business.model.PlatformBroadcastLog;
import com.doumee.service.business.DeviceService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.service.business.impl.hksync.HkSyncPushServiceImpl;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.*;
+import java.util.stream.Collectors;
/**
* 璁惧淇℃伅琛⊿ervice瀹炵幇
@@ -31,10 +33,15 @@
* @date 2023/11/30 15:33
*/
@Service
+@Slf4j
public class DeviceServiceImpl implements DeviceService {
@Autowired
private DeviceMapper deviceMapper;
+ @Autowired
+ private PlatformMapper platformMapper;
+ @Autowired
+ private PlatformDeviceMapper platformDeviceMapper;
@Autowired
private SystemDictDataBiz systemDictDataBiz;
@Autowired
@@ -246,4 +253,35 @@
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝灞忓箷鍐呭璁剧疆澶辫触"+(log!=null?log.getHkInfo():""));
}
}
+ @Override
+ public void setAllLedDefualtContent() {
+ int speed = 13;
+ try {
+ speed = Integer.parseInt(systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.LED_CONTENT_SPEED).getCode());
+ }catch (Exception e){
+ }
+ //鎵�鏈夋湀鍙板叧鑱旇澶囦俊鎭�
+ List<PlatformDevice> list = platformDeviceMapper.selectList(new MPJLambdaWrapper<PlatformDevice>().
+ selectAll(PlatformDevice.class)
+ .selectAs(Platform::getLedContent,PlatformDevice::getLedContent)
+ .leftJoin(Platform.class,Platform::getId,PlatformDevice::getPlatformId)
+ .eq(PlatformDevice::getType,Constants.ZERO)
+ .eq(PlatformDevice::getIsdeleted,Constants.ZERO)
+ .eq(Platform::getIsdeleted,Constants.ZERO)
+ );
+ if(list==null || list.size()==0){
+ return;
+ }
+ for(PlatformDevice device :list){
+ String content = device.getLedContent();
+ if(StringUtils.isBlank(content)){
+ continue;
+ }
+ 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():""));
+ }
+ }
+ }
}
--
Gitblit v1.9.3