From 66e0f592475cebf0511be54f71217be5ba4245c8 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期三, 09 二月 2022 14:11:25 +0800
Subject: [PATCH] 功能完善

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java |  191 ++++++++++++++++++++++++-----------------------
 1 files changed, 98 insertions(+), 93 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 4b05920..c7f89fe 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,102 +1,107 @@
-package com.sandu.ximon.admin.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.sandu.common.service.impl.BaseServiceImpl;
-import com.sandu.ximon.admin.config.XiXunConfig;
-import com.sandu.ximon.admin.entity.*;
-import com.sandu.ximon.admin.security.SecurityUtils;
-import com.sandu.ximon.admin.utils.JsonUtil;
-import com.sandu.ximon.dao.domain.PoleXixunPlayerEntity;
-import com.sandu.ximon.dao.mapper.PoleXixunPlayerEntityMapper;
-import lombok.AllArgsConstructor;
-import org.springframework.stereotype.Service;
-
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-@Service
-@AllArgsConstructor
-public class XiXunPlayerService extends BaseServiceImpl<PoleXixunPlayerEntityMapper, PoleXixunPlayerEntity> {
-
-    private final PoleXixunPlayerEntityMapper poleXixunPlayerEntityMapper;
-    private final XiXunConfig config;
-
-
-    public void insert(ProgramPro programPro, Long userId) {
-        SimpleDateFormat sdf=new SimpleDateFormat("yy-MM-dd HH:mm:ss");
-        Date date = new Date();
-//        Program program = new Program();
+//package com.sandu.ximon.admin.service;
+//
+//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+//import com.google.gson.Gson;
+//import com.google.gson.GsonBuilder;
+//import com.sandu.common.service.impl.BaseServiceImpl;
+//import com.sandu.ximon.admin.config.RealtimeServerBean;
+//import com.sandu.ximon.admin.config.XiXunConfig;
+//import com.sandu.ximon.admin.entity.*;
+//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.dao.domain.PoleLightemitEntity;
+//import com.sandu.ximon.dao.domain.PoleXixunPlayerEntity;
+//import com.sandu.ximon.dao.mapper.PoleXixunPlayerEntityMapper;
+//import lombok.AllArgsConstructor;
+//import org.springframework.stereotype.Service;
+//
+//import java.text.SimpleDateFormat;
+//import java.util.*;
+//
+//@Service
+//@AllArgsConstructor
+//public class XiXunPlayerService extends BaseServiceImpl<PoleXixunPlayerEntityMapper, PoleXixunPlayerEntity> {
+//
+//    private final PoleXixunPlayerEntityMapper poleXixunPlayerEntityMapper;
+//    private final XiXunConfig config;
+//    private final LightemitUtils lightemitUtils;
+//    private final RealtimeServerBean realtimeServerBean;
+//
+//
+//    public void insert(ProgramPro programPro, Long userId) {
+//        SimpleDateFormat sdf=new SimpleDateFormat("yy-MM-dd HH:mm:ss");
+//        Date date = new Date();
+////        Program program = new Program();
+////        try {
+////            program = JsonUtil.convertJsonStringToObject(json,Program.class);
+////        } catch (Exception e) {
+////            e.printStackTrace();
+////        }
+//        String json = JsonUtil.jsonObj2Sting(programPro);
+//        PoleXixunPlayerEntity poleXixunPlayer = new PoleXixunPlayerEntity();
+//        poleXixunPlayer.setProgramCode(programPro.get_id());
+//        poleXixunPlayer.setProgramName(programPro.getName());
+//        poleXixunPlayer.setHeight(programPro.getHeight());
+//        poleXixunPlayer.setWidth(programPro.getWidth());
+//        poleXixunPlayer.setTotalSize((float) programPro.getTotalSize()/1000000+"MB");
+//        poleXixunPlayer.setRequestBody(json);
+//        poleXixunPlayer.setCreatTime(sdf.format(date));
+//        poleXixunPlayer.setCreateUserId(SecurityUtils.getClientId());
+//
+//        this.save(poleXixunPlayer);
+//    }
+//
+//    public void videoXixunPlayer(long programId,Long[] lightemitIds) {
+//
+//        ProgramPro pro = new ProgramPro();
+//        ItemPro items = new ItemPro();
+//        TaskPro taskPro = new TaskPro();
+//        CommandPro command = new CommandPro();
+//        XixunPlayerPro xixun = new XixunPlayerPro();
+//        PoleXixunPlayerEntity poleXixunPlayerEntity = new PoleXixunPlayerEntity();
+//        items.set_id(UUID.randomUUID().toString());
+//        QueryWrapper<PoleXixunPlayerEntity> queryWrapper = new QueryWrapper<>();
+//        queryWrapper.eq("program_id",programId);
+//        poleXixunPlayerEntity = this.getOne(queryWrapper);
+//        String json = poleXixunPlayerEntity.getRequestBody();
 //        try {
-//            program = JsonUtil.convertJsonStringToObject(json,Program.class);
+//            pro = JsonUtil.convertJsonStringToObject(json, ProgramPro.class);
 //        } catch (Exception e) {
 //            e.printStackTrace();
 //        }
-        String json = JsonUtil.jsonObj2Sting(programPro);
-        PoleXixunPlayerEntity poleXixunPlayer = new PoleXixunPlayerEntity();
-        poleXixunPlayer.setProgramCode(programPro.get_id());
-        poleXixunPlayer.setProgramName(programPro.getName());
-        poleXixunPlayer.setHeight(programPro.getHeight());
-        poleXixunPlayer.setWidth(programPro.getWidth());
-        poleXixunPlayer.setTotalSize((float) programPro.getTotalSize()/1000000+"MB");
-        poleXixunPlayer.setRequestBody(json);
-        poleXixunPlayer.setCreatTime(sdf.format(date));
-        poleXixunPlayer.setCreateUserId(SecurityUtils.getClientId());
-
-        this.save(poleXixunPlayer);
-    }
-
-    public void videoXixunPlayer(long programId,Long[] lightemitIds) {
-
-        ProgramPro pro = new ProgramPro();
-        ItemPro items = new ItemPro();
-        TaskPro taskPro = new TaskPro();
-        CommandPro command = new CommandPro();
-        XixunPlayerPro xixun = new XixunPlayerPro();
-        PoleXixunPlayerEntity poleXixunPlayerEntity = new PoleXixunPlayerEntity();
-        items.set_id(UUID.randomUUID().toString());
-        QueryWrapper<PoleXixunPlayerEntity> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("program_id",programId);
-        poleXixunPlayerEntity = this.getOne(queryWrapper);
-        String json = poleXixunPlayerEntity.getRequestBody();
-        try {
-            pro = JsonUtil.convertJsonStringToObject(json, ProgramPro.class);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        items.set_program(pro);
-        items.setRepeatTimes(1);
-        items.setSchedulePros(null);//瀹氭椂娈碉紝涓嶅仛瀹氭椂鍙负null
-        taskPro.set_id(UUID.randomUUID().toString());
-        taskPro.setName(poleXixunPlayerEntity.getProgramName());
-        List<ItemPro> list2=new ArrayList<ItemPro>();
-        list2.add(items);
-        taskPro.setItems(list2);
-        command.setId(UUID.randomUUID().toString());
-        //杩欓噷鏄笅鏂圭殑post鍥炶皟鍦板潃锛岄渶瑕佷慨鏀笽P鍦板潃
-        command.setNotificationURL("http://" + config.getIp() + ":" + config.getPort() + "/machine-fast/serv/download/getJSON");
-        //璧勬簮涓嬭浇閾炬帴鐨勮姹傚ご
+//        items.set_program(pro);
+//        items.setRepeatTimes(1);
+//        items.setSchedulePros(null);//瀹氭椂娈碉紝涓嶅仛瀹氭椂鍙负null
+//        taskPro.set_id(UUID.randomUUID().toString());
+//        taskPro.setName(poleXixunPlayerEntity.getProgramName());
+//        List<ItemPro> list2=new ArrayList<ItemPro>();
+//        list2.add(items);
+//        taskPro.setItems(list2);
+//        command.setId(UUID.randomUUID().toString());
+//        //杩欓噷鏄笅鏂圭殑post鍥炶皟鍦板潃锛岄渶瑕佷慨鏀笽P鍦板潃
+//        command.setNotificationURL("http://" + config.getIp() + ":" + config.getPort() + "/machine-fast/serv/download/getJSON");
+//        //璧勬簮涓嬭浇閾炬帴鐨勮姹傚ご
 //        command.setPreDownloadURL("http://" + config.getIp() + ":" + config.getPort() + "/machine-fast/serv/download/downliadFileById/");
 //        command.setTask(taskPro);
 //        xixun.set_id(UUID.randomUUID().toString());
 //        xixun.setCommand(command);
 //        xixun.setType("commandXixunPlayer");	//鍛戒护鍥哄畾绫诲瀷锛屼笉鍙洿鏀�
-
-
-        Gson gson = new GsonBuilder().disableHtmlEscaping().create();
-//        String jsondata = JSON.toJSONString(xixun);
-        String jsondata = gson.toJson(xixun);
-
-       /* Collection<PoleLightemitEntity> poleLightemitEntities = poleLightemitService.listByIds(Arrays.asList(lightemitIds));
-
-        if(poleLightemitEntities != null){
-            for (PoleLightemitEntity entity: poleLightemitEntities) {
-                lightemitUtils.clear(entity.getLightemitControlCode());
-                poleLightemitService.updateRequestBody(entity.getLightemitControlCode(), jsondata);
-                lightemitUtils.post(realtimeServerBean.getCommand() + entity.getLightemitControlCode(), jsondata);
-            }
-        }*/
-    }
-
-}
+//
+//
+//        Gson gson = new GsonBuilder().disableHtmlEscaping().create();
+////        String jsondata = JSON.toJSONString(xixun);
+//        String jsondata = gson.toJson(xixun);
+//
+////        Collection<PoleLightemitEntity> poleLightemitEntities = poleLightemitService.listByIds(Arrays.asList(lightemitIds));
+////
+////        if(poleLightemitEntities != null){
+////            for (PoleLightemitEntity entity: poleLightemitEntities) {
+////                lightemitUtils.clear(entity.getLightemitControlCode());
+////                poleLightemitService.updateRequestBody(entity.getLightemitControlCode(), jsondata);
+////                lightemitUtils.post(realtimeServerBean.getCommand() + entity.getLightemitControlCode(), jsondata);
+////            }
+////        }
+//    }
+//
+//}

--
Gitblit v1.9.3