Commit 6472bbf3 authored by duanruiming's avatar duanruiming

[update] 海康灯态添加时间戳;方案开始时间设置为海康周期开始时间

parent 618de02c
package net.wanji.utc.service.runninginfo.impl; package net.wanji.utc.service.runninginfo.impl;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
...@@ -7,13 +8,17 @@ import com.hikvision.artemis.sdk.ArtemisHttpUtil; ...@@ -7,13 +8,17 @@ import com.hikvision.artemis.sdk.ArtemisHttpUtil;
import com.hikvision.artemis.sdk.config.ArtemisConfig; import com.hikvision.artemis.sdk.config.ArtemisConfig;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.wanji.databus.dao.entity.*; import net.wanji.databus.dao.entity.CrossLightsPO;
import net.wanji.databus.dao.entity.CrossPhaseLightsPO;
import net.wanji.databus.dao.entity.CrossPhasePO;
import net.wanji.databus.dao.entity.CrossSchemePO;
import net.wanji.databus.dao.mapper.*; import net.wanji.databus.dao.mapper.*;
import net.wanji.databus.po.CrossInfoPO; import net.wanji.databus.po.CrossInfoPO;
import net.wanji.databus.po.ManufacturerInfoPO; import net.wanji.databus.po.ManufacturerInfoPO;
import net.wanji.databus.vo.BaseCrossInfo; import net.wanji.databus.vo.BaseCrossInfo;
import net.wanji.databus.vo.LightsStatusVO; import net.wanji.databus.vo.LightsStatusVO;
import net.wanji.utc.common.constant.Constants; import net.wanji.utc.common.constant.Constants;
import net.wanji.utc.common.typeenum.DateStyle;
import net.wanji.utc.po.hk.request.HKRequest; import net.wanji.utc.po.hk.request.HKRequest;
import net.wanji.utc.po.hk.request.RealTimeStateInfoQueryPO; import net.wanji.utc.po.hk.request.RealTimeStateInfoQueryPO;
import net.wanji.utc.po.hk.response.*; import net.wanji.utc.po.hk.response.*;
...@@ -23,6 +28,7 @@ import net.wanji.utc.util.StringUtils; ...@@ -23,6 +28,7 @@ import net.wanji.utc.util.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.time.LocalDateTime;
import java.util.*; import java.util.*;
/** /**
...@@ -175,6 +181,12 @@ public class HkLightsStatusServiceImpl implements HkLightsStatusService { ...@@ -175,6 +181,12 @@ public class HkLightsStatusServiceImpl implements HkLightsStatusService {
} }
} }
infoVo.setDirLampGroupMap(dirLampGroupMap); infoVo.setDirLampGroupMap(dirLampGroupMap);
Date date = new Date();
String timeStamp = String.valueOf(Long.valueOf(date.getTime()));
infoVo.setTimeStamp(timeStamp);
LocalDateTime cycleBeginTime = resultPO.getCycleBeginTime(); // 周期开始时间
String schemeStartTime = DateUtil.format(cycleBeginTime, DateStyle.YYYYMMDDHHMMSS.getValue());
infoVo.setSchemeStartTime(schemeStartTime);
} }
result.add(infoVo); result.add(infoVo);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment