From 490e61bcf958e840f221f8d21d0a54ac7c99a7c4 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期四, 06 一月 2022 13:40:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/BroadcastTerminalV2Service.java | 145 ++++++++++++++++++++++-------------------------
1 files changed, 68 insertions(+), 77 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/BroadcastTerminalV2Service.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/BroadcastTerminalV2Service.java
index 539e9a2..c9c0884 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/BroadcastTerminalV2Service.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/BroadcastTerminalV2Service.java
@@ -1,11 +1,15 @@
package com.sandu.ximon.admin.service;
+import cn.hutool.core.collection.CollUtil;
import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
+import com.sandu.common.object.BaseConditionVO;
+import com.sandu.common.service.impl.BaseServiceImpl;
+import com.sandu.ximon.admin.param.BroadcastTerminalV2Param;
+import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.TerminalAPIUtils;
-import com.sandu.ximon.admin.utils.request.BroadcastParams;
import com.sandu.ximon.admin.vo.TerminalVO;
import com.sandu.ximon.dao.domain.BroadcastTerminalV2Entity;
+import com.sandu.ximon.dao.domain.BroadcastV2TaskTerminal;
import com.sandu.ximon.dao.mapper.BroadcastV2TaskTerminalMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -13,94 +17,83 @@
import java.util.List;
@Service
-public class BroadcastTerminalV2Service {
-/*
- private final BroadcastV2TaskTerminalMapper broadcastV2TaskTerminalDao;
+public class BroadcastTerminalV2Service extends BaseServiceImpl<BroadcastV2TaskTerminalMapper, BroadcastV2TaskTerminal> {
+ // private final BroadcastV2TaskTerminalMapper broadcastV2TaskTerminalDao;
+// @Autowired
+// private SysUserRoleService sysUserRoleService;
+// @Autowired
+// private SysUserCompanyService sysUserCompanyService;
+ @Autowired
+ private BroadcastV2TaskTerminalMapper broadcastV2TaskTerminalMapper;
- *//**
- * 鑾峰彇鍒楄〃
- * @param params
- * @param userId
- * @return
- *//*
- public PageInfo<BroadcastTerminalV2Entity> list(BroadcastParams params, Long userId) {
- Long roleId = sysUserRoleService.queryRoleId(userId);
- Long companyId = sysUserCompanyService.queryCompanyId(userId);
- Integer limit = params.getLimit();
- Integer page = params.getPage();
-
-
- List<BroadcastTerminalV2Entity> list = null;
- if(roleId == Constant.SUPER_ADMIN) {
- PageHelper.startPage(page,limit);
- list = broadcastTerminalV2Dao.listAll(params.getName());
- }else if(roleId == Constant.ADMIN) {
- PageHelper.startPage(page,limit);
- list = broadcastTerminalV2Dao.listByCompanyId(companyId, params.getName());
- }else {
- PageHelper.startPage(page,limit);
- list = broadcastTerminalV2Dao.listByUserId(userId,params.getName());
- }
- PageInfo<BroadcastTerminalV2Entity> pageInfo = new PageInfo(list);
-
- for(BroadcastTerminalV2Entity b :pageInfo.getList()){
- try {
- TerminalVO terminalInfo = TerminalAPIUtils.getTerminalInfo(b.getId());
- if(null == terminalInfo) {
- b.setExist(0);
- }else {
- b.setExist(1);
- }
- b.setStatus(terminalInfo.getStatus());
- b.setIp(terminalInfo.getIp());
- b.setVolumn(terminalInfo.getVolumn());
- b.setDefaultVolumn(terminalInfo.getDefaultVolumn());
- b.setPower(terminalInfo.getPower());
- b.setDefaultPower(terminalInfo.getDefaultPower());
- b.setLast(terminalInfo.getLast());
- b.setTaskType(terminalInfo.getTaskType());
- b.setTaskID(terminalInfo.getTaskID());
- }catch (Exception e) {
- b.setExist(2);
- }
- }
- return pageInfo;
- }
-
- *//**
+ /**
* 鍚屾缁堢
- *//*
+ */
public void synchTerminal() {
- List<BroadcastTerminalV2Entity> server = broadcastTerminalV2Dao.listAll("");
+ List<BroadcastTerminalV2Entity> server = broadcastV2TaskTerminalMapper.listAll("");
List<TerminalVO> list = TerminalAPIUtils.getTerminalList();
- list.stream().forEach(item->{
+ list.stream().forEach(item -> {
// 闊虫煴鏈嶅姟鍣ㄧ粓绔疘D
Integer id = item.getId();
boolean add = true;
// 閬嶅巻鏁版嵁搴撶粓绔�
- for(BroadcastTerminalV2Entity b: server) {
+ for (BroadcastTerminalV2Entity b : server) {
Integer id1 = b.getId();
- if(id.equals(id1)){
+ if (id.equals(id1)) {
add = false;
break;
}
}
- if(add){
+ if (add) {
BroadcastTerminalV2Entity b = new BroadcastTerminalV2Entity();
b.setId(id);
b.setTerminalName(item.getName());
b.setStreetlightId(0l);
b.setExist(1);
- broadcastTerminalV2Dao.insert(b);
+ broadcastV2TaskTerminalMapper.insert(b);
}
});
-
-
}
- *//**
+ public List<BroadcastTerminalV2Entity> getBroadcastTerminalList(BaseConditionVO baseConditionVO, BroadcastTerminalV2Param broadcastTerminalV2Param) {
+ if (broadcastTerminalV2Param == null) {
+ broadcastTerminalV2Param = new BroadcastTerminalV2Param();
+ }
+ Long clientId = SecurityUtils.getClientId();
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ List<Long> listBroadcastTerminalId;
+ //缁戝畾鐘舵�侊細宸茬粦瀹�/鏈粦瀹�/鍏ㄩ儴
+ if (broadcastTerminalV2Param.getBindingState() == null || 2 == broadcastTerminalV2Param.getBindingState()) {
+ //鍏ㄩ儴
+ int bindingState = 2;
+ listBroadcastTerminalId = broadcastV2TaskTerminalMapper.listBroadcastV2TerminalId(broadcastTerminalV2Param.getKeyword(), clientId, bindingState);
+ } else {
+ listBroadcastTerminalId = broadcastV2TaskTerminalMapper.listBroadcastV2TerminalId(broadcastTerminalV2Param.getKeyword(), clientId, broadcastTerminalV2Param.getBindingState());
+ }
+ if (CollUtil.isEmpty(listBroadcastTerminalId)) {
+ return CollUtil.newArrayList();
+ }
+ List<BroadcastTerminalV2Entity> broadcastTerminalV2Entities = broadcastV2TaskTerminalMapper.getBroadcastTerminalList(listBroadcastTerminalId);
+
+ for (BroadcastTerminalV2Entity bean : broadcastTerminalV2Entities) {
+ TerminalVO terminalVO = TerminalAPIUtils.getTerminalInfo(bean.getId());
+ bean.setStatus(terminalVO.getStatus());
+ bean.setIp(terminalVO.getIp());
+ bean.setVolumn(terminalVO.getVolumn());
+ bean.setDefaultVolumn(terminalVO.getDefaultVolumn());
+ bean.setPower(terminalVO.getPower());
+ bean.setDefaultPower(terminalVO.getDefaultPower());
+ bean.setLast(terminalVO.getLast());
+ bean.setTaskType(terminalVO.getTaskType());
+ bean.setTaskID(terminalVO.getTaskID());
+
+ }
+ return broadcastTerminalV2Entities;
+ }
+
+ /**
* 淇敼缁堢
- * @param params
+ * @param params
* @return 0:鎴愬姛 1:鍚嶇О涓嶈兘涓虹┖
*//*
public Integer updateTerminal(BroadcastParams params, Long userId) {
@@ -125,21 +118,19 @@
return 0;
}
- *//**
+ */
+
+ /**
* 闊抽噺淇敼
+ *
* @param params
- * @param userId
* @return
- *//*
- public Integer changeVol(BroadcastParams params, Long userId) {
- boolean b = TerminalAPIUtils.changeVol(params.getTerminalId(), params.getDefaultVolumn(), userId);
- if(b){
- return 0;
- }
- return 1;
+ */
+ public boolean changeVol(BroadcastTerminalV2Param params) {
+ return TerminalAPIUtils.changeVol(params.getId(), params.getDefaultVolumn());
}
- public List<BroadcastTerminalV2Entity> getAll(Long userId) {
+ /*public List<BroadcastTerminalV2Entity> getAll(Long userId) {
Long roleId = sysUserRoleService.queryRoleId(userId);
Long companyId = sysUserCompanyService.queryCompanyId(userId);
--
Gitblit v1.9.3