操作记录

zhanzhiqin

2022-05-16 60b9e637d693f8d1c3a5dee7cfb8ff8575bf5dac

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

@@ -13,6 +13,7 @@
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.dto.LightTaskDto;
import com.sandu.ximon.admin.dto.SingleLightOrderDto;
import com.sandu.ximon.admin.manager.iot.frame.FrameBuilder;
@@ -26,8 +27,10 @@
import com.sandu.ximon.admin.param.LightTaskIssueParam;
import com.sandu.ximon.admin.param.LightTaskParam;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.admin.utils.TaskOrderUtil;
import com.sandu.ximon.dao.bo.LightTaskStatusAndPole;
import com.sandu.ximon.dao.domain.Light;
import com.sandu.ximon.dao.domain.LightTask;
import com.sandu.ximon.dao.domain.LightTaskPoleRelation;
import com.sandu.ximon.dao.domain.Pole;
@@ -80,11 +83,24 @@
        lightTask.setOpenOrder(param.getOpenOrder());
        lightTask.setControlOrder(param.getControlOrder());
        lightTask.setCreateUser(SecurityUtils.getUsername());
        lightTask.setFramePayload(buildControlFramePayload(param.getOpenOrder(), param.getCloseOrder(), param.getControlOrder(), week));
        String framePayload = buildControlFramePayload(param.getOpenOrder(), param.getCloseOrder(), param.getControlOrder(), week);
        lightTask.setFramePayload(framePayload);
        if (!save(lightTask)) {
            throw new BusinessException("保存路灯任务失败");
        }

        List<Pole> poleList = SpringContextHolder.getBean(PoleService.class).listByIds(param.getPoleIdList());

//        SpringContextHolder.getBean(LightService.class).list(Wrappers.lambdaQuery(Light.class).eq(Light::getDeviceCode, poleList.st)param.getPoleIdList());
        String content = "{任务ID：" + lightTask.getTaskId()
                + "， 任务名：" + lightTask.getTaskName()
                + "}，{内帧指令" + lightTask.getFramePayload()
                + "， 灯杆ID：" + param.getPoleIdList().toString()
                + "， 控制的灯头地址：" + param.getLightAddress()
                + " }";
        StoreOperationRecordsUtils.storeOperationData(null, null, "新增路灯任务", content, null);


        List<Long> poleIdList = param.getPoleIdList();
        if (CollectionUtil.isNotEmpty(poleIdList)) {