diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java index 6889c728b..93cb610ff 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java @@ -19,7 +19,7 @@ import java.util.Set; /** * bms财务结算系统feign调用接口 */ -@FeignClient(contextId = "BmsService", value = ServiceNameConstants.BMS_SERVICE, url = "http://10.33.0.109:8012",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "BmsService", value = ServiceNameConstants.BMS_SERVICE, url = "http://10.102.192.32:8012",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class) public interface BmsServiceFeign { diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java index 8a7006304..4ef3bed80 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestBody; import java.util.List; import java.util.concurrent.CompletableFuture; -@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE,url = "http://10.33.0.99:8017",fallbackFactory = RemoteOmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE,url = "http://10.102.192.33:8017",fallbackFactory = RemoteOmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class) public interface OmsServiceFeign { diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java index ba9a45148..d976fcc98 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java @@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; import java.util.Map; -@FeignClient(contextId = "commonWlhyServiceFeign",value = ServiceNameConstants.WLHY_SERVICE,url = "http://10.33.0.129:8014",configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "commonWlhyServiceFeign",value = ServiceNameConstants.WLHY_SERVICE,url = "http://10.102.192.31:8014",configuration = FeignAutoConfiguration.class) public interface WlhyServiceFeign { /** diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java index 22be78474..9abf9225f 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java @@ -21,7 +21,7 @@ import java.util.Map; * @description: TODO * @date 2024/5/10 8:58 **/ -@FeignClient(contextId = "remoteWmsServiceFeign",value = ServiceNameConstants.WMS_SERVICE, url = "http://10.33.0.109:8016",fallbackFactory = RemoteWmsFallbackFactory.class, configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "remoteWmsServiceFeign",value = ServiceNameConstants.WMS_SERVICE, url = "http://10.102.192.32:8016",fallbackFactory = RemoteWmsFallbackFactory.class, configuration = FeignAutoConfiguration.class) public interface WmsServiceFeign { /** diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java index beba5b1af..750ed853e 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java @@ -9,7 +9,7 @@ import com.mhd.system.api.feign.FeignAutoConfiguration; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; -@FeignClient(contextId = "YmsService", value = ServiceNameConstants.YMS_SERVICE,url = "http://10.33.0.99:8018",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "YmsService", value = ServiceNameConstants.YMS_SERVICE,url = "http://10.102.192.33:8018",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class) public interface YmsServiceFeign { /** diff --git a/mhd-bi/src/main/java/com/mhd/bi/interfaces/facadeApi/biReport/vo/gps/NanqiGpsLocationVO.java b/mhd-bi/src/main/java/com/mhd/bi/interfaces/facadeApi/biReport/vo/gps/NanqiGpsLocationVO.java index 22e5fb32a..dda02cd12 100644 --- a/mhd-bi/src/main/java/com/mhd/bi/interfaces/facadeApi/biReport/vo/gps/NanqiGpsLocationVO.java +++ b/mhd-bi/src/main/java/com/mhd/bi/interfaces/facadeApi/biReport/vo/gps/NanqiGpsLocationVO.java @@ -39,6 +39,15 @@ public class NanqiGpsLocationVO implements Serializable { @ApiModelProperty("车队名称") private String teamName; + @ApiModelProperty("终端号") + private String tmnNo; + + @ApiModelProperty("消息序列号") + private String tmnKey; + + @ApiModelProperty("卡号") + private String simCard; + @ApiModelProperty("定位时间") private String time; @@ -48,18 +57,39 @@ public class NanqiGpsLocationVO implements Serializable { @ApiModelProperty("纬度(WGS84)") private BigDecimal lat; + @ApiModelProperty("百度经度") + private BigDecimal blng; + + @ApiModelProperty("百度纬度") + private BigDecimal blat; + + @ApiModelProperty("谷歌/高德经度") + private BigDecimal glng; + + @ApiModelProperty("谷歌/高德纬度") + private BigDecimal glat; + + @ApiModelProperty("海拔(米)") + private BigDecimal height; + @ApiModelProperty("速度(千米/小时)") private BigDecimal speed; @ApiModelProperty("方向 0~360") private String drct; + @ApiModelProperty("昨日平台总里程(千米)") + private String prevDayTotalMile; + @ApiModelProperty("平台总里程(千米)") private String mile; @ApiModelProperty("今日里程(千米)") private String preMile; + @ApiModelProperty("终端里程(千米)") + private String tmnMile; + @ApiModelProperty("定位信号:0无 弱<=3 中<=6 强>6") private String satl; @@ -81,12 +111,138 @@ public class NanqiGpsLocationVO implements Serializable { @ApiModelProperty("驾驶员电话") private String drvPhone; + @ApiModelProperty("车牌颜色") + private String plateColor; + @ApiModelProperty("车辆类型") private String carType; + @ApiModelProperty("地图图标") + private String icon; + + @ApiModelProperty("地图图标完整链接") + private String iconLink; + + @ApiModelProperty("是否上传自定义图片:true取上传图片 false取大图") + private String uploadFlag; + + @ApiModelProperty("大图片") + private String bigIcon; + + @ApiModelProperty("大图片完整链接") + private String bigIconLink; + + @ApiModelProperty("实时照片") + private String photoIcon; + + @ApiModelProperty("中文方向") + private String drctCn; + + @ApiModelProperty("今日行驶时长(秒)") + private String todayRun; + + @ApiModelProperty("行停时长") + private String runStopTime; + + @ApiModelProperty("行停时长(秒),排序时使用") + private String runStopTimeSecond; + + @ApiModelProperty("ACC时长") + private String accTime; + + @ApiModelProperty("ACC总时长") + private String totalAccTime; + + @ApiModelProperty("离线时长") + private String offLineTime; + + @ApiModelProperty("信号线(返回集合,每记录含name/value)") + private String sgnStts; + + @ApiModelProperty("提醒信息(返回集合,每记录含name/value)") + private String reminds; + + @ApiModelProperty("油量(返回集合,每记录含name/value)") + private String st1; + + @ApiModelProperty("载重(返回集合,每记录含name/value)") + private String st2; + + @ApiModelProperty("温度(返回集合,每记录含name/value)") + private String st3; + + @ApiModelProperty("湿度(返回集合,每记录含name/value)") + private String st4; + + @ApiModelProperty("水位(返回集合,每记录含name/value)") + private String st5; + @ApiModelProperty("服务到期状态:1已到期 0未到期") private String expState; @ApiModelProperty("服务期限") private String expTime; + + @ApiModelProperty("油量") + private String oil; + + @ApiModelProperty("定位附加项(JSON)") + private String protocols; + + @ApiModelProperty("扩展字段(JSON)") + private String exts; + + @ApiModelProperty("模拟量1") + private String moni1; + + @ApiModelProperty("模拟量2") + private String moni2; + + @ApiModelProperty("模拟量3") + private String moni3; + + @ApiModelProperty("模拟量4") + private String moni4; + + @ApiModelProperty("视频通道(JSON)") + private String videos; + + @ApiModelProperty("未处理报警类型名称(逗号分隔)") + private String alarms; + + @ApiModelProperty("未处理报警类型ID(逗号分隔)") + private String alarmTypeIds; + + @ApiModelProperty("终端型号") + private String tmnType; + + @ApiModelProperty("终端到期时间") + private String tmnExpirTime; + + @ApiModelProperty("视频设备报警id集合") + private String videoAlarmTypes; + + @ApiModelProperty("驾驶员登签姓名(卡号)") + private String driverSign; + + @ApiModelProperty("驾驶员登签电话号码") + private String driverSignPhone; + + @ApiModelProperty("驾驶员登签时间") + private String driverSignTime; + + @ApiModelProperty("驾驶员登签时长") + private String drvSignTimeLong; + + @ApiModelProperty("车辆基本状态(16进制位掩码)") + private String carStts; + + @ApiModelProperty("报警状态(16进制位掩码)") + private String alarmStts; + + @ApiModelProperty("协议版本") + private String prtcVer; + + @ApiModelProperty("接入端口") + private String tmnPort; } diff --git a/mhd-bi/src/main/resources/bootstrap.yml b/mhd-bi/src/main/resources/bootstrap.yml index fa1d95e1a..2572662c1 100644 --- a/mhd-bi/src/main/resources/bootstrap.yml +++ b/mhd-bi/src/main/resources/bootstrap.yml @@ -19,14 +19,14 @@ spring: # username: nacos # password: manhuoda@2023 #线上正式环境 - server-addr: 10.102.192.31:6848 + server-addr: 10.102.192.30:6848 username: nacos password: manhuoda@2023 config: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 # server-addr: 10.33.0.129:6010 - server-addr: 10.102.192.31:6848 + server-addr: 10.102.192.30:6848 username: nacos password: manhuoda@2023 #线上正式环境 diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/feign/ThirdPartyServiceFeign.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/feign/ThirdPartyServiceFeign.java index 89a3a6114..f2e3287de 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/feign/ThirdPartyServiceFeign.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/feign/ThirdPartyServiceFeign.java @@ -26,7 +26,7 @@ import java.io.InputStream; import java.util.List; import java.util.Map; -@FeignClient(value = "mhd-third-party-service",url = "http://10.33.0.129:8012",configuration = FeignAutoConfiguration.class) +@FeignClient(value = "mhd-third-party-service",url = "http://10.102.192.31:8012",configuration = FeignAutoConfiguration.class) public interface ThirdPartyServiceFeign { //查询当前组织所有三方接口信息 diff --git a/mhd_oms/src/main/java/com/mhd/oms/infrastructure/feign/ThirdPartyServiceFeign.java b/mhd_oms/src/main/java/com/mhd/oms/infrastructure/feign/ThirdPartyServiceFeign.java index 376500b1c..8c86ae1ad 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/infrastructure/feign/ThirdPartyServiceFeign.java +++ b/mhd_oms/src/main/java/com/mhd/oms/infrastructure/feign/ThirdPartyServiceFeign.java @@ -22,7 +22,7 @@ import java.util.Map; /** * 三方服务 Feign */ -@FeignClient(contextId = "thirdPartyServiceFeign",url = "http://10.33.0.129:8012", value = ServiceNameConstants.THIRDPARTY_CENTER, configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "thirdPartyServiceFeign",url = "http://10.102.192.31:8012", value = ServiceNameConstants.THIRDPARTY_CENTER, configuration = FeignAutoConfiguration.class) public interface ThirdPartyServiceFeign { //查询当前组织所有三方接口信息 diff --git a/mhd_oms/src/main/resources/bootstrap.yml b/mhd_oms/src/main/resources/bootstrap.yml index 88471e390..ee058f0f6 100644 --- a/mhd_oms/src/main/resources/bootstrap.yml +++ b/mhd_oms/src/main/resources/bootstrap.yml @@ -18,15 +18,15 @@ spring: discovery: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - server-addr: 10.33.0.129:6010 -# server-addr: 10.102.192.30:6848 +# server-addr: 10.33.0.129:6010 + server-addr: 10.102.192.30:6848 username: nacos password: manhuoda@2023 config: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - server-addr: 10.33.0.129:6010 -# server-addr: 10.102.192.30:6848 +# server-addr: 10.33.0.129:6010 + server-addr: 10.102.192.30:6848 username: nacos password: manhuoda@2023 #线上正式环境 diff --git a/mhd_thrid_party/src/main/java/com/linke/thirdParty/application/server/NanqiGpsApplicationService.java b/mhd_thrid_party/src/main/java/com/linke/thirdParty/application/server/NanqiGpsApplicationService.java index 3d5aa0741..09076feea 100644 --- a/mhd_thrid_party/src/main/java/com/linke/thirdParty/application/server/NanqiGpsApplicationService.java +++ b/mhd_thrid_party/src/main/java/com/linke/thirdParty/application/server/NanqiGpsApplicationService.java @@ -191,13 +191,23 @@ public class NanqiGpsApplicationService { vo.setCarName(loc.getString("carName")); vo.setTeamId(loc.getString("teamId")); vo.setTeamName(loc.getString("teamName")); + vo.setTmnNo(loc.getString("tmnNo")); + vo.setTmnKey(loc.getString("tmnKey")); + vo.setSimCard(loc.getString("simCard")); vo.setTime(loc.getString("time")); vo.setLng(loc.getBigDecimal("lng")); vo.setLat(loc.getBigDecimal("lat")); + vo.setBlng(loc.getBigDecimal("blng")); + vo.setBlat(loc.getBigDecimal("blat")); + vo.setGlng(loc.getBigDecimal("glng")); + vo.setGlat(loc.getBigDecimal("glat")); + vo.setHeight(loc.getBigDecimal("height")); vo.setSpeed(loc.getBigDecimal("speed")); vo.setDrct(loc.getString("drct")); + vo.setPrevDayTotalMile(loc.getString("prevDayTotalMile")); vo.setMile(loc.getString("mile")); vo.setPreMile(loc.getString("preMile")); + vo.setTmnMile(loc.getString("tmnMile")); vo.setSatl(loc.getString("satl")); vo.setSgn(loc.getString("sgn")); vo.setAddr(loc.getString("addr")); @@ -205,9 +215,51 @@ public class NanqiGpsApplicationService { vo.setStateCn(loc.getString("stateCn")); vo.setDrvName(loc.getString("drvName")); vo.setDrvPhone(loc.getString("drvPhone")); + vo.setPlateColor(loc.getString("plateColor")); vo.setCarType(loc.getString("carType")); + vo.setIcon(loc.getString("icon")); + vo.setIconLink(loc.getString("iconLink")); + vo.setUploadFlag(loc.getString("uploadFlag")); + vo.setBigIcon(loc.getString("bigIcon")); + vo.setBigIconLink(loc.getString("bigIconLink")); + vo.setPhotoIcon(loc.getString("photoIcon")); + vo.setDrctCn(loc.getString("drctCn")); + vo.setTodayRun(loc.getString("todayRun")); + vo.setRunStopTime(loc.getString("runStopTime")); + vo.setRunStopTimeSecond(loc.getString("runStopTimeSecond")); + vo.setAccTime(loc.getString("accTime")); + vo.setTotalAccTime(loc.getString("totalAccTime")); + vo.setOffLineTime(loc.getString("offLineTime")); + vo.setSgnStts(loc.getString("sgnStts")); + vo.setReminds(loc.getString("reminds")); + vo.setSt1(loc.getString("st1")); + vo.setSt2(loc.getString("st2")); + vo.setSt3(loc.getString("st3")); + vo.setSt4(loc.getString("st4")); + vo.setSt5(loc.getString("st5")); vo.setExpState(loc.getString("expState")); vo.setExpTime(loc.getString("expTime")); + vo.setOil(loc.getString("oil")); + vo.setProtocols(loc.getString("protocols")); + vo.setExts(loc.getString("exts")); + vo.setMoni1(loc.getString("moni1")); + vo.setMoni2(loc.getString("moni2")); + vo.setMoni3(loc.getString("moni3")); + vo.setMoni4(loc.getString("moni4")); + vo.setVideos(loc.getString("videos")); + vo.setAlarms(loc.getString("alarms")); + vo.setAlarmTypeIds(loc.getString("alarmTypeIds")); + vo.setTmnType(loc.getString("tmnType")); + vo.setTmnExpirTime(loc.getString("tmnExpirTime")); + vo.setVideoAlarmTypes(loc.getString("videoAlarmTypes")); + vo.setDriverSign(loc.getString("driverSign")); + vo.setDriverSignPhone(loc.getString("driverSignPhone")); + vo.setDriverSignTime(loc.getString("driverSignTime")); + vo.setDrvSignTimeLong(loc.getString("drvSignTimeLong")); + vo.setCarStts(loc.getString("carStts")); + vo.setAlarmStts(loc.getString("alarmStts")); + vo.setPrtcVer(loc.getString("prtcVer")); + vo.setTmnPort(loc.getString("tmnPort")); } return vo; } diff --git a/mhd_thrid_party/src/main/java/com/linke/thirdParty/interfaces/vo/gps/NanqiGpsLocationVO.java b/mhd_thrid_party/src/main/java/com/linke/thirdParty/interfaces/vo/gps/NanqiGpsLocationVO.java index 2dec12d35..9bf7c1dd6 100644 --- a/mhd_thrid_party/src/main/java/com/linke/thirdParty/interfaces/vo/gps/NanqiGpsLocationVO.java +++ b/mhd_thrid_party/src/main/java/com/linke/thirdParty/interfaces/vo/gps/NanqiGpsLocationVO.java @@ -8,7 +8,7 @@ import java.io.Serializable; import java.math.BigDecimal; /** - * 南岐GPS 车辆定位信息 VO(对应文档 表1 常用字段) + * 南岐GPS 车辆定位信息 VO(对应文档 表1 完整字段) * * @author mhd */ @@ -39,6 +39,15 @@ public class NanqiGpsLocationVO implements Serializable { @ApiModelProperty("车队名称") private String teamName; + @ApiModelProperty("终端号") + private String tmnNo; + + @ApiModelProperty("消息序列号") + private String tmnKey; + + @ApiModelProperty("卡号") + private String simCard; + @ApiModelProperty("定位时间") private String time; @@ -48,18 +57,39 @@ public class NanqiGpsLocationVO implements Serializable { @ApiModelProperty("纬度(WGS84)") private BigDecimal lat; + @ApiModelProperty("百度经度") + private BigDecimal blng; + + @ApiModelProperty("百度纬度") + private BigDecimal blat; + + @ApiModelProperty("谷歌/高德经度") + private BigDecimal glng; + + @ApiModelProperty("谷歌/高德纬度") + private BigDecimal glat; + + @ApiModelProperty("海拔(米)") + private BigDecimal height; + @ApiModelProperty("速度(千米/小时)") private BigDecimal speed; @ApiModelProperty("方向 0~360") private String drct; + @ApiModelProperty("昨日平台总里程(千米)") + private String prevDayTotalMile; + @ApiModelProperty("平台总里程(千米)") private String mile; @ApiModelProperty("今日里程(千米)") private String preMile; + @ApiModelProperty("终端里程(千米)") + private String tmnMile; + @ApiModelProperty("定位信号:0无 弱<=3 中<=6 强>6") private String satl; @@ -81,12 +111,138 @@ public class NanqiGpsLocationVO implements Serializable { @ApiModelProperty("驾驶员电话") private String drvPhone; + @ApiModelProperty("车牌颜色") + private String plateColor; + @ApiModelProperty("车辆类型") private String carType; + @ApiModelProperty("地图图标") + private String icon; + + @ApiModelProperty("地图图标完整链接") + private String iconLink; + + @ApiModelProperty("是否上传自定义图片:true取上传图片 false取大图") + private String uploadFlag; + + @ApiModelProperty("大图片") + private String bigIcon; + + @ApiModelProperty("大图片完整链接") + private String bigIconLink; + + @ApiModelProperty("实时照片") + private String photoIcon; + + @ApiModelProperty("中文方向") + private String drctCn; + + @ApiModelProperty("今日行驶时长(秒)") + private String todayRun; + + @ApiModelProperty("行停时长") + private String runStopTime; + + @ApiModelProperty("行停时长(秒),排序时使用") + private String runStopTimeSecond; + + @ApiModelProperty("ACC时长") + private String accTime; + + @ApiModelProperty("ACC总时长") + private String totalAccTime; + + @ApiModelProperty("离线时长") + private String offLineTime; + + @ApiModelProperty("信号线(返回集合,每记录含name/value)") + private String sgnStts; + + @ApiModelProperty("提醒信息(返回集合,每记录含name/value)") + private String reminds; + + @ApiModelProperty("油量(返回集合,每记录含name/value)") + private String st1; + + @ApiModelProperty("载重(返回集合,每记录含name/value)") + private String st2; + + @ApiModelProperty("温度(返回集合,每记录含name/value)") + private String st3; + + @ApiModelProperty("湿度(返回集合,每记录含name/value)") + private String st4; + + @ApiModelProperty("水位(返回集合,每记录含name/value)") + private String st5; + @ApiModelProperty("服务到期状态:1已到期 0未到期") private String expState; @ApiModelProperty("服务期限") private String expTime; + + @ApiModelProperty("油量") + private String oil; + + @ApiModelProperty("定位附加项(JSON)") + private String protocols; + + @ApiModelProperty("扩展字段(JSON)") + private String exts; + + @ApiModelProperty("模拟量1") + private String moni1; + + @ApiModelProperty("模拟量2") + private String moni2; + + @ApiModelProperty("模拟量3") + private String moni3; + + @ApiModelProperty("模拟量4") + private String moni4; + + @ApiModelProperty("视频通道(JSON)") + private String videos; + + @ApiModelProperty("未处理报警类型名称(逗号分隔)") + private String alarms; + + @ApiModelProperty("未处理报警类型ID(逗号分隔)") + private String alarmTypeIds; + + @ApiModelProperty("终端型号") + private String tmnType; + + @ApiModelProperty("终端到期时间") + private String tmnExpirTime; + + @ApiModelProperty("视频设备报警id集合") + private String videoAlarmTypes; + + @ApiModelProperty("驾驶员登签姓名(卡号)") + private String driverSign; + + @ApiModelProperty("驾驶员登签电话号码") + private String driverSignPhone; + + @ApiModelProperty("驾驶员登签时间") + private String driverSignTime; + + @ApiModelProperty("驾驶员登签时长") + private String drvSignTimeLong; + + @ApiModelProperty("车辆基本状态(16进制位掩码)") + private String carStts; + + @ApiModelProperty("报警状态(16进制位掩码)") + private String alarmStts; + + @ApiModelProperty("协议版本") + private String prtcVer; + + @ApiModelProperty("接入端口") + private String tmnPort; } diff --git a/mhd_thrid_party/src/main/resources/bootstrap.yml b/mhd_thrid_party/src/main/resources/bootstrap.yml index abae2544b..301f8c7fb 100644 --- a/mhd_thrid_party/src/main/resources/bootstrap.yml +++ b/mhd_thrid_party/src/main/resources/bootstrap.yml @@ -21,14 +21,14 @@ spring: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 # server-addr: 10.33.0.129:6010 - server-addr: 10.102.192.31:6848 + server-addr: 10.102.192.30:6848 username: nacos password: manhuoda@2023 config: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 # server-addr: 10.33.0.129:6010 - server-addr: 10.102.192.31:6848 + server-addr: 10.102.192.30:6848 username: nacos password: manhuoda@2023 #线上正式环境 diff --git a/mhd_wms/src/main/resources/bootstrap.yml b/mhd_wms/src/main/resources/bootstrap.yml index 39eb710cb..fc7380c20 100644 --- a/mhd_wms/src/main/resources/bootstrap.yml +++ b/mhd_wms/src/main/resources/bootstrap.yml @@ -14,18 +14,18 @@ spring: nacos: discovery: # server-addr: 127.0.0.1:8848 - server-addr: 10.33.0.129:6010 +# server-addr: 10.33.0.129:6010 # 线上测试环境配置 容器名+端口号 -# server-addr: 10.102.192.30:6848 + server-addr: 10.102.192.30:6848 username: nacos password: manhuoda@2023 #线上正式环境 # server-addr: 10.102.192.105:6848 config: # server-addr: 127.0.0.1:8848 - server-addr: 10.33.0.129:6010 +# server-addr: 10.33.0.129:6010 # 线上测试环境配置 容器名+端口号 -# server-addr: 10.102.192.30:6848 + server-addr: 10.102.192.30:6848 username: nacos password: manhuoda@2023 #线上正式环境