admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

盾构机优化

Browse Source
This commit is contained in:
pengjie 2025-02-24 10:40:00 +08:00
parent bb15bed6b9
commit bebeab1176
5 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/CrawlerCraneCurrentData.java
View File

@ -126,10 +126,10 @@ public class CrawlerCraneCurrentData implements Serializable {
@ApiModelProperty(value = "门限位") @ApiModelProperty(value = "门限位")
private String thresholdPosition; private String thresholdPosition;
/** /**
* 俯仰角 * 导向俯仰角
*/ */
@Excel(name = "俯仰角", width = 15) @Excel(name = "导向俯仰角", width = 15)
@ApiModelProperty(value = "俯仰角") @ApiModelProperty(value = "导向俯仰角")
private String pitchAngle; private String pitchAngle;
/** /**
* 幅度 * 幅度

6
src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/TunnelBoringMachineCurrentData.java
View File

@ -223,10 +223,10 @@ public class TunnelBoringMachineCurrentData implements Serializable {
@ApiModelProperty(value = "贯入度") @ApiModelProperty(value = "贯入度")
private String penetration; private String penetration;
/** /**
* 俯仰角 * 导向俯仰角
*/ */
@Excel(name = "俯仰角", width = 15) @Excel(name = "导向俯仰角", width = 15)
@ApiModelProperty(value = "俯仰角") @ApiModelProperty(value = "导向俯仰角")
private String pitchAngle; private String pitchAngle;
/** /**
* 水平偏差趋势 * 水平偏差趋势

9
src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TunnelBoringMachineCurrentDataServiceImpl.java
View File

@ -109,7 +109,7 @@ public class TunnelBoringMachineCurrentDataServiceImpl extends ServiceImpl<Tunne
JSONObject obj = values.getJSONObject(i); JSONObject obj = values.getJSONObject(i);
if (obj.getString("colName").equals("环号")) { if (obj.getString("colName").equals("环号")) {
tunnelBoringMachineCurrentData.setCurrentNumber(obj.getInteger("val")); tunnelBoringMachineCurrentData.setCurrentNumber(obj.getInteger("val"));
tunnelBoringMachineCurrentData.setMileageCompleted(obj.getString("val")); // tunnelBoringMachineCurrentData.setMileageCompleted(obj.getString("val"));
// tunnelBoringMachineCurrentData.setGroutingStatus(); // tunnelBoringMachineCurrentData.setGroutingStatus();
// tunnelBoringMachineCurrentData.setCommunicationStatus(); // tunnelBoringMachineCurrentData.setCommunicationStatus();
// tunnelBoringMachineCurrentData.setHingeStatus(); // tunnelBoringMachineCurrentData.setHingeStatus();
@ -150,10 +150,10 @@ public class TunnelBoringMachineCurrentDataServiceImpl extends ServiceImpl<Tunne
if (obj.getString("colName").equals("贯入度")) { if (obj.getString("colName").equals("贯入度")) {
tunnelBoringMachineCurrentData.setPenetration(obj.getString("val")); tunnelBoringMachineCurrentData.setPenetration(obj.getString("val"));
} }
if (obj.getString("colName").equals("俯仰角")) { if (obj.getString("colName").equals("导向俯仰角")) {
tunnelBoringMachineCurrentData.setPitchAngle(obj.getString("val")); tunnelBoringMachineCurrentData.setPitchAngle(obj.getString("val"));
} }
if (obj.getString("colName").equals("滚动角")) { if (obj.getString("colName").equals("导向滚动角")) {
tunnelBoringMachineCurrentData.setRollPosition(obj.getDouble("val")); tunnelBoringMachineCurrentData.setRollPosition(obj.getDouble("val"));
} }
if (obj.getString("colName").equals("刀盘转速")) { if (obj.getString("colName").equals("刀盘转速")) {
@ -282,6 +282,9 @@ public class TunnelBoringMachineCurrentDataServiceImpl extends ServiceImpl<Tunne
List<String> dayList = DateUtils.getNowFewDaysAgoList(15); List<String> dayList = DateUtils.getNowFewDaysAgoList(15);
List<TunnelBoringMachineStat> resultList = new ArrayList<>(); List<TunnelBoringMachineStat> resultList = new ArrayList<>();
for (String s : dayList) { for (String s : dayList) {
if (s.equals(DateUtil.formatDate(new Date()))) {
continue;
}
List<TunnelBoringMachineStat> collect = machineStatList.stream().filter(m -> DateUtil.formatDate(m.getCreateTime()).equals(s)).collect(Collectors.toList()); List<TunnelBoringMachineStat> collect = machineStatList.stream().filter(m -> DateUtil.formatDate(m.getCreateTime()).equals(s)).collect(Collectors.toList());
if (collect.size() > 0) { if (collect.size() > 0) {
resultList.add(collect.get(0)); resultList.add(collect.get(0));

4
src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoItemServiceImpl.java
View File

@ -410,10 +410,10 @@ public class VideoItemServiceImpl extends ServiceImpl<VideoItemMapper, VideoItem
String videoPassword = MapUtils.getString(entityMap, "videoPassword"); String videoPassword = MapUtils.getString(entityMap, "videoPassword");
if (StringUtils.isNotBlank(videoPassword)) { if (StringUtils.isNotBlank(videoPassword)) {
entityMap.put("url", "ezopen://" + videoPassword +"@open.ys7.com/" + MapUtils.getString(entityMap, "serialNumber") + "/" + entityMap.put("url", "ezopen://" + videoPassword +"@open.ys7.com/" + MapUtils.getString(entityMap, "serialNumber") + "/" +
MapUtils.getString(entityMap, "verificationCode") + ".hd.live"); MapUtils.getString(entityMap, "verificationCode") + ".live");
} else { } else {
entityMap.put("url", "ezopen://open.ys7.com/" + MapUtils.getString(entityMap, "serialNumber") + "/" + entityMap.put("url", "ezopen://open.ys7.com/" + MapUtils.getString(entityMap, "serialNumber") + "/" +
MapUtils.getString(entityMap, "verificationCode") + ".hd.live"); MapUtils.getString(entityMap, "verificationCode") + ".live");
} }
} }

6
src/main/java/com/zhgd/xmgl/task/TunnelBoringMachineTask.java
View File

@ -193,7 +193,7 @@ public class TunnelBoringMachineTask {
JSONObject obj = values.getJSONObject(i); JSONObject obj = values.getJSONObject(i);
if (obj.getString("colName").equals("环号")) { if (obj.getString("colName").equals("环号")) {
tunnelBoringMachineCurrentData.setCurrentNumber(obj.getInteger("val")); tunnelBoringMachineCurrentData.setCurrentNumber(obj.getInteger("val"));
tunnelBoringMachineCurrentData.setMileageCompleted(obj.getString("val")); // tunnelBoringMachineCurrentData.setMileageCompleted(obj.getString("val"));
// tunnelBoringMachineCurrentData.setGroutingStatus(); // tunnelBoringMachineCurrentData.setGroutingStatus();
// tunnelBoringMachineCurrentData.setCommunicationStatus(); // tunnelBoringMachineCurrentData.setCommunicationStatus();
// tunnelBoringMachineCurrentData.setHingeStatus(); // tunnelBoringMachineCurrentData.setHingeStatus();
@ -234,10 +234,10 @@ public class TunnelBoringMachineTask {
if (obj.getString("colName").equals("贯入度")) { if (obj.getString("colName").equals("贯入度")) {
tunnelBoringMachineCurrentData.setPenetration(obj.getString("val")); tunnelBoringMachineCurrentData.setPenetration(obj.getString("val"));
} }
if (obj.getString("colName").equals("俯仰角")) { if (obj.getString("colName").equals("导向俯仰角")) {
tunnelBoringMachineCurrentData.setPitchAngle(obj.getString("val")); tunnelBoringMachineCurrentData.setPitchAngle(obj.getString("val"));
} }
if (obj.getString("colName").equals("滚动角")) { if (obj.getString("colName").equals("导向滚动角")) {
tunnelBoringMachineCurrentData.setRollPosition(obj.getDouble("val")); tunnelBoringMachineCurrentData.setRollPosition(obj.getDouble("val"));
} }
if (obj.getString("colName").equals("刀盘转速")) { if (obj.getString("colName").equals("刀盘转速")) {