From 7f74c2a4101e25e7889c046e8d3bcc1c30f360d3 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 18 五月 2022 11:51:51 +0800
Subject: [PATCH] 日志
---
/dev/null | 49 --------
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java | 26 ++++
ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityEquipmentService.java | 33 +++++
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java | 34 +++++
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentNongGengService.java | 30 ++++
ximon-admin/src/main/java/com/sandu/ximon/admin/service/InterphoneSubService.java | 46 +++++++
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java | 2
ximon-admin/src/main/java/com/sandu/ximon/admin/service/InterphoneHostService.java | 45 +++++++
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedPlayerEntityService.java | 34 +++-
ximon-admin/src/main/java/com/sandu/ximon/admin/service/VnnoxService.java | 47 +++----
10 files changed, 249 insertions(+), 97 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/ForHelp.java b/dao/src/main/java/com/sandu/ximon/dao/domain/ForHelp.java
deleted file mode 100644
index 0af8f79..0000000
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/ForHelp.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.sandu.ximon.dao.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-@Data
-public class ForHelp implements Serializable {
- @TableId(type = IdType.AUTO)
- private Long id;
- //鎵�灞炰汉
- private Long userId;
- //鐏潌ID
- private Long lightPoleId;
- //鐏潌鍚嶇О
- private String lightPoleName;
- //鐘舵��
- private int state;
- //鎺ュ叆鏃堕棿
- private LocalDateTime createTime;
-}
diff --git a/dao/src/main/java/com/sandu/ximon/dao/mapper/ForHelpMapper.java b/dao/src/main/java/com/sandu/ximon/dao/mapper/ForHelpMapper.java
deleted file mode 100644
index 7cd6a78..0000000
--- a/dao/src/main/java/com/sandu/ximon/dao/mapper/ForHelpMapper.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.sandu.ximon.dao.mapper;
-
-import com.sandu.common.domain.BaseMapper;
-import com.sandu.ximon.dao.domain.ForHelp;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface ForHelpMapper extends BaseMapper<ForHelp> {
-}
diff --git a/dao/src/main/resources/mapper/ForHelpMapper.xml b/dao/src/main/resources/mapper/ForHelpMapper.xml
deleted file mode 100644
index cce978a..0000000
--- a/dao/src/main/resources/mapper/ForHelpMapper.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.sandu.ximon.dao.mapper.ForHelpMapper">
-
- <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.ForHelp">
- <id property="id" column="id" jdbcType="BIGINT"/>
- <result property="userId" column="user_id" jdbcType="BIGINT"/>
- <result property="lightPoleId" column="light_pole_id" jdbcType="BIGINT"/>
- <result property="lightPoleName" column="light_pole_name" jdbcType="VARCHAR"/>
- <result property="state" column="state" jdbcType="INTEGER"/>
- <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
- </resultMap>
-
-</mapper>
\ No newline at end of file
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ForHelpController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ForHelpController.java
deleted file mode 100644
index c10db0d..0000000
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ForHelpController.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.sandu.ximon.admin.controller;
-
-import com.sandu.common.domain.ResponseVO;
-import com.sandu.common.util.ResponseUtil;
-import com.sandu.ximon.admin.service.ForHelpService;
-import com.sandu.ximon.dao.domain.ForHelp;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 涓�閿眰鍔�
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/v1/admin/forhelp")
-public class ForHelpController {
- private final ForHelpService forHelpService;
-
- @GetMapping
- public ResponseVO<Object> listForHelp() {
- List<ForHelp> list = forHelpService.listForHelp();
- return ResponseUtil.successPage(list);
- }
-
- /**
- * 妯＄硦鏌ヨ
- *
- * @return
- */
- @GetMapping("/listForHelpByKeyword/{keyword}")
- public ResponseVO<Object> listForHelpByKeyword(@PathVariable String keyword) {
- List<ForHelp> list = forHelpService.listForHelpByKeyword(keyword);
- return ResponseUtil.successPage(list);
- }
-
-}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentNongGengService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentNongGengService.java
index 6c6d1d2..c32ed50 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentNongGengService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentNongGengService.java
@@ -8,15 +8,14 @@
import com.sandu.ximon.admin.manager.iot.rrpc.enums.AtmoFunctionCode;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.RedisUtils;
-import com.sandu.ximon.dao.bo.AirEquipmentBo;
+import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.dao.bo.AirEquipmentNongGengBo;
-import com.sandu.ximon.dao.domain.AirEquipment;
import com.sandu.ximon.dao.domain.AirEquipmentNongGeng;
-import com.sandu.ximon.dao.mapper.AirEquipmentMapper;
import com.sandu.ximon.dao.mapper.AirEquipmentNongGengMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -38,6 +37,18 @@
AirEquipmentNongGeng one = getOne(Wrappers.lambdaQuery(AirEquipmentNongGeng.class).eq(AirEquipmentNongGeng::getMac, airEquipmentNongGeng.getMac()));
if (one == null) {
save(airEquipmentNongGeng);
+ /**
+ * 娣诲姞鍐滆�曞ぇ姘旇澶� 鏃ュ織璁板綍寮�濮�
+ */
+ List<String> listCode = new ArrayList<>(1);
+ listCode.add(airEquipmentNongGeng.getMac());
+ String content = "{ 璁惧id:" + airEquipmentNongGeng.getId() + "璁惧code锛�" + airEquipmentNongGeng.getMac() +
+ "}";
+
+ StoreOperationRecordsUtils.storeOperationData(listCode, null, "娣诲姞鍐滆�曞ぇ姘旇澶�", content);
+ /**
+ * 娣诲姞鍐滆�曞ぇ姘旇澶� 鏃ュ織璁板綍缁撴潫
+ */
}
}
@@ -69,6 +80,19 @@
if (airEquipmentNongGeng == null) {
throw new BusinessException("鎵句笉鍒板ぇ姘旇澶囨暟鎹�");
}
+
+ /**
+ * 鍒犻櫎鍐滆�曞ぇ姘旇澶� 鏃ュ織璁板綍寮�濮�
+ */
+ List<String> listCode = new ArrayList<>(1);
+ listCode.add(airEquipmentNongGeng.getMac());
+ String content = "{ 璁惧id:" + airEquipmentNongGeng.getId() + "璁惧code锛�" + airEquipmentNongGeng.getMac() +
+ "}";
+
+ StoreOperationRecordsUtils.storeOperationData(listCode, null, "鍒犻櫎鍐滆�曞ぇ姘旇澶�", content);
+ /**
+ * 鍒犻櫎鍐滆�曞ぇ姘旇澶� 鏃ュ織璁板綍缁撴潫
+ */
return removeById(Id);
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java
index 6fa5998..d16fd07 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java
@@ -5,10 +5,10 @@
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
-import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5AtmosphereReportEnum;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.AtmoFunctionCode;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.RedisUtils;
+import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.admin.vo.EquipmentInfomation;
import com.sandu.ximon.dao.bo.AirEquipmentBo;
import com.sandu.ximon.dao.domain.AirEquipment;
@@ -16,6 +16,7 @@
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.List;
@Service
@@ -54,6 +55,18 @@
// , 1, 300L);
if (one == null) {
save(airEquipment);
+ /**
+ * 娣诲姞澶ф皵璁惧 鏃ュ織璁板綍寮�濮�
+ */
+ List<String> listCode = new ArrayList<>(1);
+ listCode.add(airEquipment.getMac());
+ String content = "{ 璁惧id:" + airEquipment.getId() + "璁惧code锛�" + airEquipment.getMac() +
+ "}";
+
+ StoreOperationRecordsUtils.storeOperationData(listCode, null, "娣诲姞澶ф皵璁惧", content);
+ /**
+ * 娣诲姞澶ф皵璁惧 鏃ュ織璁板綍缁撴潫
+ */
}
}
@@ -68,6 +81,17 @@
if (airEquipment == null) {
throw new BusinessException("鎵句笉鍒板ぇ姘旇澶囨暟鎹�");
}
+ /**
+ * 鍒犻櫎澶ф皵璁惧 鏃ュ織璁板綍寮�濮�
+ */
+ List<String> listCode=new ArrayList<>(1);
+ listCode.add(airEquipment.getMac());
+ String content = "{璁惧code锛�" + airEquipment.getMac() + "}";
+
+ StoreOperationRecordsUtils.storeOperationData(listCode, null, "鍒犻櫎澶ф皵璁惧", content);
+ /**
+ * 鍒犻櫎澶ф皵璁惧 鏃ュ織璁板綍缁撴潫
+ */
return removeById(Id);
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java
index ebe5e15..4e1d2bd 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java
@@ -33,6 +33,7 @@
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Set;
@@ -862,7 +863,23 @@
c3mCharging.setC3Name(c3ChargingAddParam.getC3Name());
}
c3mCharging.setC3Mac(c3ChargingAddParam.getC3Mac());
- return save(c3mCharging);
+ /**
+ * 娣诲姞鍏呯數妗� 鏃ュ織璁板綍寮�濮�
+ */
+ List<String> listCode = new ArrayList<>(1);
+ listCode.add(c3mCharging.getMcuUdid());
+ String content = "{璁惧code锛�" + c3mCharging.getMcuUdid() + "璁惧鍚�:" + c3mCharging.getC3Name() +
+ "}";
+
+ StoreOperationRecordsUtils.storeOperationData(listCode, null, "娣诲姞鍏呯數妗�", content);
+ /**
+ * 娣诲姞鍏呯數妗� 鏃ュ織璁板綍缁撴潫
+ */
+
+ return
+
+ save(c3mCharging);
+
}
public boolean updateC3ChargingName(C3ChargingAddParam c3ChargingAddParam) {
@@ -877,6 +894,21 @@
C3mCharging c3mCharging = new C3mCharging();
c3mCharging.setC3Id(c3ChargingAddParam.getC3Id());
c3mCharging.setC3Name(c3ChargingAddParam.getC3Name());
+
+ /**
+ * 淇敼鍏呯數妗� 鏃ュ織璁板綍寮�濮�
+ */
+ List<String> listCode = new ArrayList<>(1);
+ listCode.add(c3mCharging.getMcuUdid());
+ String content = "{璁惧code锛�" + c3mCharging.getMcuUdid() + "璁惧鍘熷悕:" + one.getC3Name() + "鏇存敼鍚庣殑璁惧鍚�:" + c3mCharging.getC3Name() +
+ "}";
+
+ StoreOperationRecordsUtils.storeOperationData(listCode, null, "缂栬緫鍏呯數妗�", content);
+ /**
+ * 淇敼鍏呯數妗� 鏃ュ織璁板綍缁撴潫
+ */
+
+
return updateById(c3mCharging);
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/ForHelpService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/ForHelpService.java
deleted file mode 100644
index 10d9b3f..0000000
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/ForHelpService.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.sandu.ximon.admin.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.sandu.common.execption.BusinessException;
-import com.sandu.common.service.impl.BaseServiceImpl;
-import com.sandu.ximon.dao.domain.ForHelp;
-import com.sandu.ximon.dao.domain.WaterQualityEquipment;
-import com.sandu.ximon.dao.mapper.ForHelpMapper;
-import com.sandu.ximon.dao.mapper.WaterQualityEquipmentMapper;
-import lombok.AllArgsConstructor;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-@AllArgsConstructor
-public class ForHelpService extends BaseServiceImpl<ForHelpMapper, ForHelp> {
-
- /**
- * 鏌ヨ鍏ㄩ儴姘磋川璁惧
- */
- public List<ForHelp> listForHelp() {
- LambdaQueryWrapper<ForHelp> wrapper = Wrappers.lambdaQuery(ForHelp.class);
- List<ForHelp> list = list(wrapper);
-
- return list;
- }
-
- /**
- * 妯＄硦鏌ヨ
- */
- public List<ForHelp> listForHelpByKeyword(String keyword) {
-
- LambdaQueryWrapper<ForHelp> wrapper = Wrappers.lambdaQuery(ForHelp.class);
- if (keyword != null) {
- wrapper.like(ForHelp::getLightPoleName, keyword).or(
- lambdaQueryWrapper -> {
- lambdaQueryWrapper.like(ForHelp::getLightPoleId, keyword);
- }
-
-
- );
- }
- List<ForHelp> forHelpList = list(wrapper);
- return forHelpList;
- }
-
-}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/InterphoneHostService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/InterphoneHostService.java
index a80a484..c564bcc 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/InterphoneHostService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/InterphoneHostService.java
@@ -8,6 +8,7 @@
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.param.InterphoneHostParam;
import com.sandu.ximon.admin.security.SecurityUtils;
+import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.dao.bo.InterphoneHostBo;
import com.sandu.ximon.dao.domain.InterphoneHost;
import com.sandu.ximon.dao.domain.InterphoneHostSubPole;
@@ -17,6 +18,7 @@
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.List;
@Service
@@ -34,7 +36,21 @@
public boolean addHost(InterphoneHostParam interphoneHostParam) {
InterphoneHost interphoneHost = new InterphoneHost();
BeanUtils.copyProperties(interphoneHostParam, interphoneHost);
- return save(interphoneHost);
+ boolean save = save(interphoneHost);
+ /**
+ * 娣诲姞涓�閿眰鍔╀富鏈� 鏃ュ織璁板綍寮�濮�
+ */
+ List<String> listCode = new ArrayList<>(1);
+ listCode.add(interphoneHost.getHostMac());
+ String content = "{ 璁惧id:" + interphoneHost.getHostId() + "璁惧code锛�" + interphoneHost.getHostMac() +
+ "}";
+
+ StoreOperationRecordsUtils.storeOperationData(listCode, null, "娣诲姞涓�閿眰鍔╀富鏈�", content);
+ /**
+ * 娣诲姞涓�閿眰鍔╀富鏈� 鏃ュ織璁板綍缁撴潫
+ */
+
+ return save;
}
/**
@@ -53,6 +69,19 @@
InterphoneHost interphoneHost = new InterphoneHost();
interphoneHost.setHostId(id);
BeanUtils.copyProperties(interphoneHostParam, interphoneHost);
+
+ /**
+ * 缂栬緫涓�閿眰鍔╀富鏈� 鏃ュ織璁板綍寮�濮�
+ */
+ List<String> listCode = new ArrayList<>(1);
+ listCode.add(interphoneHost.getHostMac());
+ String content = "{ 璁惧id:" + interphoneHost.getHostId() + "璁惧code锛�" + interphoneHost.getHostMac() +
+ "}";
+
+ StoreOperationRecordsUtils.storeOperationData(listCode, null, "缂栬緫涓�閿眰鍔╀富鏈�", content);
+ /**
+ * 缂栬緫涓�閿眰鍔╀富鏈� 鏃ュ織璁板綍缁撴潫
+ */
return updateById(interphoneHost);
}
@@ -72,6 +101,20 @@
if (byId == null) {
return false;
}
+
+ /**
+ * 鍒犻櫎涓�閿眰鍔╀富鏈� 鏃ュ織璁板綍寮�濮�
+ */
+ List<String> listCode = new ArrayList<>(1);
+ listCode.add(byId.getHostMac());
+ String content = "{ 璁惧id:" + byId.getHostId() + "璁惧code锛�" + byId.getHostMac() +
+ "}";
+
+ StoreOperationRecordsUtils.storeOperationData(listCode, null, "鍒犻櫎涓�閿眰鍔╀富鏈�", content);
+ /**
+ * 鍒犻櫎涓�閿眰鍔╀富鏈� 鏃ュ織璁板綍缁撴潫
+ */
+
return removeById(id);
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/InterphoneSubService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/InterphoneSubService.java
index ffdc840..1bf629f 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/InterphoneSubService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/InterphoneSubService.java
@@ -8,6 +8,7 @@
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.param.InterphoneSubParam;
import com.sandu.ximon.admin.security.SecurityUtils;
+import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.dao.bo.InterphoneSubBo;
import com.sandu.ximon.dao.domain.InterphoneHostSubPole;
import com.sandu.ximon.dao.domain.InterphoneSub;
@@ -17,6 +18,7 @@
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.List;
@Service
@@ -32,7 +34,20 @@
public boolean addSub(InterphoneSubParam interphoneSubParam) {
InterphoneSub interphoneSub = new InterphoneSub();
BeanUtils.copyProperties(interphoneSubParam, interphoneSub);
- return save(interphoneSub);
+ boolean save = save(interphoneSub);
+ /**
+ * 娣诲姞涓�閿眰鍔╁瓙璁惧 鏃ュ織璁板綍寮�濮�
+ */
+ List<String> listCode = new ArrayList<>(1);
+ listCode.add(interphoneSub.getSubMac());
+ String content = "{ 璁惧id:" + interphoneSub.getSubId() + "璁惧code锛�" + interphoneSub.getSubMac() +
+ "}";
+
+ StoreOperationRecordsUtils.storeOperationData(listCode, null, "娣诲姞涓�閿眰鍔╁瓙璁惧", content);
+ /**
+ * 娣诲姞涓�閿眰鍔╁瓙璁惧 鏃ュ織璁板綍缁撴潫
+ */
+ return save;
}
/**
@@ -50,6 +65,20 @@
InterphoneSub interphoneSub = new InterphoneSub();
BeanUtils.copyProperties(interphoneSubParam, interphoneSub);
interphoneSub.setSubId(id);
+
+ /**
+ * 缂栬緫涓�閿眰鍔╁瓙璁惧 鏃ュ織璁板綍寮�濮�
+ */
+ List<String> listCode = new ArrayList<>(1);
+ listCode.add(interphoneSub.getSubMac());
+ String content = "{ 璁惧id:" + interphoneSub.getSubId() + "璁惧code锛�" + interphoneSub.getSubMac() +
+ "}";
+
+ StoreOperationRecordsUtils.storeOperationData(listCode, null, "缂栬緫涓�閿眰鍔╁瓙璁惧", content);
+ /**
+ * 缂栬緫涓�閿眰鍔╁瓙璁惧 鏃ュ織璁板綍缁撴潫
+ */
+
return updateById(interphoneSub);
}
@@ -65,6 +94,21 @@
if (byId == null) {
return false;
}
+
+
+ /**
+ * 鍒犻櫎涓�閿眰鍔╁瓙璁惧 鏃ュ織璁板綍寮�濮�
+ */
+ List<String> listCode = new ArrayList<>(1);
+ listCode.add(byId.getSubMac());
+ String content = "{ 璁惧id:" + byId.getSubId() + "璁惧code锛�" + byId.getSubMac() +
+ "}";
+
+ StoreOperationRecordsUtils.storeOperationData(listCode, null, "鍒犻櫎涓�閿眰鍔╁瓙璁惧", content);
+ /**
+ * 鍒犻櫎涓�閿眰鍔╁瓙璁惧 鏃ュ織璁板綍缁撴潫
+ */
+
return removeById(id);
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedPlayerEntityService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedPlayerEntityService.java
index 2799d46..e99a694 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedPlayerEntityService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedPlayerEntityService.java
@@ -7,6 +7,7 @@
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.security.SecurityUtils;
+import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.admin.utils.VnnoxAPIUtil;
import com.sandu.ximon.admin.vo.EquipmentInfomation;
import com.sandu.ximon.dao.domain.LedPlayerEntity;
@@ -38,8 +39,29 @@
return getOne(Wrappers.lambdaQuery(LedPlayerEntity.class).eq(LedPlayerEntity::getPlayerId, playerId));
}
+ /**
+ * 璇虹摝璁惧鏂板
+ *
+ * @param ledPlayerEntity
+ * @return
+ */
public boolean saveLed(LedPlayerEntity ledPlayerEntity) {
- return ledPlayerEntityMapper.saveLed(ledPlayerEntity);
+ boolean b = ledPlayerEntityMapper.saveLed(ledPlayerEntity);
+ /**
+ * 璇虹摝璁惧鏂板 鏃ュ織璁板綍寮�濮�
+ */
+ List<String> listCode = new ArrayList<>(1);
+ listCode.add(ledPlayerEntity.getSn());
+ String content = "{ 璁惧id:" + ledPlayerEntity.getId() + "璁惧code锛�" + ledPlayerEntity.getSn()
+ + "璇虹摝playId:" + ledPlayerEntity.getPlayerId()
+ + "璇虹摝璁惧鍚嶇О:" + ledPlayerEntity.getName() +
+ "}";
+
+ StoreOperationRecordsUtils.storeOperationData(listCode, null, "璇虹摝璁惧鏂板", content);
+ /**
+ * 璇虹摝璁惧鏂板 鏃ュ織璁板綍缁撴潫
+ */
+ return b;
}
@@ -109,14 +131,4 @@
return SpringContextHolder.getBean(VnnoxService.class).setCacheInfo(vnnoxAPIUtil.syncCurrentInfo(list));
}
-// public List<LedPlayerEntity> ledPlayerEntityList() {
-// List<LedPlayerEntity> list;
-// //瓒呯
-// if (SecurityUtils.getClientId() == null) {
-// list = ledPlayerEntityMapper.ledPlayerEntityList(null, null);
-// } else {
-// list = ledPlayerEntityMapper.ledPlayerEntityList(null, SecurityUtils.getUserId());
-// }
-// return SpringContextHolder.getBean(VnnoxService.class).setCacheInfo(vnnoxAPIUtil.syncCurrentInfo(list));
-// }
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java
index e63de99..4a5b213 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java
@@ -231,7 +231,7 @@
*/
List<String> listCode = new ArrayList<>();
listCode.add(poleLightemit.getLightemitControlCode());
- String content = "{灞忓箷id锛�" + poleLightemit.getLightemitId() + "锛� 灞忓箷鍚嶇О锛�" + poleLightemit.getLightemitName() + "锛� 灞忓箷缂栫爜锛�" + poleLightemit.getLightemitControlCode() + " }";
+ String content = "{灞忓箷id锛�" + poleLightemit.getLightemitId() + "锛� 灞忓箷鍘熷悕锛�" + byId.getLightemitName() + "锛� 灞忓箷鍚嶇О锛�" + poleLightemit.getLightemitName() + "锛� 灞忓箷缂栫爜锛�" + poleLightemit.getLightemitControlCode() + " }";
StoreOperationRecordsUtils.storeOperationData(listCode, null, "鐔欐睕LED缂栬緫", content);
/**
* 鐔欐睕led缂栬緫鏃ュ織璁板綍缁撴潫
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/VnnoxService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/VnnoxService.java
index 0901db2..c798cd6 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/VnnoxService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/VnnoxService.java
@@ -9,6 +9,7 @@
import com.sandu.ximon.admin.dto.nova.PlayerWidget;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5AtmosphereHeartbeatReportInnerFrame;
import com.sandu.ximon.admin.utils.RedisUtils;
+import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.admin.utils.VnnoxAPIUtil;
import com.sandu.ximon.admin.utils.VnnoxProgramAPIUtil;
import com.sandu.ximon.admin.utils.request.VnnoxScreenStatusType;
@@ -36,13 +37,13 @@
@AllArgsConstructor
public class VnnoxService {
- // @Autowired
+
private VnnoxAPIUtil vnnoxAPIUtil;
- // @Autowired
+
private RedisUtils redisUtils;
- // @Autowired
+
private LedPlayerEntityService ledPlayerEntityService;
- // @Autowired
+
private VnnoxProgramAPIUtil vnnoxProgramAPIUtil;
/**
@@ -113,10 +114,7 @@
type = VnnoxScreenStatusType.OPEN;
}
- VnnoxResult vnnoxResult = vnnoxAPIUtil.screenStatus(
- playerList.stream().map(item -> item.getPlayerId()).collect(Collectors.toList()),
- type
- );
+ VnnoxResult vnnoxResult = vnnoxAPIUtil.screenStatus(playerList.stream().map(item -> item.getPlayerId()).collect(Collectors.toList()), type);
// 鏍规嵁灞忓箷鐘舵�佽皟鏁碦EDIS鏍囪瘑浣�
for (String playerId : vnnoxResult.getSuccess()) {
redisUtils.set(VnnoxConstant.REDIS_SCREEN_STATUS + playerId, screenStatus, VnnoxConstant.REDIS_MAX_SAVE_TIME);
@@ -125,10 +123,7 @@
}
public VnnoxResult volChange(List<LedPlayerEntity> playerList, Integer vol) {
- VnnoxResult vnnoxResult = vnnoxAPIUtil.volChange(
- playerList.stream().map(item -> item.getPlayerId()).collect(Collectors.toList()),
- vol
- );
+ VnnoxResult vnnoxResult = vnnoxAPIUtil.volChange(playerList.stream().map(item -> item.getPlayerId()).collect(Collectors.toList()), vol);
// 鏍规嵁闊抽噺璋冩暣REDIS鏍囪瘑浣�
for (String playerId : vnnoxResult.getSuccess()) {
redisUtils.set(VnnoxConstant.REDIS_VOL + playerId, vol, VnnoxConstant.REDIS_MAX_SAVE_TIME);
@@ -137,10 +132,7 @@
}
public VnnoxResult brightnessChange(List<LedPlayerEntity> playerList, Integer brightness) {
- VnnoxResult vnnoxResult = vnnoxAPIUtil.brightnessChange(
- playerList.stream().map(item -> item.getPlayerId()).collect(Collectors.toList()),
- brightness
- );
+ VnnoxResult vnnoxResult = vnnoxAPIUtil.brightnessChange(playerList.stream().map(item -> item.getPlayerId()).collect(Collectors.toList()), brightness);
// 鏍规嵁浜害璋冩暣REDIS鏍囪瘑浣�
for (String playerId : vnnoxResult.getSuccess()) {
redisUtils.set(VnnoxConstant.REDIS_BRIGHTNESS + playerId, brightness, VnnoxConstant.REDIS_MAX_SAVE_TIME);
@@ -238,6 +230,17 @@
LedPlayerEntity led = new LedPlayerEntity();
led.setId(id);
led.setName(name);
+ /**
+ * 璇虹摝璁惧缂栬緫 鏃ュ織璁板綍寮�濮�
+ */
+ List<String> listCode = new ArrayList<>(1);
+ listCode.add(led.getSn());
+ String content = "{ 璁惧id:" + led.getId() + "璁惧code锛�" + led.getSn() + "璇虹摝playId:" + led.getPlayerId() + "璇虹摝璁惧鍘熷悕:" + byId.getName() + "璇虹摝璁惧鏇存敼鍚庣殑鍚嶇О:" + led.getName() + "}";
+
+ StoreOperationRecordsUtils.storeOperationData(listCode, null, "璇虹摝璁惧缂栬緫", content);
+ /**
+ * 璇虹摝璁惧缂栬緫 鏃ュ織璁板綍缁撴潫
+ */
return ledPlayerEntityService.updateById(led);
}
@@ -305,7 +308,7 @@
/**
* 璇虹摝鎺ㄩ�佸ぇ姘旀暟鎹� 鏃ュ織璁板綍寮�濮�
-//// */
+ //// */
// String content = "{璇虹摝playerId锛�" + playerId + ",鑺傜洰鍐呭锛�" + JSON.toJSONString(playerProgram) + " }";
// StoreOperationRecordsUtils.storeOperationData(null, null, "澶ф皵鏁版嵁鎺ㄩ�佸埌璇虹摝", content);
/**
@@ -336,15 +339,7 @@
list.add("CO2锛�" + poleSensorEntity.getCo2() + "ppm");
}
- widgetList.add(new PlayerWidget().generateScrollUpTextWidget(
- "weather",
- 1,
- 100000L,
- list,
- "#FFFFFF",
- 15,
- new PlayerLayout("0%", "5%", "100%", "100%")
- ));
+ widgetList.add(new PlayerWidget().generateScrollUpTextWidget("weather", 1, 100000L, list, "#FFFFFF", 15, new PlayerLayout("0%", "5%", "100%", "100%")));
return widgetList;
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityEquipmentService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityEquipmentService.java
index fcb937d..31bb0d9 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityEquipmentService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityEquipmentService.java
@@ -9,6 +9,7 @@
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.dto.WaterQualityDataDto;
import com.sandu.ximon.admin.security.SecurityUtils;
+import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.admin.vo.EquipmentInfomation;
import com.sandu.ximon.dao.bo.WaterQualityEquipmentBo;
import com.sandu.ximon.dao.domain.WaterQualityEquipment;
@@ -16,6 +17,7 @@
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.List;
@Service
@@ -65,6 +67,18 @@
//鍒犻櫎鎽勬按璐ㄨ澶囧墠闇�瑕佸厛瑙ｇ粦
poleBindingService.unBindPole(null, waterQualityEquipment.getWaterQualityEquipmentCode());
+ /**
+ * 鍒犻櫎姘磋川璁惧 鏃ュ織璁板綍寮�濮�
+ */
+ List<String> listCode = new ArrayList<>(1);
+ listCode.add(waterQualityEquipment.getWaterQualityEquipmentCode());
+ String content = "{ 璁惧id:" + waterQualityEquipment.getId() + "璁惧code锛�" + waterQualityEquipment.getWaterQualityEquipmentCode() +
+ "}";
+
+ StoreOperationRecordsUtils.storeOperationData(listCode, null, "鍒犻櫎姘磋川璁惧", content);
+ /**
+ * 鍒犻櫎姘磋川璁惧 鏃ュ織璁板綍缁撴潫
+ */
return removeById(Id);
}
@@ -84,7 +98,20 @@
if (one == null) {
WaterQualityEquipment result = new WaterQualityEquipment();
result.setWaterQualityEquipmentCode(waterQualityEquipment.getWaterQualityEquipmentCode());
- return save(result);
+ boolean save = save(result);
+ /**
+ * 娣诲姞姘磋川璁惧 鏃ュ織璁板綍寮�濮�
+ */
+ List<String> listCode = new ArrayList<>(1);
+ listCode.add(waterQualityEquipment.getWaterQualityEquipmentCode());
+ String content = "{ 璁惧id:" + waterQualityEquipment.getId() + "璁惧code锛�" + waterQualityEquipment.getWaterQualityEquipmentCode() +
+ "}";
+
+ StoreOperationRecordsUtils.storeOperationData(listCode, null, "娣诲姞姘磋川璁惧", content);
+ /**
+ * 娣诲姞姘磋川璁惧 鏃ュ織璁板綍缁撴潫
+ */
+ return save;
} else {
throw new BusinessException("璇ユ按璐ㄨ澶囧凡瀛樺湪锛�");
}
@@ -109,8 +136,8 @@
try {
String s = HttpUtil.get(WATER_QUALITY_DATA_URL + waterQualityEquipmentCode + ".json");
- System.out.println(waterQualityEquipmentCode+"-------------------------------"+s);
- if(!s.startsWith("{")){
+ System.out.println(waterQualityEquipmentCode + "-------------------------------" + s);
+ if (!s.startsWith("{")) {
equipmentInfo.setEquipmentState("鏈煡");
return equipmentInfo;
}
--
Gitblit v1.9.3