From 3b8877b6d8c13e37f8c7769282a2751b0faeb499 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 16 五月 2022 18:30:54 +0800
Subject: [PATCH] 日志
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java | 59 ++++++++++-
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java | 23 ++--
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java | 127 ++++++++++---------------
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedScheduleService.java | 35 ++++++
4 files changed, 147 insertions(+), 97 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java
index 42043ca..5b2a18b 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java
@@ -19,6 +19,7 @@
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.service.*;
import com.sandu.ximon.admin.utils.LightemitUtils;
+import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.admin.vo.LedScheduleVO;
import com.sandu.ximon.dao.domain.PoleLightemitEntity;
import com.sandu.ximon.dao.domain.PoleXixunPlayerEntity;
@@ -337,19 +338,6 @@
}
- /**
- * 娴嬭瘯
- *
- * @param
- * @return
- */
- @AnonymousAccess
- @PostMapping("/test/{str}")
- public ResponseVO<Object> setBrightness(@PathVariable String str) {
- return ResponseUtil.success(lightemitUtils.getIsScreenOpen(str));
- }
-
-
/*
璁剧疆浜害
*/
@@ -421,6 +409,15 @@
if (!permissionConfig.check(MenuEnum.XIXUN_PLAN_DELETE.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
+ /**
+ * 鐔欐睕瀹氭椂鍒犻櫎
+ */
+
+ String content = "{鍒犻櫎鐨勭啓姹涘畾鏃秈d锛�" + ids + " }";
+ StoreOperationRecordsUtils.storeOperationData(null, null, "鐔欐睕瀹氭椂鍒犻櫎", content);
+ /**
+ * 鐔欐睕瀹氭椂鍒犻櫎
+ */
return ResponseUtil.success(scheduleService.removeByIds(ids));
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedScheduleService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedScheduleService.java
index fbf1548..f53f39f 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedScheduleService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedScheduleService.java
@@ -14,10 +14,11 @@
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.JsonUtil;
import com.sandu.ximon.admin.utils.LightemitUtils;
+import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.admin.utils.request.Schedules;
+import com.sandu.ximon.admin.utils.request.TaskSchedules;
import com.sandu.ximon.admin.utils.request.requestbody.GetSchedules;
import com.sandu.ximon.admin.utils.request.requestbody.Task;
-import com.sandu.ximon.admin.utils.request.TaskSchedules;
import com.sandu.ximon.admin.vo.LedScheduleVO;
import com.sandu.ximon.dao.domain.LedScheduleEntity;
import com.sandu.ximon.dao.domain.PoleLightemitEntity;
@@ -92,6 +93,15 @@
ledScheduleEntity.setClientId(clientService.getClientId());
}
}
+
+ /**
+ * 鐔欐睕瀹氭椂鏇存敼
+ */
+ String content = "{鐔欐睕瀹氭椂id锛�" + ledScheduleEntity.getId() + ",鐔欐睕瀹氭椂鍚嶇О锛�" + ledScheduleEntity.getName() + "鐔欐睕瀹氭椂鍐呭锛�" + JSON.toJSONString(ledScheduleEntity.getSchedule()) + " }";
+ StoreOperationRecordsUtils.storeOperationData(null, null, "鐔欐睕瀹氭椂鏇存敼", content);
+ /**
+ * 鐔欐睕瀹氭椂鏇存敼
+ */
return this.save(ledScheduleEntity);
}
@@ -120,6 +130,23 @@
lightemitUtils.post(realtimeServerBean.getCommand() + entity.getLightemitControlCode(), ledScheduleEntity.getSchedule());
}
}
+
+ /**
+ * 鐔欐睕瀹氭椂鏂板
+ */
+ String message = "";
+ List<String> listCode = new ArrayList<>();
+
+ for (PoleLightemitEntity entity : poleLightemitEntities) {
+
+ listCode.add(entity.getLightemitControlCode());
+ message += "[灞忓箷Code:" + entity.getLightemitControlCode() + "灞忓箷鍚嶇О:" + entity.getLightemitName() + "],";
+ }
+ String content = "{鐔欐睕瀹氭椂id锛�" + ledScheduleEntity.getId() + ",鐔欐睕瀹氭椂鍚嶇О锛�" + ledScheduleEntity.getName() + "鐔欐睕灞忓箷淇℃伅锛�" + message + " }";
+ StoreOperationRecordsUtils.storeOperationData(listCode, null, "鐔欐睕瀹氭椂鏇存敼", content);
+ /**
+ * 鐔欐睕瀹氭椂鏂板
+ */
}
public boolean updateSchedule(LEDScheduleParam_xixun paramXixun) {
@@ -183,14 +210,14 @@
PoleLightemitEntity poleLightemitEntity = poleLightemitService.getById(id);
String result1 = lightemitUtils.getTimeSchedule(poleLightemitEntity.getLightemitControlCode());
- if(result1.indexOf("not open")!=-1){
+ if (result1.indexOf("not open") != -1) {
LedScheduleVO notOpen = new LedScheduleVO();
notOpen.setLedName(poleLightemitEntity.getLightemitName());
notOpen.setScheduleName("璁惧鏈紑鍚�");
return notOpen;
}
boolean flag = result1.contains("exist");
- if(flag!=true) {
+ if (flag != true) {
String result = lightemitUtils.getTimeSchedule(poleLightemitEntity.getLightemitControlCode());
// if(result !=null){
GetSchedules getSchedules = new GetSchedules();
@@ -218,7 +245,7 @@
ledScheduleVO.setScheduleName("鏃犲畾鏃�");
}
return ledScheduleVO;
- }else {
+ } else {
LedScheduleVO ledScheduleVO = new LedScheduleVO();
ledScheduleVO.setLedName(poleLightemitEntity.getLightemitName());
ledScheduleVO.setScheduleName("璁惧鏈紑鍚�");
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 33091ae..770f415 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
@@ -75,8 +75,7 @@
/**
* 鏂板铏氭嫙鐏潌鏃ュ織璁板綍寮�濮�
*/
- String content = "{鐏潌ID锛�" + pole.getId()
- + "锛� 鐏潌鍚嶏細" + param.getPoleName() + "}";
+ String content = "{鐏潌ID锛�" + pole.getId() + "锛� 鐏潌鍚嶏細" + param.getPoleName() + "}";
StoreOperationRecordsUtils.storeOperationData(null, null, "鏂板铏氭嫙鐏潌", content);
/**
* 鏂板铏氭嫙鐏潌鏃ュ織璁板綍缁撴潫
@@ -164,10 +163,9 @@
if (SecurityUtils.getClientId() == null) {
wrapper = Wrappers.lambdaQuery(Pole.class);
} else {
- wrapper = Wrappers.lambdaQuery(Pole.class).eq(Pole::getClientId, SecurityUtils.getUserId()).or(
- w -> {
- w.eq(Pole::getUserId, SecurityUtils.getUserId());
- });
+ wrapper = Wrappers.lambdaQuery(Pole.class).eq(Pole::getClientId, SecurityUtils.getUserId()).or(w -> {
+ w.eq(Pole::getUserId, SecurityUtils.getUserId());
+ });
}
//鐏潌
List<Pole> list = list(wrapper);
@@ -191,8 +189,7 @@
BroadcastTerminalV2Param broadcastTerminalV2Param = new BroadcastTerminalV2Param();
broadcastTerminalV2Param.setBindingState(2);
broadcastTerminalV2Param.setWorkState(2);
- List<BroadcastTerminalV2EntityBo> broadcastTerminalList
- = SpringContextHolder.getBean(IpVolumeService.class).getBroadcastTerminalList(null, broadcastTerminalV2Param);
+ List<BroadcastTerminalV2EntityBo> broadcastTerminalList = SpringContextHolder.getBean(IpVolumeService.class).getBroadcastTerminalList(null, broadcastTerminalV2Param);
for (BroadcastTerminalV2EntityBo bean : broadcastTerminalList) {
if (bean.getStatus() == 1 || bean.getStatus() == 0) {
number++;
@@ -257,12 +254,10 @@
result.put("AirEquipmentNongGengTotalCount", airEquipmentNongGengBos.size());
//姘磋川
number = 0;
- List<WaterQualityEquipmentBo> waterQualityEquipments
- = SpringContextHolder.getBean(WaterQualityEquipmentService.class).listWaterQualityEquipmentByKeyword(null, null);
+ List<WaterQualityEquipmentBo> waterQualityEquipments = SpringContextHolder.getBean(WaterQualityEquipmentService.class).listWaterQualityEquipmentByKeyword(null, null);
for (WaterQualityEquipmentBo waterQualityEquipmentBo : waterQualityEquipments) {
- WaterQualityDataDto waterQualityDataDto
- = SpringContextHolder.getBean(WaterQualityDataService.class).getWaterQualityDataInfo(waterQualityEquipmentBo.getWaterQualityEquipmentCode());
+ WaterQualityDataDto waterQualityDataDto = SpringContextHolder.getBean(WaterQualityDataService.class).getWaterQualityDataInfo(waterQualityEquipmentBo.getWaterQualityEquipmentCode());
if (waterQualityDataDto != null) {
number++;
}
@@ -271,8 +266,7 @@
result.put("WaterQualityEquipmentTotalCount", waterQualityEquipments.size());
//鐏潌鍊炬枩
number = 0;
- List<LightPoleHeeling> lightPoleHeelings
- = SpringContextHolder.getBean(LightPoleHeelingService.class).listLightPoleHeelingByKeyword(null, null);
+ List<LightPoleHeeling> lightPoleHeelings = SpringContextHolder.getBean(LightPoleHeelingService.class).listLightPoleHeelingByKeyword(null, null);
for (LightPoleHeeling lightPoleHeeling : lightPoleHeelings) {
if (RedisUtils.getBean().get(LightPoleHeelingEnum.LIGHT_POLE_HEELING_STATE.getCode() + lightPoleHeeling.getMac()) != null) {
@@ -480,11 +474,9 @@
wrapper = Wrappers.lambdaQuery(Pole.class).eq(Pole::getClientId, SecurityUtils.getUserId());
}
if (!keyword.isEmpty()) {
- wrapper.like(Pole::getPoleCode, keyword).or(
- wrappers -> {
- wrappers.like(Pole::getPoleName, keyword);
- }
- );
+ wrapper.like(Pole::getPoleCode, keyword).or(wrappers -> {
+ wrappers.like(Pole::getPoleName, keyword);
+ });
}
list = list(wrapper);
List<String> MacCodes = new ArrayList<>();
@@ -548,19 +540,12 @@
if (deviceName.isEmpty()) {
throw new BusinessException("璇ョ伅鏉哅ca涓虹┖");
}
- IRequestFrame build = FrameBuilder.builderA5()
- .orderType(A5OrderEnum.REQUEST_LIGHT_DATA.getCode())
- .innerFrame(new A5LightResetReqInnerFrame())
- .build();
- CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance()
- .sendRRPC(deviceName, build);
+ IRequestFrame build = FrameBuilder.builderA5().orderType(A5OrderEnum.REQUEST_LIGHT_DATA.getCode()).innerFrame(new A5LightResetReqInnerFrame()).build();
+ CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(deviceName, build);
System.out.println(commonFrame.toString());
- CommonFrame rebootFrame = MainBoardInvokeSyncService.getInstance()
- .sendRRPC(deviceName,
- FrameBuilder.builderA2().innerFrame(new EmptyRequestInnerFrame())
- .orderType(A2OrderEnum.REQUEST_MAIN_BOARD_RESET.getCode()).build());
+ CommonFrame rebootFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(deviceName, FrameBuilder.builderA2().innerFrame(new EmptyRequestInnerFrame()).orderType(A2OrderEnum.REQUEST_MAIN_BOARD_RESET.getCode()).build());
boolean b = false;
@@ -569,6 +554,14 @@
b = updateById(byId);
System.out.println("閲嶅惎鎴愬姛");
}
+ /**
+ * 鐏潌鎭㈠鍑哄巶璁剧疆鏃ュ織璁板綍寮�濮�
+ */
+ String content = "{鐏潌ID锛�" + id + " }";
+ StoreOperationRecordsUtils.storeOperationData(null, null, "鐏潌鎭㈠鍑哄巶璁剧疆", content);
+ /**
+ * 鐏潌鎭㈠鍑哄巶璁剧疆鏃ュ織璁板綍缁撴潫
+ */
return b;
}
@@ -586,8 +579,7 @@
boolean setMac = false;
//String baseMac = "baseDevice";
A1Frame a1Frame = new A1Frame(A1OrderEnum.REQUEST_READ_DEVICE_UNIQUE_MAC.getCode(), new EmptyRequestInnerFrame());
- CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance()
- .sendRRPC(baseMac, a1Frame);
+ CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(baseMac, a1Frame);
if (commonFrame == null) {
throw new BusinessException("璇诲彇璁惧鍞竴ID澶辫触");
}
@@ -612,33 +604,21 @@
log.info(deviceDetail.toString());
// 4 閰嶇疆Mac鈶�
- WrapResponseCommonFrame<A1TernaryCodeRespInnerFrame> productKeyResp = MainBoardInvokeSyncService.getInstance()
- .sendRRPC(baseMac,
- FrameBuilder.builderA1().innerFrame(new A1TernaryCodeReqInnerFrame(MainBoardInvokeSyncService.getInstance().getProductKey()))
- .orderType(A1OrderEnum.REQUEST_SET_PRODUCT_KEY.getCode()).build(),
- A1TernaryCodeRespInnerFrame.class);
+ WrapResponseCommonFrame<A1TernaryCodeRespInnerFrame> productKeyResp = MainBoardInvokeSyncService.getInstance().sendRRPC(baseMac, FrameBuilder.builderA1().innerFrame(new A1TernaryCodeReqInnerFrame(MainBoardInvokeSyncService.getInstance().getProductKey())).orderType(A1OrderEnum.REQUEST_SET_PRODUCT_KEY.getCode()).build(), A1TernaryCodeRespInnerFrame.class);
A1TernaryCodeRespInnerFrame responseInnerFrame = productKeyResp.getResponseInnerFrame();
if (!MainBoardInvokeSyncService.getInstance().getProductKey().equals(responseInnerFrame.getTernaryCode())) {
throw new BusinessException("璁惧閰嶇疆ProductKey澶辫触");
}
// 5 閰嶇疆Mac鈶�
- WrapResponseCommonFrame<A1TernaryCodeRespInnerFrame> responseCommonFrame = MainBoardInvokeSyncService.getInstance()
- .sendRRPC(baseMac,
- FrameBuilder.builderA1().innerFrame(new A1TernaryCodeReqInnerFrame(uniqueMac))
- .orderType(A1OrderEnum.REQUEST_SET_DEVICE_NAME.getCode()).build(),
- A1TernaryCodeRespInnerFrame.class);
+ WrapResponseCommonFrame<A1TernaryCodeRespInnerFrame> responseCommonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(baseMac, FrameBuilder.builderA1().innerFrame(new A1TernaryCodeReqInnerFrame(uniqueMac)).orderType(A1OrderEnum.REQUEST_SET_DEVICE_NAME.getCode()).build(), A1TernaryCodeRespInnerFrame.class);
A1TernaryCodeRespInnerFrame deviceNameFrame = responseCommonFrame.getResponseInnerFrame();
if (!uniqueMac.equals(deviceNameFrame.getTernaryCode())) {
throw new BusinessException("璁惧閰嶇疆鍚嶅け璐�");
}
// 6 閰嶇疆Mac鈶�
- WrapResponseCommonFrame<A1TernaryCodeRespInnerFrame> wrapResponseCommonFrame = MainBoardInvokeSyncService.getInstance()
- .sendRRPC(baseMac,
- FrameBuilder.builderA1().innerFrame(new A1TernaryCodeReqInnerFrame(deviceDetail.getDeviceSecret()))
- .orderType(A1OrderEnum.REQUEST_SET_DEVICE_SECRET.getCode()).build(),
- A1TernaryCodeRespInnerFrame.class);
+ WrapResponseCommonFrame<A1TernaryCodeRespInnerFrame> wrapResponseCommonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(baseMac, FrameBuilder.builderA1().innerFrame(new A1TernaryCodeReqInnerFrame(deviceDetail.getDeviceSecret())).orderType(A1OrderEnum.REQUEST_SET_DEVICE_SECRET.getCode()).build(), A1TernaryCodeRespInnerFrame.class);
A1TernaryCodeRespInnerFrame deviceSecretFrame = wrapResponseCommonFrame.getResponseInnerFrame();
if (!deviceDetail.getDeviceSecret().equals(deviceSecretFrame.getTernaryCode())) {
throw new BusinessException("璁惧瀵嗛挜澶辫触");
@@ -646,10 +626,7 @@
// 7 閲嶅惎璁惧 骞朵娇鐢ㄦ柊鐨凪ac
- CommonFrame rebootFrame = MainBoardInvokeSyncService.getInstance()
- .sendRRPC(baseMac,
- FrameBuilder.builderA2().innerFrame(new EmptyRequestInnerFrame())
- .orderType(A2OrderEnum.REQUEST_MAIN_BOARD_RESET.getCode()).build());
+ CommonFrame rebootFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(baseMac, FrameBuilder.builderA2().innerFrame(new EmptyRequestInnerFrame()).orderType(A2OrderEnum.REQUEST_MAIN_BOARD_RESET.getCode()).build());
if ("00".equals(rebootFrame.getPayload())) {
// pole.setDeviceCode(uniqueMac);
@@ -658,7 +635,11 @@
System.out.println("閲嶅惎鎴愬姛");
}
- Pole pole = new Pole();
+
+ Pole pole = getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getDeviceCode, uniqueMac));
+ if (pole == null) {
+ pole = new Pole();
+ }
/* String type = uniqueMac.substring(uniqueMac.length() - 2, uniqueMac.length());
String Code = uniqueMac.substring(0, uniqueMac.length() - 2);*/
pole.setDeviceCode(uniqueMac);
@@ -671,16 +652,20 @@
}
pole.setPoleCode(generatePoleCode());
- Pole one = getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getDeviceCode, uniqueMac));
// setMac = save(pole);
- if (one == null) {
- return save(pole);
- } else {
- pole.setId(one.getId());
- return updateById(pole);
- }
+ boolean result = saveOrUpdate(pole);
+ /**
+ * 瀹炰綋鐏潌娉ㄥ唽鏃ュ織璁板綍寮�濮�
+ */
+ String content = "{鐏潌ID锛�" + pole.getId() + ",鐏潌缂栧彿锛�" + pole.getPoleCode() + ",鐏潌鍚嶇О锛�" + pole.getPoleName() + ",鐏潌绫诲瀷锛�" + pole.getDeviceType() + ",鐏潌MAC锛�" + pole.getDeviceCode() + " }";
+ StoreOperationRecordsUtils.storeOperationData(null, null, "瀹炰綋鐏潌娉ㄥ唽", content);
+ /**
+ * 瀹炰綋鐏潌娉ㄥ唽鏃ュ織璁板綍缁撴潫
+ */
+
+ return result;
}
public List<String> listDeviceCodeByIds(List<Long> poleIdList) {
@@ -688,8 +673,7 @@
return null;
}
List<Pole> list = list(Wrappers.lambdaQuery(Pole.class).in(Pole::getId, poleIdList).select(Pole::getDeviceCode));
- return list
- .stream().filter(Objects::nonNull).map(Pole::getDeviceCode).filter(StrUtil::isNotEmpty).collect(Collectors.toList());
+ return list.stream().filter(Objects::nonNull).map(Pole::getDeviceCode).filter(StrUtil::isNotEmpty).collect(Collectors.toList());
}
/**
@@ -753,12 +737,9 @@
eq = Wrappers.lambdaQuery(Pole.class).eq(Pole::getUserId, cilentId);
} else {
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
- eq = Wrappers.lambdaQuery(Pole.class).eq(Pole::getClientId, cilentId)
- .or(
- pole -> {
- pole.eq(Pole::getUserId, cilentId);
- }
- );
+ eq = Wrappers.lambdaQuery(Pole.class).eq(Pole::getClientId, cilentId).or(pole -> {
+ pole.eq(Pole::getUserId, cilentId);
+ });
}
// }else {
@@ -767,15 +748,11 @@
// }
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
if (!keyword.isEmpty()) {
- eq.like(Pole::getPoleName, keyword).or(
- code -> {
- code.like(Pole::getPoleCode, keyword);
- }
- ).or(
- deviceCode -> {
- deviceCode.like(Pole::getDeviceCode, keyword);
- }
- );
+ eq.like(Pole::getPoleName, keyword).or(code -> {
+ code.like(Pole::getPoleCode, keyword);
+ }).or(deviceCode -> {
+ deviceCode.like(Pole::getDeviceCode, keyword);
+ });
}
List<Pole> list;
list = list(eq);
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java
index c4e6774..5db192b 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java
@@ -15,6 +15,7 @@
import com.sandu.ximon.admin.utils.JsonUtil;
import com.sandu.ximon.admin.utils.LightemitUtils;
import com.sandu.ximon.admin.utils.LogUtils;
+import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.admin.utils.request.SubTitleSet;
import com.sandu.ximon.dao.domain.LedSFile;
import com.sandu.ximon.dao.domain.Pole;
@@ -75,19 +76,27 @@
poleXixunPlayer.setHeight(programPro.getHeight());
poleXixunPlayer.setWidth(programPro.getWidth());
poleXixunPlayer.setTotalSize((float) programPro.getTotalSize() / 1000000 + "MB");
-// poleXixunPlayer.setTotalSize( Long.parseLong(programPro.getTotalSize()) / 1000000 + "MB");
-// programPro.setProgramId(poleXixunPlayer.getProgramId());
-// System.out.println(poleXixunPlayer.getProgramId());
poleXixunPlayer.setRequestBody(json);
poleXixunPlayer.setScreenShot(programPro.getScreenShot());
- // poleXixunPlayer.setCreatTime(sdf.format(date));
if (SecurityUtils.getClientId() != null) {
poleXixunPlayer.setCreateUserId(SecurityUtils.getUserId());
if (clientService.findClientId()) {
poleXixunPlayer.setClientId(clientService.getClientId());
}
}
- return this.save(poleXixunPlayer);
+ boolean save = this.save(poleXixunPlayer);
+ /**
+ * 鐔欐睕鑺傜洰鏂板鏃ュ織璁板綍寮�濮�
+ */
+ String content = "{鑺傜洰id锛�" + poleXixunPlayer.getProgramId()
+ + "锛� 鑺傜洰鍚嶇О锛�" + poleXixunPlayer.getProgramName()
+ + "锛� 鑺傜洰鍐呭锛�" + json
+ + " }";
+ StoreOperationRecordsUtils.storeOperationData(null, null, "鐔欐睕鑺傜洰鏇存敼", content);
+ /**
+ * 鐔欐睕鑺傜洰鏂板鏃ュ織璁板綍缁撴潫
+ */
+ return save;
}
public boolean deleteProgram(Long pid) {
@@ -95,6 +104,16 @@
if (byId == null) {
throw new BusinessException("鏈壘鍒拌鑺傜洰");
}
+ /**
+ * 鐔欐睕鑺傜洰鍒犻櫎鏃ュ織璁板綍寮�濮�
+ */
+ String content = "{鍒犻櫎鐨勮妭鐩甶d锛�" + byId.getProgramId()
+ + "锛� 鍒犻櫎鐨勮妭鐩悕绉帮細" + byId.getProgramName()
+ + " }";
+ StoreOperationRecordsUtils.storeOperationData(null, null, "鐔欐睕鑺傜洰鍒犻櫎", content);
+ /**
+ * 鐔欐睕鑺傜洰鍒犻櫎鏃ュ織璁板綍缁撴潫
+ */
return removeById(pid);
}
@@ -219,6 +238,23 @@
LogUtils.error("缁撴灉:" + post);
}
}
+
+
+ /**
+ * 鐔欐睕鑺傜洰鎺ㄩ�佹棩蹇楄褰曞紑濮�
+ */
+ List<String> listCode = new ArrayList<>();
+ for (PoleLightemitEntity bean : poleLightemitEntities) {
+ listCode.add(bean.getLightemitControlCode());
+ }
+ String content = "{鑺傜洰id锛�" + programId
+ + "锛� 鑺傜洰鍚嶇О锛�" + poleXixunPlayerEntity.getProgramName()
+ + "锛� 鑺傜洰鍐呭锛�" + json
+ + " }";
+ StoreOperationRecordsUtils.storeOperationData(listCode, null, "鐔欐睕鑺傜洰鎺ㄩ��", content);
+ /**
+ * 鐔欐睕鑺傜洰鎺ㄩ�佹棩蹇楄褰曠粨鏉�
+ */
}
@@ -275,6 +311,19 @@
lightemitUtils.clearPlayerTask(lightemitControlCode);
//鎺ㄩ�佹渶鍚庡懡浠�
lightemitUtils.sendLastCommand(lightemitControlCode);
+
+ /**
+ * 鐔欐睕澶ф皵鏁版嵁鎺ㄩ�佹棩蹇楄褰曞紑濮�
+ */
+ String content = "{璁惧code锛�" + lightemitControlCode
+ + "锛� 鎺ㄩ�佸唴瀹癸細" + body
+ + " }";
+ List<String> listCode = new ArrayList<>();
+ listCode.add(lightemitControlCode);
+ StoreOperationRecordsUtils.storeOperationData(listCode, null, "鐔欐睕澶ф皵鏁版嵁鎺ㄩ��", content);
+ /**
+ * 鐔欐睕澶ф皵鏁版嵁鎺ㄩ�佹棩蹇楄褰曠粨鏉�
+ */
}
}, 60 * 1000);
}
--
Gitblit v1.9.3