From 3b6935b9eda0e267253280d1ebc78fc2d0e00728 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 03 九月 2024 11:41:47 +0800
Subject: [PATCH] 考核积分查看已发布，OSD品牌同步调整到monitor同步Mysql一机一档
---
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java | 4 +
ycl-server/src/main/java/com/ycl/api/HK/HKApi.java | 2
ycl-server/src/main/java/com/ycl/api/DH/module/LoginModule.java | 2
ycl-server/src/main/java/com/ycl/task/OsdTask.java | 30 +---------
ycl-server/src/main/java/com/ycl/platform/controller/CheckScoreController.java | 1
ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java | 73 ++++++++++++-----------
ycl-server/src/main/java/com/ycl/task/MonitorTask.java | 22 ++++++-
ycl-server/src/main/java/com/ycl/api/YS/YSApi.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/result/OSDResult.java | 2
9 files changed, 71 insertions(+), 67 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/OSDResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/OSDResult.java
index ade1021..0360f02 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/OSDResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/OSDResult.java
@@ -41,4 +41,6 @@
* 鍥恒�佹灙銆佽矾銆佽タ鍖�
*/
private String OSD4;
+
+ private Integer deviceBrand;
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java
index 806c08f..cc87869 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java
@@ -23,6 +23,10 @@
private String deviceNo;
/**
+ * 鎽勫儚鏈哄搧鐗�
+ */
+ private Integer deviceBrand;
+ /**
* 璁惧绫诲瀷
*/
private String deviceType;
diff --git a/ycl-server/src/main/java/com/ycl/api/DH/module/LoginModule.java b/ycl-server/src/main/java/com/ycl/api/DH/module/LoginModule.java
index ca4fb44..86861cc 100644
--- a/ycl-server/src/main/java/com/ycl/api/DH/module/LoginModule.java
+++ b/ycl-server/src/main/java/com/ycl/api/DH/module/LoginModule.java
@@ -11,6 +11,7 @@
import com.ycl.api.DH.lib.structure.*;
import com.ycl.platform.domain.result.OSDResult;
import com.ycl.utils.StringUtils;
+import enumeration.DeviceType;
import lombok.extern.slf4j.Slf4j;
import java.io.File;
@@ -215,6 +216,7 @@
}
}
}
+ osdResult.setDeviceBrand(DeviceType.DH.getType());
return osdResult;
}
diff --git a/ycl-server/src/main/java/com/ycl/api/HK/HKApi.java b/ycl-server/src/main/java/com/ycl/api/HK/HKApi.java
index 4afd313..a9711cd 100644
--- a/ycl-server/src/main/java/com/ycl/api/HK/HKApi.java
+++ b/ycl-server/src/main/java/com/ycl/api/HK/HKApi.java
@@ -3,6 +3,7 @@
import com.ycl.platform.domain.result.OSDResult;
import com.ycl.utils.StringUtils;
import constant.ApiConstants;
+import enumeration.DeviceType;
import lombok.extern.slf4j.Slf4j;
import org.apache.http.HttpResponse;
import org.apache.http.auth.AuthScope;
@@ -49,6 +50,7 @@
Date date = new Date();
//瑙ｆ瀽xml
parseXMl(timeString, "Time", "localTime", osdResult, date, ip);
+ osdResult.setDeviceBrand(DeviceType.HK.getType());
} catch (Exception e) {
return null;
}
diff --git a/ycl-server/src/main/java/com/ycl/api/YS/YSApi.java b/ycl-server/src/main/java/com/ycl/api/YS/YSApi.java
index 6843e77..a68216d 100644
--- a/ycl-server/src/main/java/com/ycl/api/YS/YSApi.java
+++ b/ycl-server/src/main/java/com/ycl/api/YS/YSApi.java
@@ -6,6 +6,7 @@
import com.ycl.api.YS.lib.NetDEVSDKLib;
import com.ycl.api.YS.login.Login;
import com.ycl.platform.domain.result.OSDResult;
+import enumeration.DeviceType;
import lombok.extern.slf4j.Slf4j;
import java.nio.charset.StandardCharsets;
@@ -109,6 +110,7 @@
}
//鐧诲嚭
YSInit.netdevsdk.NETDEV_Logout(lpUserID);
+ osdResult.setDeviceBrand(DeviceType.YS.getType());
return osdResult;
} else {
// log.error("ip:"+ip+",error code" + YSInit.netdevsdk.NETDEV_GetLastError());
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/CheckScoreController.java b/ycl-server/src/main/java/com/ycl/platform/controller/CheckScoreController.java
index 7913a99..e4b1a7a 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/CheckScoreController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/CheckScoreController.java
@@ -73,7 +73,6 @@
@GetMapping(value = "/detail/index")
public AjaxResult getIndex(CheckScoreIndexDTO checkScoreIndexDTO)
{
-
return success(checkScoreService.selectCheckScoreById(checkScoreIndexDTO));
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java
index 48dd150..19c36b7 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java
@@ -17,6 +17,7 @@
import com.ycl.platform.service.ICheckIndexVideoService;
import com.ycl.platform.service.ICheckScoreService;
import com.ycl.system.entity.SysRole;
+import com.ycl.system.entity.SysUser;
import com.ycl.system.service.ISysDeptService;
import com.ycl.utils.DateUtils;
import com.ycl.utils.SecurityUtils;
@@ -44,8 +45,7 @@
*/
@Service
@Slf4j
-public class CheckScoreServiceImpl extends ServiceImpl<CheckScoreMapper, CheckScore> implements ICheckScoreService
-{
+public class CheckScoreServiceImpl extends ServiceImpl<CheckScoreMapper, CheckScore> implements ICheckScoreService {
@Autowired
private CheckScoreMapper scoreMapper;
@Autowired
@@ -62,6 +62,7 @@
private ICheckIndexVideoService indexVideoService;
@Autowired
private ISysDeptService deptService;
+
/**
* 鏌ヨ鑰冩牳绉垎鎸囨爣
*
@@ -69,9 +70,8 @@
* @return 鑰冩牳绉垎
*/
@Override
- @DataScope(deptAlias = "d",userAlias = "u")
- public CheckScoreDetailVO selectCheckScoreById(CheckScoreIndexDTO checkScoreIndexDTO)
- {
+ @DataScope(deptAlias = "d", userAlias = "u")
+ public CheckScoreDetailVO selectCheckScoreById(CheckScoreIndexDTO checkScoreIndexDTO) {
Long checkScoreId = checkScoreIndexDTO.getId();
CheckScoreDetailVO checkScoreDetailVO = new CheckScoreDetailVO();
@@ -82,7 +82,7 @@
List<CheckRule> checkRules = new ArrayList<>();
//璇诲彇妯℃澘瀵瑰簲鎵�鏈夎鍒�
- Map<String,Object> scoreMap = new HashMap<>();
+ Map<String, Object> scoreMap = new HashMap<>();
List<Integer> ruleIds = templateRuleList.stream().map(checkTemplateRule -> checkTemplateRule.getCheckRuleId())
.collect(Collectors.toList());
List<CheckRule> ruleIndex = ruleMapper.selectBatchIds(ruleIds);
@@ -90,7 +90,7 @@
checkRules.addAll(ruleIndex);
//鏍规嵁examineCategory 璇诲彇涓嶅悓index琛�
Short examineCategory = checkScore.getExamineCategory();
- String[] indexTableArr ={"","t_check_index_video","t_check_index_car","t_check_index_face"};
+ String[] indexTableArr = {"", "t_check_index_video", "t_check_index_car", "t_check_index_face"};
String tableName = indexTableArr[examineCategory];
ScoreIndexDTO scoreIndexDTO = new ScoreIndexDTO()
@@ -101,7 +101,7 @@
scoreIndexDTO.setParams(checkScoreIndexDTO.getParams());
scoreIndexDTO.setExamineTag(checkScore.getExamineTag());
//鑾峰綋鏈堜唤
- if(StringUtils.isEmpty(scoreIndexDTO.getDate()) && CollectionUtils.isEmpty(checkScoreIndexDTO.getQuarter())){
+ if (StringUtils.isEmpty(scoreIndexDTO.getDate()) && CollectionUtils.isEmpty(checkScoreIndexDTO.getQuarter())) {
//濡傛灉鏌ヨ鏉′欢涓嶅惈鍙傛暟锛屾煡璇㈢Н鍒嗗搴斿垱寤烘椂闂�
Date createTime = checkScore.getCreateTime();
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM");
@@ -110,8 +110,8 @@
List<Map> map = scoreMapper.selectScoreIndex(scoreIndexDTO);
- scoreMap.put("tableData",checkRules);
- scoreMap.put("dataMap",map);
+ scoreMap.put("tableData", checkRules);
+ scoreMap.put("dataMap", map);
checkScoreDetailVO.setCheckRuleList(templateRuleList);
checkScoreDetailVO.setScoreMap(scoreMap);
@@ -126,9 +126,8 @@
* @return 鑰冩牳绉垎
*/
@Override
- @DataScope(deptAlias = "d",userAlias = "u")
- public Map<Long, List<CheckScore>> selectCheckScoreList(CheckScore checkScore)
- {
+ @DataScope(deptAlias = "d", userAlias = "u")
+ public Map<Long, List<CheckScore>> selectCheckScoreList(CheckScore checkScore) {
//鍖哄幙鍙兘鐪嬪凡鍙戝竷
roleControl(checkScore);
@@ -137,7 +136,9 @@
getCheckScore(checkScore, calendar);
// 涓�鍙锋煡璇箣鍓嶇殑鏁版嵁
- if (LocalDateTime.now().getDayOfMonth() == 1) { calendar.add(Calendar.DAY_OF_MONTH, -1); }
+ if (LocalDateTime.now().getDayOfMonth() == 1) {
+ calendar.add(Calendar.DAY_OF_MONTH, -1);
+ }
List<CheckScore> checkScores = scoreMapper.selectCheckScoreMap(checkScore);
@@ -153,8 +154,7 @@
return checkScores.stream().collect(Collectors.groupingBy(CheckScore::getDeptId));
}
- private void getCheckScore(CheckScore checkScore, Calendar calendar)
- {
+ private void getCheckScore(CheckScore checkScore, Calendar calendar) {
// 0 鐪佸巺鏈堝害 1 甯傚眬鏈堝害 2 鐪佸巺瀛ｅ害 3 甯傚眬瀛ｅ害
switch (checkScore.getExamineTag()) {
case 0, 1:
@@ -177,15 +177,14 @@
* @return 鑰冩牳绉垎
*/
@Override
- @DataScope(deptAlias = "d",userAlias = "u")
- public Map<Long, List<CheckScore>> selectCheckScoreChart(CheckScore checkScore)
- {
+ @DataScope(deptAlias = "d", userAlias = "u")
+ public Map<Long, List<CheckScore>> selectCheckScoreChart(CheckScore checkScore) {
//鍖哄幙鍙兘鐪嬪凡鍙戝竷
roleControl(checkScore);
//鏌ヨ鎴愮哗
String date = checkScore.getDate();
- if(StringUtils.isEmpty(date)){
+ if (StringUtils.isEmpty(date)) {
//濡傛灉涓虹┖鏌ユ湰鏈堢殑鏁版嵁
Calendar now = Calendar.getInstance();
//鍙栨槰澶�
@@ -206,7 +205,7 @@
* @return 鑰冩牳绉垎
*/
@Override
- @DataScope(deptAlias = "d",userAlias = "u")
+ @DataScope(deptAlias = "d", userAlias = "u")
public List<CheckScore> page(CheckScore checkScore) {
//鍖哄幙鍙兘鐪嬪凡鍙戝竷
roleControl(checkScore);
@@ -221,7 +220,7 @@
*/
@Override
public int publishCheckScore(CheckScoreDTO checkScoreDTO) {
- if(CollectionUtils.isEmpty(checkScoreDTO.getId())){
+ if (CollectionUtils.isEmpty(checkScoreDTO.getId())) {
return 0;
}
PublishType publishType = null;
@@ -243,11 +242,11 @@
* @return 鑰冩牳绉垎
*/
@Override
- public void exportIndex(HttpServletResponse response,CheckScore checkScoreDTO) throws IOException {
+ public void exportIndex(HttpServletResponse response, CheckScore checkScoreDTO) throws IOException {
String date = checkScoreDTO.getDate();
Integer examineTag = null;
//濡傛灉璇锋眰鍙傛暟鏃堕棿涓虹┖锛屾煡杩欐潯璁板綍鐨勬椂闂�
- if(StringUtils.isEmpty(checkScoreDTO.getDate()) && CollectionUtils.isEmpty(checkScoreDTO.getQuarter())){
+ if (StringUtils.isEmpty(checkScoreDTO.getDate()) && CollectionUtils.isEmpty(checkScoreDTO.getQuarter())) {
CheckScore checkScore = getById(checkScoreDTO.getId());
Date createTime = checkScore.getCreateTime();
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM");
@@ -260,45 +259,49 @@
CheckIndexCar checkIndexCar = new CheckIndexCar();
checkIndexCar.setDate(date);
checkIndexCar.setQuarter(checkScoreDTO.getQuarter());
- if(examineTag!=null) {
+ if (examineTag != null) {
checkIndexCar.setExamineTag(Short.parseShort(examineTag + ""));
}
List<CheckIndexCar> checkIndexCars = indexCarService.selectCheckIndexCarList(checkIndexCar);
- ExcelExp e1 = new ExcelExp("杞﹁締鑰冩牳鎸囨爣鏁版嵁",checkIndexCars,CheckIndexCar.class);
+ ExcelExp e1 = new ExcelExp("杞﹁締鑰冩牳鎸囨爣鏁版嵁", checkIndexCars, CheckIndexCar.class);
//浜鸿劯
CheckIndexFace checkIndexFace = new CheckIndexFace();
checkIndexFace.setDate(date);
checkIndexFace.setQuarter(checkScoreDTO.getQuarter());
- if(examineTag!=null) {
+ if (examineTag != null) {
checkIndexFace.setExamineTag(Short.parseShort(examineTag + ""));
}
List<CheckIndexFace> checkIndexFaces = indexFaceService.selectCheckIndexFaceList(checkIndexFace);
- ExcelExp e2 = new ExcelExp("浜鸿劯鑰冩牳鎸囨爣鏁版嵁",checkIndexFaces,CheckIndexFace.class);
+ ExcelExp e2 = new ExcelExp("浜鸿劯鑰冩牳鎸囨爣鏁版嵁", checkIndexFaces, CheckIndexFace.class);
//瑙嗛
CheckIndexVideo checkIndexVideo = new CheckIndexVideo();
checkIndexVideo.setDate(date);
checkIndexVideo.setQuarter(checkScoreDTO.getQuarter());
- if(examineTag!=null) {
+ if (examineTag != null) {
checkIndexVideo.setExamineTag(Short.parseShort(examineTag + ""));
}
List<CheckIndexVideo> checkIndexVideos = indexVideoService.selectCheckIndexVideoList(checkIndexVideo);
- ExcelExp e3 = new ExcelExp("瑙嗛鑰冩牳鎸囨爣鏁版嵁",checkIndexVideos,CheckIndexVideo.class);
+ ExcelExp e3 = new ExcelExp("瑙嗛鑰冩牳鎸囨爣鏁版嵁", checkIndexVideos, CheckIndexVideo.class);
List<ExcelExp> mysheet = new ArrayList<>();
mysheet.add(e1);
mysheet.add(e2);
mysheet.add(e3);
ExcelUtilManySheet<List<ExcelExp>> util = new ExcelUtilManySheet<>(mysheet);
- util.exportExcelManySheet(response,mysheet);
+ util.exportExcelManySheet(response, mysheet);
}
private void roleControl(CheckScore checkScore) {
List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
- SysRole sysRole = roles.get(0);
- if("zg_province".equals(sysRole.getRoleKey())){
- Map<String, Object> params = checkScore.getParams();
- params.put("publish",PublishType.PUBLISHED.getCode());
+ SysUser user = SecurityUtils.getLoginUser().getUser();
+ if (!user.isAdmin()) {
+ for (SysRole role : roles) {
+ if (role.getPermissions().contains("check:score:publish")) {
+ Map<String, Object> params = checkScore.getParams();
+ params.put("publish", PublishType.PUBLISHED.getCode());
+ }
+ }
}
}
diff --git a/ycl-server/src/main/java/com/ycl/task/MonitorTask.java b/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
index f6267aa..4262d99 100644
--- a/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
@@ -8,6 +8,7 @@
import com.ycl.platform.domain.entity.YwPoint;
import com.ycl.platform.domain.result.UY.MonitorQualifyResult;
import com.ycl.platform.domain.result.UY.OneMachineFileResult;
+import com.ycl.platform.domain.result.UY.OsdCheckResult;
import com.ycl.platform.domain.vo.TMonitorVO;
import com.ycl.platform.mapper.TMonitorMapper;
import com.ycl.platform.mapper.YwPointMapper;
@@ -59,8 +60,12 @@
//鍚屾mongodb涓�鏈轰竴妗ｅ埌鏁版嵁搴�
public void synchronize() {
log.info("寮�濮嬪悓姝ongodb涓�鏈轰竴妗ｅ埌鏁版嵁搴�");
- Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
+ Date yesterday = DateUtils.addDays(new Date(), -1);
+ Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(yesterday)).lt(DateUtils.getDayEnd(yesterday)));
List<MonitorQualifyResult> oneMachineFileResults = mongoTemplate.find(query, MonitorQualifyResult.class);
+ //mongo鍝佺墝鏁版嵁
+ Query OSDQuery = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(yesterday)).lt(DateUtils.getDayEnd(yesterday)));
+ Map<String, OsdCheckResult> osdMap = mongoTemplate.find(query, OsdCheckResult.class).stream().collect(Collectors.toMap(OsdCheckResult::getDeviceNo, Function.identity()));
//鏁版嵁搴搈onitor琛ㄦ暟鎹�
Map<String, TMonitorVO> monitorVOMap = monitorMapper.selectMonitorVOList().stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity()));
//鐐逛綅鏁版嵁
@@ -82,7 +87,7 @@
//鍏ㄥ勾鐣欏瓨
for (MonitorQualifyResult result : oneMachineFileResults) {
- TMonitor monitor = getMonitor(result, monitorVOMap);
+ TMonitor monitor = getMonitor(result, monitorVOMap,osdMap);
YwPoint point = getPoint(result, pointMap, importantSite);
monitorList.add(monitor);
ywPointList.add(point);
@@ -97,6 +102,11 @@
if (!numbers.contains(key)){
TMonitor monitor = new TMonitor();
BeanUtils.copyProperties(value,monitor);
+ //濉ˉ鍝佺墝
+ OsdCheckResult osdCheckResult = osdMap.get(key);
+ if(osdCheckResult!=null) {
+ monitor.setDeviceType(osdCheckResult.getDeviceBrand());
+ }
monitorList.add(monitor);
}
});
@@ -156,11 +166,15 @@
return ywPoint;
}
- private TMonitor getMonitor(MonitorQualifyResult result, Map<String, TMonitorVO> monitorVOMap) {
+ private TMonitor getMonitor(MonitorQualifyResult result, Map<String, TMonitorVO> monitorVOMap, Map<String, OsdCheckResult> osdMap) {
TMonitor monitor = new TMonitor();
if (monitorVOMap.containsKey(result.getSerialNumber().getValue())) {
monitor.setId(monitorVOMap.get(result.getSerialNumber().getValue()).getId());
- monitor.setDeviceType(monitorVOMap.get(result.getSerialNumber().getValue()).getDeviceType());
+ //鏇存柊鍝佺墝
+ OsdCheckResult osdCheckResult = osdMap.get(result.getSerialNumber().getValue());
+ if(osdCheckResult!=null) {
+ monitor.setDeviceType(osdCheckResult.getDeviceBrand());
+ }
}
monitor.setSerialNumber(result.getSerialNumber().getValue());
diff --git a/ycl-server/src/main/java/com/ycl/task/OsdTask.java b/ycl-server/src/main/java/com/ycl/task/OsdTask.java
index 222a915..4fe81b8 100644
--- a/ycl-server/src/main/java/com/ycl/task/OsdTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/OsdTask.java
@@ -66,12 +66,6 @@
*/
public void getOSD() {
log.info("寮�濮嬭幏鍙朞SD");
- //鎵归噺淇敼娴峰悍鍝佺墝闆嗗悎
- List<String> hkList = new ArrayList<>();
- //鎵归噺淇敼澶у崕鍝佺墝闆嗗悎
- List<String> dhList = new ArrayList<>();
- //鎵归噺淇敼瀹囪鍝佺墝闆嗗悎
- List<String> ysList = new ArrayList<>();
List<OSDResult> osdResultList = new ArrayList<>();
//鏌ヤ竴鏈轰竴妗onitor
Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
@@ -114,7 +108,7 @@
}
}
//鏈煡鍝佺墝鎴栬�卆pi璋冪敤澶辫触锛屾尐涓墽琛屾墍鏈塧pi
- OSDResult osd = tryAllApi(monitor, hkList, dhList, ysList);
+ OSDResult osd = tryAllApi(monitor);
if (osd != null) {
synchronized (osdResultList) {
osdResultList.add(osd);
@@ -158,16 +152,6 @@
// 宸ュ崟鐢熸垚
uyErrorTypeCheckService.osdCheck(checkResults);
}
- //淇敼鏁版嵁搴撳搧鐗�
- if (!CollectionUtils.isEmpty(hkList)) {
- monitorMapper.batchUpdateDeviceType(hkList, DeviceType.HK.getType());
- }
- if (!CollectionUtils.isEmpty(dhList)) {
- monitorMapper.batchUpdateDeviceType(dhList, DeviceType.DH.getType());
- }
- if (!CollectionUtils.isEmpty(ysList)) {
- monitorMapper.batchUpdateDeviceType(ysList, DeviceType.YS.getType());
- }
}
log.info("缁撴潫鑾峰彇OSD");
}
@@ -184,6 +168,7 @@
osdCheckResult.setOsdPart(osdResult.getOSD3());
osdCheckResult.setOsdLB(osdResult.getOSD4());
osdCheckResult.setOsdName(osdResult.getName());
+ osdCheckResult.setDeviceBrand(osdResult.getDeviceBrand());
return osdCheckResult;
}
@@ -248,15 +233,12 @@
}
}
- private OSDResult tryAllApi(TMonitor monitor, List<String> hkList, List<String> dhList, List<String> ysList) {
+ private OSDResult tryAllApi(TMonitor monitor) {
//灏濊瘯娴峰悍鐨刟pi
OSDResult hkosd = HKApi.getOsdByIP(monitor.getIp(), HKUserName, HKPassword);
if (hkosd != null) {
hkosd.setSerialNumber(monitor.getSerialNumber());
log.info("娴峰悍璋冪敤鎴愬姛" + hkosd);
- synchronized (hkList) {
- hkList.add(monitor.getSerialNumber());
- }
return hkosd;
}
//灏濊瘯澶у崕鐨刟pi
@@ -264,9 +246,6 @@
if (dhosd != null) {
dhosd.setSerialNumber(monitor.getSerialNumber());
log.info("澶у崕璋冪敤鎴愬姛" + dhosd);
- synchronized (dhList) {
- dhList.add(monitor.getSerialNumber());
- }
return dhosd;
}
//瀹囪api
@@ -274,9 +253,6 @@
if (ysosd != null) {
ysosd.setSerialNumber(monitor.getSerialNumber());
log.info("瀹囪璋冪敤鎴愬姛" + ysosd);
- synchronized (ysList) {
- ysList.add(monitor.getSerialNumber());
- }
return ysosd;
}
return null;
--
Gitblit v1.8.0