Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码提交

Browse Source
This commit is contained in:
huangzj
2023-10-13 16:01:51 +08:00
parent 12d9232c5f
commit 8ef6f8ce8e
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/CsEventVO.java
View File

@@ -69,4 +69,6 @@ public class CsEventVO extends BaseEntity {
* 事件等级(1:Ⅰ级 2:Ⅱ级 3:Ⅲ级) * 事件等级(1:Ⅰ级 2:Ⅱ级 3:Ⅲ级)
*/ */
private Integer level; private Integer level;
private String code;
} }

1
cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/EventDetailVO.java
View File

@@ -104,6 +104,7 @@ public class EventDetailVO {
/*位置*/ /*位置*/
private String evtParamPosition; private String evtParamPosition;
private String code;

4
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml
View File

@@ -37,7 +37,7 @@
1 status, 1 status,
</if> </if>
b.device_id deviceId,b.line_id lineId, b.device_id deviceId,b.line_id lineId,
b.start_time startTime,b.tag tag ,b.wave_path wavePath,b.instant_pics,b.rms_pics , b.type type b.start_time startTime,b.tag tag ,b.wave_path wavePath,b.instant_pics,b.rms_pics , b.type type,b.code code
from cs_event_user a inner join cs_event b on a.event_id=b.id inner join cs_equipment_delivery c on b.device_id=c.id where 1=1 from cs_event_user a inner join cs_event b on a.event_id=b.id inner join cs_equipment_delivery c on b.device_id=c.id where 1=1
and b.process=c.process and b.process=c.process
<if test="csEventUserQueryParam!=null and csEventUserQueryParam.endTime != null and csEventUserQueryParam.endTime !=''"> <if test="csEventUserQueryParam!=null and csEventUserQueryParam.endTime != null and csEventUserQueryParam.endTime !=''">
@@ -82,7 +82,7 @@
<if test="!flag"> <if test="!flag">
1 status, 1 status,
</if> </if>
b.device_id deviceId,b.line_id lineId, b.device_id deviceId,b.line_id lineId,b.code code,
b.start_time startTime,b.tag tag ,b.wave_path wavePath,b.instant_pics,b.rms_pics , b.type type b.start_time startTime,b.tag tag ,b.wave_path wavePath,b.instant_pics,b.rms_pics , b.type type
from cs_event_user a inner join cs_event b on a.event_id=b.id inner join cs_equipment_delivery c on b.device_id=c.id where 1=1 from cs_event_user a inner join cs_event b on a.event_id=b.id inner join cs_equipment_delivery c on b.device_id=c.id where 1=1
and b.process=c.process and b.process=c.process

2
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StableDataServiceImpl.java
View File

@@ -388,7 +388,7 @@ public class StableDataServiceImpl implements StableDataService {
stringBuilder1.append("last("+data.getName()).append("_"+i).append(") AS "+data.getName()).append("_"+i).append(","); stringBuilder1.append("last("+data.getName()).append("_"+i).append(") AS "+data.getName()).append("_"+i).append(",");
} }
} }
stringBuilder2.append ("line_id='").append (csLinePO.getLineId()).append("' and value_type = 'avg' and process="+data1.get(0).getProcess()+" group by phasic_type ").append(InfluxDbSqlConstant.TZ); stringBuilder2.append ("line_id='").append (csLinePO.getLineId()).append("' and value_type = 'avg' and process='"+data1.get(0).getProcess()+"' group by phasic_type ").append(InfluxDbSqlConstant.TZ);
String sql1 = "select "+stringBuilder1+" from "+"apf_data"+" where "+stringBuilder2; String sql1 = "select "+stringBuilder1+" from "+"apf_data"+" where "+stringBuilder2;
QueryResult sqlData = influxDbUtils.query(sql1); QueryResult sqlData = influxDbUtils.query(sql1);