diff --git a/src/main/java/com/zhgd/xmgl/modules/pressuretest/entity/PressureTestMachineDev.java b/src/main/java/com/zhgd/xmgl/modules/pressuretest/entity/PressureTestMachineDev.java index ff00db54e..1bca17a1b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pressuretest/entity/PressureTestMachineDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/pressuretest/entity/PressureTestMachineDev.java @@ -69,12 +69,10 @@ public class PressureTestMachineDev implements Serializable { @DateTimeFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "进场时间") private java.util.Date entryDate; - /** - * 负责人id - */ - @Excel(name = "负责人id", width = 15) - @ApiModelProperty(value = "负责人id") - private java.lang.Long dutyuserid; + @ApiModelProperty(value = "负责人") + private java.lang.Long dutyUserId; + @ApiModelProperty(value = "负责人名称") + private java.lang.String dutyUserName; /** * 所属试验室 */ diff --git a/src/main/java/com/zhgd/xmgl/modules/standard/controller/StandardCurrentDataController.java b/src/main/java/com/zhgd/xmgl/modules/standard/controller/StandardCurrentDataController.java index 1ebcfb65e..c70b30860 100644 --- a/src/main/java/com/zhgd/xmgl/modules/standard/controller/StandardCurrentDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/standard/controller/StandardCurrentDataController.java @@ -131,6 +131,7 @@ public class StandardCurrentDataController { @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), @ApiImplicitParam(name = "devSn", value = "标养室设备唯一标识", paramType = "body", required = true, dataType = "String"), + @ApiImplicitParam(name = "type", value = "1当天", paramType = "body", required = false, dataType = "Integer"), }) @PostMapping(value = "/selectNewCurrentData") public Result selectNewCurrentData(@RequestBody @ApiIgnore Map map) { diff --git a/src/main/java/com/zhgd/xmgl/modules/standard/mapper/xml/StandardCurrentDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/standard/mapper/xml/StandardCurrentDataMapper.xml index efdb2fd33..b0dfb6589 100644 --- a/src/main/java/com/zhgd/xmgl/modules/standard/mapper/xml/StandardCurrentDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/standard/mapper/xml/StandardCurrentDataMapper.xml @@ -2,10 +2,14 @@ - SELECT a.* from standard_current_data a WHERE a.dev_sn=#{devSn} AND a.project_sn=#{projectSn} + + and a.receive_time > current_date + ORDER BY a.receive_time DESC LIMIT 1 diff --git a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java index 9208b9807..83121c7e7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java @@ -99,10 +99,6 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(AiAnalyseHardWareRecord::getHardwareId, body.getString("hardwareId")); @@ -418,6 +414,8 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl