1.统计分析-》在线监测点-》稳态指标合格率接口调整
2.技术监督测试管理,调整查询语句增加实际完成时间
This commit is contained in:
@@ -17,6 +17,7 @@ public class PulicTimeParam {
|
||||
|
||||
@ApiModelProperty("监测点id")
|
||||
private String id;
|
||||
|
||||
@ApiModelProperty("开始时间")
|
||||
@Pattern(regexp = PatternRegex.TIME_FORMAT, message = "时间格式错误")
|
||||
private String searchBeginTime;
|
||||
|
||||
@@ -13,6 +13,7 @@ import javax.validation.constraints.Pattern;
|
||||
*/
|
||||
@Data
|
||||
public class PulicTimeStatisParam extends PulicTimeParam {
|
||||
|
||||
@ApiModelProperty("比较开始时间")
|
||||
@Pattern(regexp = PatternRegex.TIME_FORMAT, message = "时间格式错误")
|
||||
private String periodBeginTime;
|
||||
|
||||
@@ -776,7 +776,7 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
|
||||
|
||||
public List<PqsCommunicate> getCommunicate(String devId, String startTime, String endTime) {
|
||||
InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(PqsCommunicate.class);
|
||||
influxQueryWrapper.between(InfluxDbSqlConstant.TIME,DateUtil.beginOfDay(DateUtil.parse(startTime)).toString(),DateUtil.beginOfDay(DateUtil.parse(endTime)).toString())
|
||||
influxQueryWrapper.between(InfluxDbSqlConstant.TIME,DateUtil.beginOfDay(DateUtil.parse(startTime)).toString(),DateUtil.endOfDay(DateUtil.parse(endTime)).toString())
|
||||
.eq(PqsCommunicate::getDevId,devId);
|
||||
return pqsCommunicateMapper.selectByQueryWrapper(influxQueryWrapper);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user