From da6ea6d775461e6d56eb50cbdd79e6ba3b8f41e4 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期二, 01 三月 2022 14:22:30 +0800
Subject: [PATCH] 灯杆绑定设备,解绑设备

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

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 53df1ad..51b248f 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
@@ -1,5 +1,6 @@
 package com.sandu.ximon.admin.service;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -20,6 +21,9 @@
 
 import java.util.*;
 
+/**
+ * 鐔欒鑺傜洰
+ */
 @Service
 @AllArgsConstructor
 public class XiXunPlayerService extends BaseServiceImpl<PoleXixunPlayerEntityMapper, PoleXixunPlayerEntity> {
@@ -47,6 +51,8 @@
         poleXixunPlayer.setHeight(programPro.getHeight());
         poleXixunPlayer.setWidth(programPro.getWidth());
         poleXixunPlayer.setTotalSize((float) programPro.getTotalSize() / 1000000 + "MB");
+//        programPro.setProgramId(poleXixunPlayer.getProgramId());
+//        System.out.println(poleXixunPlayer.getProgramId());
         poleXixunPlayer.setRequestBody(json);
         //  poleXixunPlayer.setCreatTime(sdf.format(date));
         poleXixunPlayer.setCreateUserId(SecurityUtils.getClientId());
@@ -71,6 +77,7 @@
         ProgramPro programPro = new ProgramPro();
         try {
             programPro = JsonUtil.convertJsonStringToObject(json, ProgramPro.class);
+            programPro.setProgramId(pid);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -90,6 +97,9 @@
         queryWrapper.eq("program_id", programId);
         poleXixunPlayerEntity = this.getOne(queryWrapper);
         String json = poleXixunPlayerEntity.getRequestBody();
+
+//        System.out.println( JSON.parseArray(json, ProgramPro.class));
+
         try {
             pro = JsonUtil.convertJsonStringToObject(json, ProgramPro.class);
         } catch (Exception e) {

--
Gitblit v1.9.3