From c90e9e6d615b94aec96969b59d1eaecffaf8d0ef Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期二, 28 六月 2022 18:07:50 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java | 71 ++++++++++++++++++++++++++++-------
1 files changed, 56 insertions(+), 15 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
index 54c1190..1a0cc11 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
@@ -38,6 +38,7 @@
import com.sandu.ximon.admin.vo.PoleBindVO;
import com.sandu.ximon.dao.bo.*;
import com.sandu.ximon.dao.domain.*;
+import com.sandu.ximon.dao.enums.OrderByEnums;
import com.sandu.ximon.dao.mapper.PoleMapper;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -139,7 +140,7 @@
StringBuilder sb = new StringBuilder();
String date = new SimpleDateFormat("yyMMdd").format(new Date());
sb.append(date);
- String key = LightKey.POLE_SN.key(null);
+ String key = LightKey.POLE_SN.key(date);
Long increment = redisService.incr(key, 1);
String incrementStr = increment.toString();
if (incrementStr.length() <= 4) {
@@ -173,7 +174,7 @@
result.put("poleTotalCount", list.size());
//璇虹摝
- List<LedPlayerEntity> ledPlayerEntities = SpringContextHolder.getBean(LedPlayerEntityService.class).ledPlayerEntityList(null, null);
+ List<LedPlayerEntity> ledPlayerEntities = SpringContextHolder.getBean(LedPlayerEntityService.class).ledPlayerEntityList(null, null, null, null);
int number = 0;
for (LedPlayerEntity bean : ledPlayerEntities) {
if (bean.getOnlineStatus() == 1) {
@@ -190,7 +191,7 @@
broadcastTerminalV2Param.setWorkState(2);
List<BroadcastTerminalV2EntityBo> broadcastTerminalList = SpringContextHolder.getBean(IpVolumeService.class).getBroadcastTerminalList(null, null, null, broadcastTerminalV2Param);
for (BroadcastTerminalV2EntityBo bean : broadcastTerminalList) {
- if (bean.getStatus() == 1 || bean.getStatus() == 0) {
+ if (bean.getStatus() != 0) {
number++;
}
}
@@ -202,9 +203,9 @@
MonitorParam monitorParam = new MonitorParam();
monitorParam.setEquipmentState(2);
monitorParam.setBindingState(2);
- List<MonitorBo> monitorBos = SpringContextHolder.getBean(MonitorService.class).listMonitorByKeyword(null,null,null, monitorParam).getList();
+ List<MonitorBo> monitorBos = SpringContextHolder.getBean(MonitorService.class).listMonitorByKeyword(null, null, null, monitorParam).getList();
monitorParam.setEquipmentState(1);
- List<MonitorBo> online = SpringContextHolder.getBean(MonitorService.class).listMonitorByKeyword(null,null,null, monitorParam).getList();
+ List<MonitorBo> online = SpringContextHolder.getBean(MonitorService.class).listMonitorByKeyword(null, null, null, monitorParam).getList();
result.put("monitorOnlineCount", online.size());
result.put("monitorTotalCount", monitorBos.size());
@@ -276,8 +277,8 @@
result.put("LightPoleHeelingTotalCount", lightPoleHeelings.size());
//鐔欒
- List<PoleLightemitEntity> poleLightemitEntities = SpringContextHolder.getBean(PoleLightemitService.class).listLed(null, false);
- List<PoleLightemitEntity> poleLightemitEntityOnlineList = SpringContextHolder.getBean(PoleLightemitService.class).listLed(null, true);
+ List<PoleLightemitEntity> poleLightemitEntities = SpringContextHolder.getBean(PoleLightemitService.class).listLed(null, null, null, false);
+ List<PoleLightemitEntity> poleLightemitEntityOnlineList = SpringContextHolder.getBean(PoleLightemitService.class).listLed(null, null, null, true);
result.put("XiXunOnlineCount", poleLightemitEntityOnlineList.size());
result.put("XiXunTotalCount", poleLightemitEntities.size());
@@ -285,16 +286,51 @@
return result;
}
- public CommonPage queryAllStatesAndList(Integer pageNo, Integer pageSize, PoleStatesParam param) {
+ public CommonPage queryAllStatesAndList(Integer pageNo, Integer pageSize, PoleStatesParam param, Integer order, Integer seq) {
if (param == null) {
param = new PoleStatesParam();
}
- System.out.println(param);
+
+ //鎺掑簭瀛楁
+ String orderByResult = OrderByEnums.POLE_ID.getCode();
+ //姝ｅ簭銆佸�掑彊
+ String orderBySeq = OrderByEnums.ASC.getCode();
+ if (order != null) {
+ switch (order) {
+ case 1:
+ orderByResult = OrderByEnums.POLE_NAME.getCode();
+ break;
+ case 2:
+ orderByResult = OrderByEnums.POLE_ID.getCode();
+ break;
+ case 3:
+ orderByResult = OrderByEnums.POLE_CREATE_TIME.getCode();
+ break;
+ default:
+ }
+ }
+ if (seq != null) {
+ switch (seq) {
+ case 1:
+ orderBySeq = OrderByEnums.ASC.getCode();
+ break;
+ case 2:
+ orderBySeq = OrderByEnums.DESC.getCode();
+ break;
+ default:
+ break;
+ }
+ }
+ //鎺掑簭鏂瑰紡
+ String orderBy = "t1." + orderByResult + " " + orderBySeq;
+
List<Pole> poleList;
if (SecurityUtils.getClientId() == null) {
- poleList = poleMapper.queryPoleOnLineStatesList(null, param.getIsTrue(), param.getBingStates(), param.getGroupid(), param.getKeyword());
+ poleList = poleMapper.queryPoleOnLineStatesList(null, param.getIsTrue(),
+ param.getBingStates(), param.getGroupid(), param.getKeyword(), orderBy);
} else {
- poleList = poleMapper.queryPoleOnLineStatesList(SecurityUtils.getUserId(), param.getIsTrue(), param.getBingStates(), param.getGroupid(), param.getKeyword());
+ poleList = poleMapper.queryPoleOnLineStatesList(SecurityUtils.getUserId(),
+ param.getIsTrue(), param.getBingStates(), param.getGroupid(), param.getKeyword(), orderBy);
}
List<Pole> PoleResult = isOnLine(poleList, param);
@@ -569,9 +605,8 @@
/**
* 缁欑伅鏉嗘敞鍐屼笁鍏冪爜
*/
- public boolean setMac(String baseMac) {
- boolean setMac = false;
- //String baseMac = "baseDevice";
+ public Map setMac(String baseMac) {
+
A1Frame a1Frame = new A1Frame(A1OrderEnum.REQUEST_READ_DEVICE_UNIQUE_MAC.getCode(), new EmptyRequestInnerFrame());
CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(baseMac, a1Frame);
//瀛樺偍鎸褰�
@@ -677,8 +712,14 @@
/**
* 瀹炰綋鐏潌娉ㄥ唽鏃ュ織璁板綍缁撴潫
*/
+ Map map = new HashMap();
+ if (result) {
+ map.put("mac", uniqueMac);
+ } else {
+ map.put("mac", -1);
+ }
- return result;
+ return map;
}
public List<String> listDeviceCodeByIds(List<Long> poleIdList) {
--
Gitblit v1.9.3