diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/dto/OceanDetailDTO.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/dto/OceanDetailDTO.java index f21945c..3e26f04 100644 --- a/casic-environment/src/main/java/com/casic/missiles/modular/system/dto/OceanDetailDTO.java +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/dto/OceanDetailDTO.java @@ -2,6 +2,7 @@ import com.casic.missiles.modular.system.dto.remote.OceanDetailModel; import lombok.Data; +import lombok.NoArgsConstructor; import java.text.DecimalFormat; @@ -9,6 +10,7 @@ * @author a203 */ @Data +@NoArgsConstructor public class OceanDetailDTO { /** diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/dto/OceanDetailDTO.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/dto/OceanDetailDTO.java index f21945c..3e26f04 100644 --- a/casic-environment/src/main/java/com/casic/missiles/modular/system/dto/OceanDetailDTO.java +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/dto/OceanDetailDTO.java @@ -2,6 +2,7 @@ import com.casic.missiles.modular.system.dto.remote.OceanDetailModel; import lombok.Data; +import lombok.NoArgsConstructor; import java.text.DecimalFormat; @@ -9,6 +10,7 @@ * @author a203 */ @Data +@NoArgsConstructor public class OceanDetailDTO { /** diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/OceanServiceImpl.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/OceanServiceImpl.java index 58fce60..ca706e5 100644 --- a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/OceanServiceImpl.java +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/OceanServiceImpl.java @@ -9,6 +9,7 @@ import com.casic.missiles.modular.system.service.IOceanService; import com.casic.missiles.modular.system.utils.Constant; import com.casic.missiles.modular.system.utils.HttpRequestHelper; +import com.casic.missiles.modular.system.utils.TimeUtil; import org.springframework.stereotype.Service; /** @@ -33,15 +34,18 @@ if (envIp.contains(Constant.HTTP_HEADER)) { envIp = envIp.replace(Constant.HTTP_HEADER, ""); } + + //需要转为UTC时间 + String[] utcTime = TimeUtil.getUTCTime(date, hour); String url = Constant.HTTP_HEADER + envIp + "/environment/ocean?" + "lng=" + lng + "&lat=" + lat + - "&date=" + date + "&days=" + days + "&hour=" + hour; + "&date=" + utcTime[0] + "&days=" + days + "&hour=" + utcTime[1]; String oceanData = HttpRequestHelper.doGet(url); /** * 解析洋流数据返回给前端 * */ - OceanDetailDTO oceanDetailDTO = null; + OceanDetailDTO oceanDetailDTO = new OceanDetailDTO(); if (HttpRequestHelper.SUCCESS_CODE == HttpRequestHelper.getResponseCode(oceanData)) { OceanDetailModel remoteData = JSON.parseObject(oceanData, new TypeReference() { }); diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/dto/OceanDetailDTO.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/dto/OceanDetailDTO.java index f21945c..3e26f04 100644 --- a/casic-environment/src/main/java/com/casic/missiles/modular/system/dto/OceanDetailDTO.java +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/dto/OceanDetailDTO.java @@ -2,6 +2,7 @@ import com.casic.missiles.modular.system.dto.remote.OceanDetailModel; import lombok.Data; +import lombok.NoArgsConstructor; import java.text.DecimalFormat; @@ -9,6 +10,7 @@ * @author a203 */ @Data +@NoArgsConstructor public class OceanDetailDTO { /** diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/OceanServiceImpl.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/OceanServiceImpl.java index 58fce60..ca706e5 100644 --- a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/OceanServiceImpl.java +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/OceanServiceImpl.java @@ -9,6 +9,7 @@ import com.casic.missiles.modular.system.service.IOceanService; import com.casic.missiles.modular.system.utils.Constant; import com.casic.missiles.modular.system.utils.HttpRequestHelper; +import com.casic.missiles.modular.system.utils.TimeUtil; import org.springframework.stereotype.Service; /** @@ -33,15 +34,18 @@ if (envIp.contains(Constant.HTTP_HEADER)) { envIp = envIp.replace(Constant.HTTP_HEADER, ""); } + + //需要转为UTC时间 + String[] utcTime = TimeUtil.getUTCTime(date, hour); String url = Constant.HTTP_HEADER + envIp + "/environment/ocean?" + "lng=" + lng + "&lat=" + lat + - "&date=" + date + "&days=" + days + "&hour=" + hour; + "&date=" + utcTime[0] + "&days=" + days + "&hour=" + utcTime[1]; String oceanData = HttpRequestHelper.doGet(url); /** * 解析洋流数据返回给前端 * */ - OceanDetailDTO oceanDetailDTO = null; + OceanDetailDTO oceanDetailDTO = new OceanDetailDTO(); if (HttpRequestHelper.SUCCESS_CODE == HttpRequestHelper.getResponseCode(oceanData)) { OceanDetailModel remoteData = JSON.parseObject(oceanData, new TypeReference() { }); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/utils/TimeUtil.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/utils/TimeUtil.java index 88e19f0..7d2ed45 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/utils/TimeUtil.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/utils/TimeUtil.java @@ -4,15 +4,36 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.Locale; +import java.util.TimeZone; /** * @author a203 */ public class TimeUtil { + static final SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH"); + static final SimpleDateFormat UTC_SDF = new SimpleDateFormat("yyyy-MM-dd HH"); static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA); static final SimpleDateFormat TIME_FORMAT = new SimpleDateFormat("yyyyMMddHHmmss", Locale.CHINA); + public static String[] getUTCTime(String date, String hour) { + String[] utc = new String[2]; + String time = date + " " + hour; + synchronized (UTC_SDF) { + UTC_SDF.setTimeZone(TimeZone.getTimeZone("UTC")); + try { + Date d = SDF.parse(time); + String format = UTC_SDF.format(d); + String[] split = format.split(" "); + utc[0] = split[0]; + utc[1] = split[1]; + } catch (ParseException e) { + e.printStackTrace(); + } + return utc; + } + } + public static String getCurrentTime() { synchronized (DATE_FORMAT) { return DATE_FORMAT.format(new Date()); diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/dto/OceanDetailDTO.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/dto/OceanDetailDTO.java index f21945c..3e26f04 100644 --- a/casic-environment/src/main/java/com/casic/missiles/modular/system/dto/OceanDetailDTO.java +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/dto/OceanDetailDTO.java @@ -2,6 +2,7 @@ import com.casic.missiles.modular.system.dto.remote.OceanDetailModel; import lombok.Data; +import lombok.NoArgsConstructor; import java.text.DecimalFormat; @@ -9,6 +10,7 @@ * @author a203 */ @Data +@NoArgsConstructor public class OceanDetailDTO { /** diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/OceanServiceImpl.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/OceanServiceImpl.java index 58fce60..ca706e5 100644 --- a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/OceanServiceImpl.java +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/OceanServiceImpl.java @@ -9,6 +9,7 @@ import com.casic.missiles.modular.system.service.IOceanService; import com.casic.missiles.modular.system.utils.Constant; import com.casic.missiles.modular.system.utils.HttpRequestHelper; +import com.casic.missiles.modular.system.utils.TimeUtil; import org.springframework.stereotype.Service; /** @@ -33,15 +34,18 @@ if (envIp.contains(Constant.HTTP_HEADER)) { envIp = envIp.replace(Constant.HTTP_HEADER, ""); } + + //需要转为UTC时间 + String[] utcTime = TimeUtil.getUTCTime(date, hour); String url = Constant.HTTP_HEADER + envIp + "/environment/ocean?" + "lng=" + lng + "&lat=" + lat + - "&date=" + date + "&days=" + days + "&hour=" + hour; + "&date=" + utcTime[0] + "&days=" + days + "&hour=" + utcTime[1]; String oceanData = HttpRequestHelper.doGet(url); /** * 解析洋流数据返回给前端 * */ - OceanDetailDTO oceanDetailDTO = null; + OceanDetailDTO oceanDetailDTO = new OceanDetailDTO(); if (HttpRequestHelper.SUCCESS_CODE == HttpRequestHelper.getResponseCode(oceanData)) { OceanDetailModel remoteData = JSON.parseObject(oceanData, new TypeReference() { }); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/utils/TimeUtil.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/utils/TimeUtil.java index 88e19f0..7d2ed45 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/utils/TimeUtil.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/utils/TimeUtil.java @@ -4,15 +4,36 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.Locale; +import java.util.TimeZone; /** * @author a203 */ public class TimeUtil { + static final SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH"); + static final SimpleDateFormat UTC_SDF = new SimpleDateFormat("yyyy-MM-dd HH"); static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA); static final SimpleDateFormat TIME_FORMAT = new SimpleDateFormat("yyyyMMddHHmmss", Locale.CHINA); + public static String[] getUTCTime(String date, String hour) { + String[] utc = new String[2]; + String time = date + " " + hour; + synchronized (UTC_SDF) { + UTC_SDF.setTimeZone(TimeZone.getTimeZone("UTC")); + try { + Date d = SDF.parse(time); + String format = UTC_SDF.format(d); + String[] split = format.split(" "); + utc[0] = split[0]; + utc[1] = split[1]; + } catch (ParseException e) { + e.printStackTrace(); + } + return utc; + } + } + public static String getCurrentTime() { synchronized (DATE_FORMAT) { return DATE_FORMAT.format(new Date()); diff --git a/casic-shelter/src/main/java/com/casic/missiles/modular/system/utils/DecodeData.java b/casic-shelter/src/main/java/com/casic/missiles/modular/system/utils/DecodeData.java index 6621918..646d605 100644 --- a/casic-shelter/src/main/java/com/casic/missiles/modular/system/utils/DecodeData.java +++ b/casic-shelter/src/main/java/com/casic/missiles/modular/system/utils/DecodeData.java @@ -533,8 +533,8 @@ * 目标频率转换算法 */ private static String covertTargetHertz(byte[] bytes) { - return ((bytes[0] & 0xFF) << 8) + - (bytes[1] & 0xFF) + "hz"; + int value = ((bytes[0] & 0xFF) << 8) + (bytes[1] & 0xFF); + return String.valueOf(value); } /** diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/dto/OceanDetailDTO.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/dto/OceanDetailDTO.java index f21945c..3e26f04 100644 --- a/casic-environment/src/main/java/com/casic/missiles/modular/system/dto/OceanDetailDTO.java +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/dto/OceanDetailDTO.java @@ -2,6 +2,7 @@ import com.casic.missiles.modular.system.dto.remote.OceanDetailModel; import lombok.Data; +import lombok.NoArgsConstructor; import java.text.DecimalFormat; @@ -9,6 +10,7 @@ * @author a203 */ @Data +@NoArgsConstructor public class OceanDetailDTO { /** diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/OceanServiceImpl.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/OceanServiceImpl.java index 58fce60..ca706e5 100644 --- a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/OceanServiceImpl.java +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/OceanServiceImpl.java @@ -9,6 +9,7 @@ import com.casic.missiles.modular.system.service.IOceanService; import com.casic.missiles.modular.system.utils.Constant; import com.casic.missiles.modular.system.utils.HttpRequestHelper; +import com.casic.missiles.modular.system.utils.TimeUtil; import org.springframework.stereotype.Service; /** @@ -33,15 +34,18 @@ if (envIp.contains(Constant.HTTP_HEADER)) { envIp = envIp.replace(Constant.HTTP_HEADER, ""); } + + //需要转为UTC时间 + String[] utcTime = TimeUtil.getUTCTime(date, hour); String url = Constant.HTTP_HEADER + envIp + "/environment/ocean?" + "lng=" + lng + "&lat=" + lat + - "&date=" + date + "&days=" + days + "&hour=" + hour; + "&date=" + utcTime[0] + "&days=" + days + "&hour=" + utcTime[1]; String oceanData = HttpRequestHelper.doGet(url); /** * 解析洋流数据返回给前端 * */ - OceanDetailDTO oceanDetailDTO = null; + OceanDetailDTO oceanDetailDTO = new OceanDetailDTO(); if (HttpRequestHelper.SUCCESS_CODE == HttpRequestHelper.getResponseCode(oceanData)) { OceanDetailModel remoteData = JSON.parseObject(oceanData, new TypeReference() { }); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/utils/TimeUtil.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/utils/TimeUtil.java index 88e19f0..7d2ed45 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/utils/TimeUtil.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/utils/TimeUtil.java @@ -4,15 +4,36 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.Locale; +import java.util.TimeZone; /** * @author a203 */ public class TimeUtil { + static final SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH"); + static final SimpleDateFormat UTC_SDF = new SimpleDateFormat("yyyy-MM-dd HH"); static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA); static final SimpleDateFormat TIME_FORMAT = new SimpleDateFormat("yyyyMMddHHmmss", Locale.CHINA); + public static String[] getUTCTime(String date, String hour) { + String[] utc = new String[2]; + String time = date + " " + hour; + synchronized (UTC_SDF) { + UTC_SDF.setTimeZone(TimeZone.getTimeZone("UTC")); + try { + Date d = SDF.parse(time); + String format = UTC_SDF.format(d); + String[] split = format.split(" "); + utc[0] = split[0]; + utc[1] = split[1]; + } catch (ParseException e) { + e.printStackTrace(); + } + return utc; + } + } + public static String getCurrentTime() { synchronized (DATE_FORMAT) { return DATE_FORMAT.format(new Date()); diff --git a/casic-shelter/src/main/java/com/casic/missiles/modular/system/utils/DecodeData.java b/casic-shelter/src/main/java/com/casic/missiles/modular/system/utils/DecodeData.java index 6621918..646d605 100644 --- a/casic-shelter/src/main/java/com/casic/missiles/modular/system/utils/DecodeData.java +++ b/casic-shelter/src/main/java/com/casic/missiles/modular/system/utils/DecodeData.java @@ -533,8 +533,8 @@ * 目标频率转换算法 */ private static String covertTargetHertz(byte[] bytes) { - return ((bytes[0] & 0xFF) << 8) + - (bytes[1] & 0xFF) + "hz"; + int value = ((bytes[0] & 0xFF) << 8) + (bytes[1] & 0xFF); + return String.valueOf(value); } /** diff --git a/casic-shelter/src/main/java/com/casic/missiles/socket/service/impl/SocketServiceImpl.java b/casic-shelter/src/main/java/com/casic/missiles/socket/service/impl/SocketServiceImpl.java index d773f24..cc1de20 100644 --- a/casic-shelter/src/main/java/com/casic/missiles/socket/service/impl/SocketServiceImpl.java +++ b/casic-shelter/src/main/java/com/casic/missiles/socket/service/impl/SocketServiceImpl.java @@ -167,7 +167,7 @@ switch (type) { case 0x01: //读取北斗/GPS位置信息 - saveDataLog(2, "", "GPS,V", "0"); + saveDataLog(2, "", "GPS,V", "1"); sendToSocket("GPS,V"); break; case 0x02: @@ -198,16 +198,16 @@ } byte[] decrypt = TEA.decrypt(bytes); String message = new String(decrypt); - saveDataLog(2, "", message, "0"); + saveDataLog(2, "", message, "1"); sendToSocket(message); break; case 0x03: //数据发送成功 - saveDataLog(2, "", "SEND DATA SUCCESS!", "0"); + saveDataLog(2, "", "SEND DATA SUCCESS!", "1"); break; case 0x04: //数据发送失败 - saveDataLog(2, "", "SEND DATA ERROR!", "0"); + saveDataLog(2, "", "SEND DATA ERROR!", "1"); sendToSocket("SEND DATA ERROR!"); break; case 0x05: @@ -218,7 +218,7 @@ break; } } else { - saveDataLog(2, "", new String(data), "0"); + saveDataLog(2, "", new String(data), "1"); log.info(new String(data)); } } @@ -226,9 +226,9 @@ private void sendToSocket(String value) { if (channelHandler != null) { channelHandler.writeAndFlush(value); - saveDataLog(1, "", value, "0"); - } else { saveDataLog(1, "", value, "1"); + } else { + saveDataLog(1, "", value, "0"); } } @@ -288,7 +288,7 @@ switch (dataType) { case 0x01: RobotInfo robotInfo = DecodeData.decodeRobotInfo(data); - saveDataLog(0, String.valueOf(robotId), robotInfo, "0"); + saveDataLog(0, String.valueOf(robotId), robotInfo, "1"); robotService.save(robotInfo); break; case 0x02: @@ -297,7 +297,7 @@ switch (planType) { case 0x01: String robotRegion = DecodeData.decodeRobotRegion(data); - saveDataLog(0, String.valueOf(robotId), robotRegion, "0"); + saveDataLog(0, String.valueOf(robotId), robotRegion, "1"); RegionPlan regionPlan = new RegionPlan(); regionPlan.setPlanTime(TimeUtil.getCurrentTime()); regionPlan.setRegionResult(robotRegion); @@ -305,7 +305,7 @@ break; case 0x02: String robotRoute = DecodeData.decodeRobotRoute(data); - saveDataLog(0, String.valueOf(robotId), robotRoute, "0"); + saveDataLog(0, String.valueOf(robotId), robotRoute, "1"); RoutePlan routePlan = new RoutePlan(); routePlan.setRobotId(robotId); routePlan.setPlanTime(TimeUtil.getCurrentTime()); @@ -325,41 +325,41 @@ switch (taskType) { case 0x01: String directedTask = DecodeData.decodeDirectedTask(data); - saveDataLog(0, String.valueOf(robotId), directedTask, "0"); + saveDataLog(0, String.valueOf(robotId), directedTask, "1"); task.setTaskType("1"); task.setTaskData(directedTask); taskService.save(task); break; case 0x02: String routeTask = DecodeData.decodeTaskRoute(data); - saveDataLog(0, String.valueOf(robotId), routeTask, "0"); + saveDataLog(0, String.valueOf(robotId), routeTask, "1"); task.setTaskType("2"); task.setTaskData(routeTask); taskService.save(task); break; case 0x03: String flightTask = DecodeData.decodeDirectFlightTask(data); - saveDataLog(0, String.valueOf(robotId), flightTask, "0"); + saveDataLog(0, String.valueOf(robotId), flightTask, "1"); task.setTaskType("3"); task.setTaskData(flightTask); taskService.save(task); break; case 0x04: String resideTask = DecodeData.decodeResideTask(data); - saveDataLog(0, String.valueOf(robotId), resideTask, "0"); + saveDataLog(0, String.valueOf(robotId), resideTask, "1"); task.setTaskType("4"); task.setTaskData(resideTask); taskService.save(task); break; case 0x05: String putTask = DecodeData.decodePutTask(data); - saveDataLog(0, String.valueOf(robotId), putTask, "0"); + saveDataLog(0, String.valueOf(robotId), putTask, "1"); task.setTaskType("5"); task.setTaskData(putTask); taskService.save(task); break; case 0x0F: - saveDataLog(0, String.valueOf(robotId), "任务终止", "0"); + saveDataLog(0, String.valueOf(robotId), "任务终止", "1"); taskService.updateTaskById(robotId); break; default: @@ -373,7 +373,7 @@ * 方舱通过Socket发送短信给203后台，然后203后台将短信内容加密之后用卫星发送给203自己的岸基软件，然后解密之后再传给西工大岸基软件 * */ String sms = DecodeData.decodeSMS(data); - saveDataLog(0, String.valueOf(robotId), sms, "0"); + saveDataLog(0, String.valueOf(robotId), sms, "1"); byte[] bytes; if (sms.startsWith("*") || sms.startsWith("?")) { @@ -395,12 +395,12 @@ } if (serialPort != null && serialPort.isConnected()) { SerialPortManager.sendToPort(serialPort, bytes); - saveDataLog(3, String.valueOf(robotId), sms, "0"); + saveDataLog(3, String.valueOf(robotId), sms, "1"); } break; case 0x05: String envRequest = DecodeData.decodeEnvRequest(data); - saveDataLog(0, String.valueOf(robotId), envRequest, "0"); + saveDataLog(0, String.valueOf(robotId), envRequest, "1"); //{"hour":"12","lng":109.32222199129043,"lat":17.39223199775081} JSONObject envJsonObject = JSON.parseObject(envRequest); @@ -442,11 +442,11 @@ objectMap = EncodeData.encodeEnvironment(envLng, envLat, detailDTO, oceanDetail); } ctx.writeAndFlush(JSON.toJSONString(objectMap)); - saveDataLog(1, String.valueOf(robotId), objectMap, "0"); + saveDataLog(1, String.valueOf(robotId), objectMap, "1"); break; case 0x06: String aisRequest = DecodeData.decodeAISRequest(data); - saveDataLog(0, String.valueOf(robotId), aisRequest, "0"); + saveDataLog(0, String.valueOf(robotId), aisRequest, "1"); //{"radius":50,"lng":109.32219994688509,"lat":17.392199978880676,"age":30} JSONObject aisJsonObject = JSON.parseObject(aisRequest); @@ -474,11 +474,11 @@ List ships = shipService.shipsInCircle(requestValue, age); Map map = EncodeData.encodeAIS(aisLng, aisLat, ships); ctx.writeAndFlush(JSON.toJSONString(map)); - saveDataLog(1, String.valueOf(robotId), map, "0"); + saveDataLog(1, String.valueOf(robotId), map, "1"); break; case 0x07: ShelterPosition shelterPosition = DecodeData.decodeShelterPosition(data); - saveDataLog(0, String.valueOf(robotId), shelterPosition, "0"); + saveDataLog(0, String.valueOf(robotId), shelterPosition, "1"); shelterPositionService.save(shelterPosition); //方舱经纬度推送到前端 WebSocketDTO dto = new WebSocketDTO();