功能完善

liuhaonan

2022-02-18 81d00b6d3079d721b8c0d2ffa6ef51c10a433eae

功能完善

 .run/²âÊÔ-¹ÜÀí¶Ë.run.xml

@@ -28,7 +28,7 @@
    </option>
    <option name="hostTagId" value="0" />
    <option name="location" value="cd /usr/local/project/ximon-light-20017" />
    <option name="pathOrUrl" value="D:\project\sandu\ximon-light-management\ximon-admin\target\ximon-admin-0.0.1-SNAPSHOT.jar" />
    <option name="pathOrUrl" value="D:\IdeaProjects\XMPoleManager\ximon-admin\target\ximon-admin-0.0.1-SNAPSHOT.jar" />
    <option name="tagId" value="0" />
    <option name="terminalCommand" />
    <option name="type" value="HOST" />

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

@@ -18,8 +18,6 @@
import java.util.List;
import java.util.Map;

import static jodd.util.ThreadUtil.sleep;

/**
 * å¤§æ°”数据
 */
@@ -63,7 +61,7 @@
        List<String> success = new ArrayList<>();
        List<String> failed = new ArrayList<>();

        listMac.parallelStream().forEach(macStr ->{
        listMac.parallelStream().forEach(macStr -> {
//            System.out.println(System.currentTimeMillis()+"       -------------");
            try {
                CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(macStr, a5Frame);

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

@@ -45,7 +45,7 @@
        return ResponseUtil.success(playPlanNvService.deletePlan(plianIds));
    }

    @PostMapping("/push/{plianId}")
    @PostMapping(value ="/push/{plianId}",produces = "application/json;charset=UTF-8")
    public ResponseVO<Object> pushToLed(@PathVariable Long plianId,@RequestBody List<String> playerIds) {
        return ResponseUtil.success(playPlanNvService.pushToLed(plianId,playerIds));
    }

 ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/request/AirDataReqInnerFrame.java

@@ -1,11 +1,9 @@
package com.sandu.ximon.admin.manager.iot.frame.inner.request;

import com.sandu.ximon.admin.manager.iot.frame.inner.IRequestInnerFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5LightDataEnum;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.AtmoFunctionCode;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.MQTTConnectTypeEnum;
import com.sandu.ximon.admin.manager.iot.rrpc.util.CRC32Utils;
import com.sandu.ximon.admin.manager.iot.rrpc.util.SupplementUtils;

/**
 * @Author liuhaonan
@@ -24,12 +22,12 @@
    }

    @Override
public String getEncodeFrame() {
    String functionCode = AtmoFunctionCode.QueryHeartBeat.getCode();
    String payloadLength = "0002";
    String payload = "FFFF";
    String frame = functionCode + payloadLength + payload;
    return MQTTConnectTypeEnum.SYNCHRONIZATION.getCode() + frame.toUpperCase() + CRC32Utils.getCRC32(frame.toUpperCase());
}
    public String getEncodeFrame() {
        String functionCode = AtmoFunctionCode.QueryHeartBeat.getCode();
        String payloadLength = "0002";
        String payload = "FFFF";
        String frame = functionCode + payloadLength + payload;
        return MQTTConnectTypeEnum.SYNCHRONIZATION.getCode() + frame.toUpperCase() + CRC32Utils.getCRC32(frame.toUpperCase());
    }

}

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

@@ -7,6 +7,8 @@
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;

@Data
public class PlayPlanParam {
@@ -31,37 +33,37 @@
    /**
     * æ—¥æœŸèŒƒå›´/开
     */
    @NotEmpty

    private String startDate;

    /**
     * æ—¥æœŸèŒƒå›´/关
     */
    @NotEmpty

    private String endDate;

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

    @TableField(typeHandler = JsonIntegerArrayTypeHandler.class)
    private Integer[] weekDays;

    /**
     * schedule实体
     */
    private String schedule;
    private Map schedule;

    /**
     * å¼€æ’­æ—¶é—´
     */
    @NotEmpty

    private String startTime;

    /**
     * ä¸‹æ’­æ—¶é—´
     */
    @NotEmpty

    private String endTime;
}


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

@@ -7,13 +7,12 @@
import com.sandu.ximon.admin.config.VnnoxConstant;
import com.sandu.ximon.admin.param.PlayPlanParam;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.VnnoxAPIUtil;
import com.sandu.ximon.admin.utils.VnnoxProgramAPIUtil;
import com.sandu.ximon.admin.utils.request.PlayerProgram;
import com.sandu.ximon.admin.utils.response.VnnoxResult;
import com.sandu.ximon.admin.utils.response.VnnoxResultResponse;
import com.sandu.ximon.dao.domain.BroadcastV2TaskTerminal;
import com.sandu.ximon.dao.domain.LedPlayerEntity;
import com.sandu.ximon.dao.domain.PlayPlanNv;
import com.sandu.ximon.dao.domain.PushToLed;
import com.sandu.ximon.dao.domain.*;
import com.sandu.ximon.dao.enums.AdministratorEnums;
import com.sandu.ximon.dao.mapper.PlayPlanNvMapper;
import lombok.AllArgsConstructor;
@@ -32,6 +31,8 @@
    private final PlayPlanNvMapper playPlanMapper;
    private final VnnoxProgramAPIUtil vnnoxProgramAPIUtil;
    private final LedPlayerEntityService ledPlayerEntityService;
    private VnnoxAPIUtil vnnoxAPIUtil;
    private final LEDProgramService ledProgramService;

    public boolean addPlan(PlayPlanParam playPlanParam) {

@@ -40,17 +41,22 @@
            playPlan.setUserId(SecurityUtils.getUserId());
        }
        playPlan.setName(playPlanParam.getName());
       /* playPlan.setLedProgramName(playPlanParam.getLedProgramName());
        playPlan.setLedProgramName(playPlanParam.getLedProgramName());
        LEDProgram byId = ledProgramService.getById(playPlanParam.getLedProgramId());
        if(byId==null){
            throw new BusinessException("ledProgramId有误,未找到该节目");
        }
        playPlan.setLedProgramId(playPlanParam.getLedProgramId());
        playPlan.setVolume(playPlanParam.getVolume());
        playPlan.setApplySeries(playPlanParam.getApplySeries());
        playPlan.setStartDate(playPlanParam.getStartDate());
        playPlan.setEndDate(playPlanParam.getEndDate());
        playPlan.setWeekDays(playPlanParam.getWeekDays());
        playPlan.setSchedule(playPlanParam.getSchedule());
        playPlan.setSchedule(JSON.toJSONString(playPlanParam.getSchedule()));
        playPlan.setStartTime(playPlanParam.getStartTime());
        playPlan.setEndTime(playPlanParam.getEndTime());*/
        BeanUtils.copyProperties(playPlanParam, playPlan);
        playPlan.setEndTime(playPlanParam.getEndTime());
      //  BeanUtils.copyProperties(playPlanParam, playPlan);


        return save(playPlan);

@@ -71,7 +77,7 @@
        playPlan.setStartDate(playPlanParam.getStartDate());
        playPlan.setEndDate(playPlanParam.getEndDate());
        playPlan.setWeekDays(playPlanParam.getWeekDays());
        playPlan.setSchedule(playPlanParam.getSchedule());
        playPlan.setSchedule(JSON.toJSONString(playPlanParam.getSchedule()));
        playPlan.setStartTime(playPlanParam.getStartTime());
        playPlan.setEndTime(playPlanParam.getEndTime());

@@ -92,6 +98,7 @@
    public Map<String, Object> pushToLed(Long planId,List<String> playerIds){
//    public PlayerProgram pushToLed(Long planId){
        PushToLed pushToLed = playPlanMapper.pushToLed(planId);
        PlayPlanNv one =getOne(Wrappers.lambdaQuery(PlayPlanNv.class).eq(PlayPlanNv::getId, planId));
        if(pushToLed==null){
            throw new BusinessException("未找到该播放计划");
        }
@@ -114,9 +121,27 @@
        push.put("noticeUrl", VnnoxConstant.SCREEN_SHOT_NOTIFY_URL);
*/
        VnnoxResultResponse vnnoxResultResponse = vnnoxProgramAPIUtil.normalProgram(program);
       // VnnoxResultResponse vnnoxResultResponse = vnnoxProgramAPIUtil.normalProgram(push);
        List<String> success = vnnoxResultResponse.getData().getSuccess();
        List<String> fail = vnnoxResultResponse.getData().getFail();
        VnnoxResult vnnoxResult = vnnoxAPIUtil.volChange(playerIds, Integer.valueOf(one.getVolume()).intValue());

        // VnnoxResultResponse vnnoxResultResponse = vnnoxProgramAPIUtil.normalProgram(push);
        List<String> success=new ArrayList<>();
        List<String> fail= new ArrayList<>();
//        List<String> success=new ArrayList<>();
//        if(vnnoxResultResponse.getData().getSuccess()!=null&&vnnoxResultResponse.getData()!=null){
//            success = vnnoxResultResponse.getData().getSuccess();
//        }
//        //success.addAll(vnnoxResult.getSuccess());

//        if(vnnoxResultResponse.getData().getFail()!=null&vnnoxResultResponse.getData()!=null){
//            fail= vnnoxResultResponse.getData().getFail();
//        }
        if(vnnoxResultResponse.getData()!=null){
            success = vnnoxResultResponse.getData().getSuccess();
            fail= vnnoxResultResponse.getData().getFail();
        }


       // fail.addAll(vnnoxResult.getFail());
        Map<String,Object> result=new HashMap<>();
        List<LedPlayerEntity> successList= new ArrayList<>();
        List<LedPlayerEntity> faileList= new ArrayList<>();
@@ -127,6 +152,7 @@
            faileList.add( ledPlayerEntityService.getByPlayerId(playerId));
        }


        result.put("success",successList);
        result.put("fail",faileList);