ip音柱文件上传

liuhaonan

2022-04-13 3f65fcaa359cadeffa9cec2c757ab879d0aad739

ip音柱文件上传

 dao/src/main/java/com/sandu/ximon/dao/domain/ChargingPile.java

ÎļþÒÑɾ³ý

 dao/src/main/java/com/sandu/ximon/dao/domain/ChargingPileOrderList.java

ÎļþÒÑɾ³ý

 dao/src/main/java/com/sandu/ximon/dao/mapper/ChargingPileMapper.java

ÎļþÒÑɾ³ý

 dao/src/main/java/com/sandu/ximon/dao/mapper/ChargingPileOrderListMapper.java

ÎļþÒÑɾ³ý

 dao/src/main/resources/mapper/ChargingPileOrderListMapper.xml

ÎļþÒÑɾ³ý

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java

@@ -149,10 +149,10 @@
            List<LedPlayerEntity> list = ledPlayerEntityService.list(wrapper);
            List<LedPlayerEntity> entities = vnnoxService.setCacheInfo(vnnoxAPIUtil.syncCurrentInfo(list));
            entities.forEach(
                    led->{
                    led -> {
                        PoleBinding binding = bindingService.getOne(Wrappers.lambdaQuery(PoleBinding.class)
                                .eq(PoleBinding::getDeviceType, 1).eq(PoleBinding::getDeviceCode, led.getSn()));
                        if(binding!=null){
                        if (binding != null) {
                            led.setPoleId(poleService.getById(binding.getPoleId()).getId());
                            led.setPoleName(poleService.getById(binding.getPoleId()).getPoleName());
                        }
@@ -184,4 +184,9 @@
            return ResponseUtil.success(online);
        }
    }

    @GetMapping("/getVnnoxInfo/{sn}")
    public ResponseVO<Object> getBySnAndPlayerId(@PathVariable String sn) {
        return ResponseUtil.success(ledPlayerEntityService.getBySnAndPlayerId(sn));
    }
}

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java

@@ -280,6 +280,17 @@
//        return ResponseUtil.success(poleLightemitService.list(wrapper));
    }

    /**
     *
     *
     * @param
     * @return
     */
    @GetMapping("/getbycode")
  public ResponseVO<Object> getLedByLightControlCode(String lightemitControlCode) {
        return ResponseUtil.success(poleLightemitService.getLedByLightControlCode(lightemitControlCode));
    }

    /*
    è®¾ç½®å±å¹•å¼€å…³
     */
@@ -350,7 +361,7 @@


    /*
  è®¾ç½®éŸ³é‡
    è®¾ç½®äº®åº¦
   */
    @PostMapping("/setBrightness")
    public ResponseVO<Object> setBrightness(@RequestBody SetBrightnessParam setBrightnessParam) {
@@ -437,4 +448,6 @@
    }




}

 ximon-admin/src/main/java/com/sandu/ximon/admin/param/IpVolumeMissionParam.java

@@ -59,75 +59,9 @@
    TaskRunTimeVO[] exec;

    //  ä»»åŠ¡æ‰§è¡Œè§„则（每天为 0，每周为 1，手动为 2)
 //   private Integer rule;
    private Integer rule;



/*

    */
/**
     * éŸ³æŸ±ä»»åŠ¡åç§°
     *//*

    private String missionName;

    */
/**
     * æ’­æ”¾æ–‡ä»¶
     *//*

    private String missionFileName;

    */
/**
     * æ’­æ”¾æ–‡ä»¶id
     *//*

    private Long missionFileId;


    */
/**
     * å¼€å§‹æ—¥æœŸ
     *//*

    private String onDate;

    */
/**
     * ç»“束日期
     *//*

    private String offDate;

    */
/**
     * æ˜ŸæœŸèŒƒå›´
     *//*

    private String week;

    */
/**
     * å¼€å§‹æ—¶åˆ»
     *//*

    private Integer onTime;

    */
/**
     * ç»“束时刻
     *//*

    private Integer offTime;

    */
/**
     * ä»»åŠ¡éŸ³é‡
     *//*

    private Integer missionVolume;
*/

}

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java

@@ -85,7 +85,7 @@
        //  å°è£…播放文件列表
        List<TaskMediaFileVO> taskMediaFileVOS = new ArrayList<>();
        List<BroadcastV2TaskFile> taskFileEntityList = new ArrayList<>();
        int i = 6666;
        int i = 1;
        for (Integer fileId : new HashSet<>(missionparam.getFileIds())) {
            TaskMediaFileVO taskMediaFileVO = new TaskMediaFileVO();
            BroadcastV2TaskFile taskFileEntity = new BroadcastV2TaskFile();
@@ -224,10 +224,17 @@
            taskFileEntity.setFileId(fileId);

            IpVolumeFile fileEntity = ipVolumeFileService.getById(fileId);
            String absolutePath = MinIoConstant.getAbsolutePath(
            String absolutePath;
            absolutePath = MinIoConstant.getAbsolutePath(
                    MinIoConstant.BROADCAST_FILE.getBucketName() + fileEntity.getUserId(),
                    fileEntity.getFileName()
            );
            if (fileEntity.getUserId() == null && fileEntity.getClientId() == null) {
                absolutePath = MinIoConstant.getAbsolutePath(
                        MinIoConstant.ADMIN_BROADCAST_FILE.getBucketName(),
                        fileEntity.getFileName()
                );
            }

            taskMediaFileVO.setI(i);
            i++;
@@ -242,7 +249,6 @@

        missionparam.setFiles(taskMediaFileVOS.toArray(new TaskMediaFileVO[taskMediaFileVOS.size()]));
        missionparam.setTerminals(taskTerminalVOList.toArray(new TaskTerminalVO[taskTerminalVOList.size()]));
        System.out.println("---------------------------");

        //  å‘IP音柱服务器更新任务
        Integer result = TaskAPIUtils.updateTask(taskId, missionparam);
@@ -389,13 +395,15 @@


        }
        task.setWeeks("0" + Integer.toBinaryString(byId.getWeek()));
        task.setWeeks("0" + Integer.toBinaryString(task.getWeek()));
//        byId.setWeeks("0" + Integer.toBinaryString(byId.getWeek()));

        List<BroadcastV2TaskFile> taskFiles = broadcastV2TaskFileService.list(Wrappers.lambdaQuery(BroadcastV2TaskFile.class)
                .eq(BroadcastV2TaskFile::getTaskId, taskId));
        List<BroadcastV2TaskTerminal> taskTerminals = broadcastV2TaskTerminalService.list(Wrappers.lambdaQuery(BroadcastV2TaskTerminal.class)
                .eq(BroadcastV2TaskTerminal::getTaskId, taskId));



        if (!taskFiles.isEmpty()) {
            taskFiles.forEach(
@@ -423,9 +431,6 @@
            );
        }

//        Map map=new HashMap();
//        map.put("本地",byId);
//        map.put("服务器",task);

        System.out.println(JSON.toJSONString(task));
        System.out.println(task);

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java

@@ -174,49 +174,13 @@
        return TerminalAPIUtils.changeVol(params.getId(), params.getDefaultVolumn());
    }

    /*public List<BroadcastTerminalV2Entity> getAll(Long userId) {
        Long roleId = sysUserRoleService.queryRoleId(userId);
        Long companyId = sysUserCompanyService.queryCompanyId(userId);


        List<BroadcastTerminalV2Entity> list = null;
        if(roleId == Constant.SUPER_ADMIN) {
            list = broadcastTerminalV2Dao.getAll();
        }else if(roleId == Constant.ADMIN) {
            list = broadcastTerminalV2Dao.getAllByCompanyId(companyId);
        }else {
            list = broadcastTerminalV2Dao.getAllByUserId(userId);
        }
        return list;
    /**
     * ç»ˆç«¯è¯¦æƒ…
     */
    public TerminalVO getIpTerminalDetail(Integer id) {
        return TerminalAPIUtils.getTerminalInfo(id);
    }

    public BroadcastTerminalV2Entity getById(Integer i) {
        return broadcastTerminalV2Dao.getById(i);
    }

    public Object getAllWithStatus(Long userId) {
        List<BroadcastTerminalV2Entity> all = getAll(userId);
        for(BroadcastTerminalV2Entity b : all){
            try {
                TerminalVO terminalInfo = TerminalAPIUtils.getTerminalInfo(b.getId());
                if(null == terminalInfo) {
                    b.setExist(0);
                }else {
                    b.setExist(1);
                }
                b.setStatus(terminalInfo.getStatus());
                b.setIp(terminalInfo.getIp());
                b.setVolumn(terminalInfo.getVolumn());
                b.setDefaultVolumn(terminalInfo.getDefaultVolumn());
                b.setPower(terminalInfo.getPower());
                b.setDefaultPower(terminalInfo.getDefaultPower());
                b.setLast(terminalInfo.getLast());
                b.setTaskType(terminalInfo.getTaskType());
                b.setTaskID(terminalInfo.getTaskID());
            }catch (Exception e) {
                b.setExist(2);
            }
        }
        return all;
    }*/

}

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedPlayerEntityService.java

@@ -2,10 +2,14 @@

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.utils.VnnoxAPIUtil;
import com.sandu.ximon.dao.domain.LedPlayerEntity;
import com.sandu.ximon.dao.mapper.LedPlayerEntityMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.List;

/**
 * @Author liuhaonan
@@ -17,6 +21,7 @@
@AllArgsConstructor
public class LedPlayerEntityService extends BaseServiceImpl<LedPlayerEntityMapper, LedPlayerEntity> {
    private final LedPlayerEntityMapper ledPlayerEntityMapper;
    private VnnoxAPIUtil vnnoxAPIUtil;

    public LedPlayerEntity getBySn(String sn){
        return getOne(Wrappers.lambdaQuery(LedPlayerEntity.class).eq(LedPlayerEntity::getSn, sn));
@@ -30,8 +35,23 @@
    }


  /*  public void listLed(String keyWord){
    /**
     * è¯ºç“¦ç¡¬ä»¶è®¾å¤‡
     */
    public LedPlayerEntity getBySnAndPlayerId(String sn){
        LedPlayerEntity one = getOne(Wrappers.lambdaQuery(LedPlayerEntity.class).eq(LedPlayerEntity::getSn, sn));
        if(one==null){
            throw new RuntimeException("诺瓦设备不存在");
        }
        List list=new ArrayList();
        list.add(one);
        List<LedPlayerEntity> led = vnnoxAPIUtil.syncCurrentInfo(list);
        return led.get(0);
    }

        Wrappers.lambdaQuery(LedPlayerEntity.class).eq(LedPlayerEntity::get)
    }*/





}

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java

@@ -1,6 +1,7 @@
package com.sandu.ximon.admin.service;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.google.gson.Gson;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.service.impl.BaseServiceImpl;
@@ -205,6 +206,20 @@
    }


    public PoleLightemitEntity getLedByLightControlCode(String lightControlCode) {
        PoleLightemitEntity xiXun = getOne(Wrappers.lambdaQuery(PoleLightemitEntity.class).eq(PoleLightemitEntity::getLightemitControlCode, lightControlCode));
        if(xiXun==null){
            return null;
        }
        String isScreenOpen = lightemitUtils.getIsScreenOpen(xiXun.getLightemitControlCode());
        if(isScreenOpen.contains("true")){
            xiXun.setIsOpen(true);
        }
        xiXun.setIsOpen(false);
        return xiXun;
    }


    public void savePoleLightemit(PoleLightemitEntity poleLightemit) {
        boolean save = this.save(poleLightemit);
        // ç»‘定灯杆

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java

@@ -113,9 +113,6 @@


    public List<Pole> queryAllStatesAndList(Integer pageNo, Integer pageSize, PoleStatesParam param) {
        // List<LampPost> list = list(Wrappers.lambdaQuery(LampPost.class).eq(LampPost::getClientId, SecurityUtils.getUserId()));
        //List<Pole> list = list(Wrappers.lambdaQuery(Pole.class));
//        PageHelper.startPage(pageNo, pageSize);
        List<Pole> list = new ArrayList<>();
        LambdaQueryWrapper<Pole> wrapper = new LambdaQueryWrapper<>();
        if (SecurityUtils.getClientId() == null) {
@@ -132,12 +129,6 @@
        }

        list = list(wrapper);
        List<Pole> bindList = new ArrayList<>();//已绑定客户
        List<Pole> unbindList = new ArrayList<>();//未绑定客户
        List<Pole> isTrue = new ArrayList<>();//实体灯杆
        List<Pole> isFalse = new ArrayList<>();//虚拟灯杆
        List<Pole> online = new ArrayList<>();//在线
        List<Pole> offline = new ArrayList<>();//离线
        if (param.getGroupid() != null) {
            //  List<Long> poleIds = new ArrayList<>();
            List<Pole> pole = new ArrayList<>();
@@ -149,10 +140,6 @@
            );
            list = pole;
        }

//        List<Pole> bind = isBind(list, param);
//        List<Pole> aTrue = isTrue(list, param);
//        List<Pole> onLine = isOnLine(list, param);

        if (param.getBingStates() != 2) {//是否绑定
            list = isBind(list, param);//   ç»‘定/未绑定
@@ -179,64 +166,6 @@
            }
        }


//        list.forEach(bindwarpper -> {
////                Long clientId = bindwarpper.getClientId();
//            if (bindwarpper.getClientId() == null) {//判断是否绑定
//                unbindList.add(bindwarpper);
//                if (bindwarpper.getDeviceCode() == null) {//判断灯杆类型
//                    isFalse.add(bindwarpper);
//                } else {
//                    isTrue.add(bindwarpper);
//                }
//            } else {
//                bindList.add(bindwarpper);
//                if (bindwarpper.getDeviceCode() == null) {
//                    isFalse.add(bindwarpper);
//                } else {
//                    isTrue.add(bindwarpper);
//                }
//            }
//        });
//        if (param.getBingStates() == 1) { //未绑定
//            list = unbindList;
//        } else if (param.getBingStates() == 0) {//已绑定
//            list = bindList;
//        }// else {//全部
////            list = list(wrapper);
////        }
//
//        if (param.getIsTrue() == 1) { //虚拟灯杆
//            list = isFalse;
//        } else if (param.getIsTrue() == 0) {//实体灯杆
//            setOnline(list);
//            list = isTrue;
//            list.forEach(onLinePole -> {
//                System.out.println("online---------------------------------------------------"+("ONLINE").equals(onLinePole.getOnLineState()));
//                System.out.println("online---------------------------------------------------"+(onLinePole.getOnLineState()));
//                if (("ONLINE").equals(onLinePole.getOnLineState())) {
//                    online.add(onLinePole);
//                } else if (("OFFLINE").equals(onLinePole.getOnLineState())) {
//                    offline.add(onLinePole);
//                }
//            });
//        } else {//全部
//            setOnline(list);
//           list.forEach(onLinePole -> {
//           //    System.out.println("online-----------------------"+onLinePole.getOnLineState());
//               if (("ONLINE").equals(onLinePole.getOnLineState())) {
//                    online.add(onLinePole);
//                } else if (("OFFLINE").equals(onLinePole.getOnLineState())) {
//                    offline.add(onLinePole);
//                }
//            });
//       }
//
//        if (param.getOnLineStates() == 1) { //离线
//            list = offline;
//        } else if (param.getOnLineStates() == 0) {//在线
//            list = online;
//        }
        setCount(list);
        return list;
    }
@@ -694,4 +623,16 @@
        setOnline(list);
        return list;
    }


    /**
     * æ ¹æ®ç¯æ†id查询灯杆绑定设备
     */
    public List<Pole> getBindByPoleId(Long poleId){
        List<PoleBinding> bind = poleBindingService.list(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getPoleId, poleId));

        return list(Wrappers.lambdaQuery(Pole.class).eq(Pole::getId,poleId));
    }


}

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/VnnoxService.java

@@ -1,9 +1,7 @@
package com.sandu.ximon.admin.service;

import com.sandu.common.execption.BusinessException;
import com.sandu.common.log.Log;
import com.sandu.ximon.admin.config.VnnoxConstant;
import com.sandu.ximon.admin.utils.LogUtils;
import com.sandu.ximon.admin.utils.RedisUtils;
import com.sandu.ximon.admin.utils.VnnoxAPIUtil;
import com.sandu.ximon.admin.utils.request.VnnoxScreenStatusType;
@@ -208,39 +206,40 @@

    /**
     * èŽ·å–缓存数据
     *
     * @param list
     * @return
     */
    public List<LedPlayerEntity> setCacheInfo(List<LedPlayerEntity> list) {
        for(LedPlayerEntity playerEntity: list) {
        for (LedPlayerEntity playerEntity : list) {
            String playerId = playerEntity.getPlayerId();
            LedPlayerInfoEntity cache = new LedPlayerInfoEntity();
            //  è®¾ç½®å±å¹•çŠ¶æ€
            String result = redisUtils.get(VnnoxConstant.REDIS_SCREEN_STATUS + playerId);
            Integer screenStatus = 1;
            if(null != result) {
            if (null != result) {
                screenStatus = Integer.parseInt(result);
            }
            cache.setScreenStatus(screenStatus);
            //  è®¾ç½®å±å¹•éŸ³é‡
            result = redisUtils.get(VnnoxConstant.REDIS_VOL + playerId);
            Integer vol = 0;
            if(null != result) {
            if (null != result) {
                vol = Integer.parseInt(result);
            }
            cache.setVol(vol);
            //  è®¾ç½®å±å¹•äº®åº¦
            result = redisUtils.get(VnnoxConstant.REDIS_BRIGHTNESS + playerId);
            Integer brightness = 0;
            if(null != result) {
            if (null != result) {
                brightness = Integer.parseInt(result);
            }
            cache.setBrightness(brightness);

            //  è®¾ç½®ç¼©ç•¥å›¾è®¿é—®è·¯å¾„
            result = redisUtils.get(VnnoxConstant.REDIS_SCREEN_SHOT + playerId);
            System.out.println(playerId+"的路径结果:-----------------------------"+result);
            if(null != result) {
            System.out.println(playerId + "的路径结果:-----------------------------" + result);
            if (null != result) {
                playerEntity.setScreenShotUrl(result);
            } else {
                playerEntity.setScreenShotUrl("");
@@ -250,6 +249,4 @@
        }
        return list;
    }


}

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java

@@ -1,6 +1,5 @@
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,7 +19,10 @@
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;

import java.util.*;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.UUID;

/**
 * ç†™è®¯èŠ‚ç›®
@@ -53,7 +55,7 @@
        poleXixunPlayer.setScreenShot(programPro.getScreenShot());
        //  poleXixunPlayer.setCreatTime(sdf.format(date));
        poleXixunPlayer.setCreateUserId(SecurityUtils.getUserId());
        if(!clientService.findClientId()){
        if (!clientService.findClientId()) {
            poleXixunPlayer.setClientId(clientService.getClientId());
        }

@@ -71,8 +73,8 @@

    public Object getByPid(Long pid) {
        PoleXixunPlayerEntity byId = getById(pid);
        List<Long> fileIds=new ArrayList<>();
        List<LedSFile> file=new ArrayList<>();
        List<Long> fileIds = new ArrayList<>();
        List<LedSFile> file = new ArrayList<>();
        if (byId == null) {
            throw new BusinessException("未找到该节目");
        }
@@ -85,10 +87,10 @@
            programPro.getLayers().forEach(
                    layerPro -> {
                        layerPro.getSources().forEach(
                              sourcePro -> {
                                  long fileId = Long.parseLong(sourcePro.getId());
                                  file.add(xiXunFileService.getById(fileId));
                              }
                                sourcePro -> {
                                    long fileId = Long.parseLong(sourcePro.getId());
                                    file.add(xiXunFileService.getById(fileId));
                                }
                        );
                    }
            );
@@ -96,11 +98,12 @@
        } catch (Exception e) {
            e.printStackTrace();
        }
        return  programPro;
        return programPro;
    }

    /**
     * æŽ¨é€èŠ‚ç›®
     *
     * @param programId
     * @param lightemitIds
     */
@@ -150,12 +153,12 @@

        Collection<PoleLightemitEntity> poleLightemitEntities = poleLightemitService.listByIds(lightemitIds);

        if(poleLightemitEntities != null){
            for (PoleLightemitEntity entity: poleLightemitEntities) {
        if (poleLightemitEntities != null) {
            for (PoleLightemitEntity entity : poleLightemitEntities) {
                lightemitUtils.clear(entity.getLightemitControlCode());
                poleLightemitService.updateRequestBody(entity.getLightemitControlCode(), jsondata);
                String post = lightemitUtils.post(realtimeServerBean.getCommand() + entity.getLightemitControlCode(), jsondata);
                LogUtils.error("结果:"+post);
                LogUtils.error("结果:" + post);
            }
        }
    }

 ximon-admin/src/main/java/com/sandu/ximon/admin/utils/BroadcastPostUtils.java

@@ -43,10 +43,6 @@
    }

    /**
     * m 1 1 1
     * f 1 1 1
     * y 1
     *
     * @param in
     * @param encoding
     * @return

 ximon-admin/src/main/java/com/sandu/ximon/admin/utils/TaskAPIUtils.java

@@ -327,6 +327,7 @@
            task.setTerminals(param.getTerminals());
            task.setFiles(param.getFiles());
            task.setExec(param.getExec());
            task.setWeek(Integer.parseInt(param.getWeek(), 2));

            LoginResponseVO responseVO1 = JSON.parseObject(
                    BroadcastPostUtils.Post(

 ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxAPIUtil.java

@@ -49,21 +49,6 @@
     * @param start ä»Žç¬¬å‡ æ¡è®°å½•å¼€å§‹è¯»å–，默认0
     * @return
     */
//    public VnnoxPlayerListResponse getPlayerList(Integer count, Integer start) {
//
//        String result = VnnoxRequestUtil.GetWithHeader(
//                VnnoxUrl.getUrl(VnnoxUrl.GET_PLAYER_LIST),
//                new VnnoxGetPlayerListRequest(count, start).toJson(),
//                new CommonHeader(CommonHeader.JSON, true)
//        );
//        VnnoxPlayerListResponse response =
//                new VnnoxPlayerListResponse().parse(JSON.parseObject(result, CommonResponse.class));
//        System.out.println("----------------------------------------");
//        System.out.println("----------------------------------------");
//        System.out.println("----------------------------------------");
//        System.out.println(response);
//        return response;
//    }
    public VnnoxPlayerListResponse getPlayerList(Integer count, Integer start,String name) throws URISyntaxException {

        List<NameValuePair> urlParameters = new ArrayList<>();

 ximon-admin/src/main/java/com/sandu/ximon/admin/vo/PoleBindVO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,63 @@
package com.sandu.ximon.admin.vo;

import com.sandu.ximon.dao.domain.*;
import lombok.Data;

/**
 * @Author liuhaonan
 * @Date 2022/4/12
 * @Version 1.0
 */
@Data
public class PoleBindVO {


    private Pole pole;


    /**
     * å¤§æ°”监测
     */
    private AirMonitoring airMonitoring;

    /**
     * ip音柱
     */
    private TerminalVO ipVolume; //

    /**
     * å……电桩
     */
    private C3mCharging c3mCharging;


    /**
     * è·¯ç¯
     */
    private Light light;

    /**
     * æ†ä½“倾测
     */
    private LightPoleHeeling lightPoleHeeling;

    /**
     * æ‘„像头
     */
    private Monitor monitor;

    /**
     * LED诺瓦
     */
    private LedPlayerEntity nova; //

    /**
     * led熙讯
     */
    private PoleLightemitEntity xiXun;  //

    /**
     * æ°´è´¨ç›‘测
     */
    private WaterMonitoring waterMonitoring;
}

 ximon-admin/src/main/java/com/sandu/ximon/admin/vo/TaskVO.java

@@ -29,13 +29,13 @@
        taskVO.setMode(0);  //  ä»»åŠ¡å¹¿æ’­æ–¹å¼ï¼ˆå•æ’­ä¸º 0，组播为 1）
        taskVO.setDur(systemReservation);   //  ç³»ç»Ÿä¿ç•™
        taskVO.setPower(1); //  é¢„开功放时间（秒）
        taskVO.setPn(99);   //  æŒ‡å®šæ’­æ”¾æ¬¡æ•°ï¼ˆé»˜è®¤ä¸º 1 æ¬¡ï¼‰
        taskVO.setPn(9999);   //  æŒ‡å®šæ’­æ”¾æ¬¡æ•°ï¼ˆé»˜è®¤ä¸º 1 æ¬¡ï¼‰
        taskVO.setLv(10);   //  ä»»åŠ¡ä¼˜å…ˆçº§åˆ«(11-100)，数值越小，优先级别 è¶Š å¤§ã€‚
        taskVO.setBtime(systemReservation); //  ç³»ç»Ÿä¿ç•™
        taskVO.setRule(1);  //  ä»»åŠ¡æ‰§è¡Œè§„则（每天为 0，每周为 1，手动为 2)
        taskVO.setRule(param.getRule());  //  ä»»åŠ¡æ‰§è¡Œè§„则（每天为 0，每周为 1，手动为 2)
        taskVO.setBdate(param.getOnDate()); //  ä»»åŠ¡å¼€å§‹æ—¥æœŸï¼Œä¸€èˆ¬ä¸ºä»»åŠ¡åˆ›å»ºæ—¥æœŸ
        taskVO.setEdate(param.getOffDate()); //  ä»»åŠ¡ç»“束日期，一直有效为-1
        taskVO.setWeek(1);  //  æ¯å‘¨æ‰§è¡Œè§„则，rule ä¸º 1 æ—¶ï¼Œæœ‰æ•ˆ
        taskVO.setWeek(Integer.parseInt(param.getWeek(), 2));  //  æ¯å‘¨æ‰§è¡Œè§„则，rule ä¸º 1 æ—¶ï¼Œæœ‰æ•ˆ
        taskVO.setType(BroadcastTaskType.TIMED_TASK.getType()); //任务类型，定时任务为 1，采集任务为 2，实时音 é¢‘任务为 26，实时喊话任务为 27
        taskVO.setSchemeID(1);  //  ä»»åŠ¡æ–¹æ¡ˆ ID
        taskVO.setEi(0);    //