diff --git a/src/main/java/com/zhgd/xmgl/modules/project/entity/ProjectExtend.java b/src/main/java/com/zhgd/xmgl/modules/project/entity/ProjectExtend.java index 3a409ce9d..f764b2c97 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/entity/ProjectExtend.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/entity/ProjectExtend.java @@ -160,6 +160,18 @@ public class ProjectExtend implements Serializable { @Excel(name = "总投资额", width = 15) @ApiModelProperty(value = "总投资额") private String investmentPrice; + /** + * 大模型平台地址 + */ + @Excel(name = "大模型平台地址", width = 15) + @ApiModelProperty(value = "大模型平台地址") + private String modelUrl; + /** + * 模型key值 + */ + @Excel(name = "模型key值", width = 15) + @ApiModelProperty(value = "模型key值") + private String modelKey; } diff --git a/src/main/java/com/zhgd/xmgl/task/TunnelBoringMachineTask.java b/src/main/java/com/zhgd/xmgl/task/TunnelBoringMachineTask.java index d0a2c6c9a..313ed5952 100644 --- a/src/main/java/com/zhgd/xmgl/task/TunnelBoringMachineTask.java +++ b/src/main/java/com/zhgd/xmgl/task/TunnelBoringMachineTask.java @@ -5,6 +5,7 @@ import cn.hutool.http.HttpRequest; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.zhgd.xmgl.modules.bigdevice.entity.TunnelBoringMachine; import com.zhgd.xmgl.modules.bigdevice.entity.TunnelBoringMachineAlarm; import com.zhgd.xmgl.modules.bigdevice.entity.TunnelBoringMachineCurrentData; @@ -19,6 +20,7 @@ import com.zhgd.xmgl.modules.poisonous.mapper.PoisonousGasDevAlarmMapper; import com.zhgd.xmgl.modules.poisonous.mapper.PoisonousGasDevCurrentDataMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -56,7 +58,7 @@ public class TunnelBoringMachineTask { @Autowired private PoisonousGasDevAlarmMapper poisonousGasDevAlarmMapper; -// @Scheduled(cron = "0 50 23 * * ?") + @Scheduled(cron = "0 50 23 * * ?") @RequestMapping("getTunnelBoringMachineStat") public void getTunnelBoringMachineStat() { log.info("获取盾构机今日环数开始任务"); @@ -83,7 +85,7 @@ public class TunnelBoringMachineTask { tunnelBoringMachineStatService.saveBatch(list); } - // @Scheduled(cron = "0/30 * * * * ?") +// @Scheduled(cron = "0/30 * * * * ?") @RequestMapping("getTunnelBoringMachineAlarm") public void getTunnelBoringMachineAlarm() { log.info("获取盾构机报警数据开始任务"); @@ -149,7 +151,7 @@ public class TunnelBoringMachineTask { } } -// @Scheduled(cron = "0/20 * * * * ?") + @Scheduled(cron = "0/20 * * * * ?") @RequestMapping("getTunnelBoringMachineData") public void getTunnelBoringMachineData() { log.info("获取盾构机实时数据开始任务"); @@ -340,10 +342,20 @@ public class TunnelBoringMachineTask { map.put("projectSn", tunnelBoringMachine.getProjectSn()); map.put("deviceSn", tunnelBoringMachine.getDevSn()); TunnelBoringMachineCurrentData firstData = tunnelBoringMachineCurrentDataMapper.getFirstData(map); - tunnelBoringMachineCurrentData.setDayNumber(tunnelBoringMachineCurrentData.getCurrentNumber() - firstData.getCurrentNumber()); + if (firstData == null) { + tunnelBoringMachineCurrentData.setDayNumber(0); + } else { + tunnelBoringMachineCurrentData.setDayNumber(tunnelBoringMachineCurrentData.getCurrentNumber() - firstData.getCurrentNumber()); + } tunnelBoringMachineCurrentData.setReportTime(DateUtil.parseDateTime(jsonObject.getJSONObject("data").getString("time_str"))); tunnelBoringMachineCurrentData.setCreateTime(new Date()); + TunnelBoringMachineCurrentData exist = tunnelBoringMachineCurrentDataMapper.selectOne(Wrappers.lambdaQuery() + .eq(TunnelBoringMachineCurrentData::getDeviceSn, tunnelBoringMachineCurrentData.getDeviceSn()) + .eq(TunnelBoringMachineCurrentData::getReportTime, tunnelBoringMachineCurrentData.getReportTime())); // tunnelBoringMachineCurrentData.setWorkerStatus(); + if (exist != null) { + return; + } tunnelBoringMachineCurrentDataMapper.insert(tunnelBoringMachineCurrentData); poisonousGasDevCurrentData.setUploadTime(new Date()); poisonousGasDevCurrentDataMapper.insert(poisonousGasDevCurrentData);