Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

代码调整

Browse Source
This commit is contained in:
雨木c
2022-12-27 15:51:37 +08:00
parent 97e18b59cf
commit 7c4cef74e7
17 changed files with 300 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-event/event-api/pom.xml
View File

@@ -53,4 +53,4 @@
</dependency>
</dependencies>
</project>
</project>

8
pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/EventFeatureAmplitudeCurveVO.java
View File

@@ -28,7 +28,7 @@ public class EventFeatureAmplitudeCurveVO implements Serializable {
private Integer totalNumberOfEvents;
@ApiModelProperty(name = "eventFeatureAmplitudeCurveDataList", value = "图表数据")
private List<EventFeatureAmplitudeCurveVO.EventFeatureAmplitudeCurveDataList> eventFeatureAmplitudeCurveDataList;
private List<EventFeatureAmplitudeCurveDataList> eventFeatureAmplitudeCurveDataList;
/**
* 构建默认对象
@@ -46,7 +46,7 @@ public class EventFeatureAmplitudeCurveVO implements Serializable {
* @param dataList 图表数据
* @return 默认对象
*/
public static EventFeatureAmplitudeCurveVO buildVO(int numberEvents, List<EventFeatureAmplitudeCurveVO.EventFeatureAmplitudeCurveDataList> dataList) {
public static EventFeatureAmplitudeCurveVO buildVO(int numberEvents, List<EventFeatureAmplitudeCurveDataList> dataList) {
return EventFeatureAmplitudeCurveVO.builder().totalNumberOfEvents(numberEvents).eventFeatureAmplitudeCurveDataList(dataList).build();
}
@@ -67,8 +67,8 @@ public class EventFeatureAmplitudeCurveVO implements Serializable {
@ApiModelProperty(name = "startTime", value = "开始时间")
private LocalDateTime startTime;
public static Comparator<EventFeatureAmplitudeCurveVO.EventFeatureAmplitudeCurveDataList> sortAscTime() {
return Comparator.comparing(EventFeatureAmplitudeCurveVO.EventFeatureAmplitudeCurveDataList::getStartTime);
public static Comparator<EventFeatureAmplitudeCurveDataList> sortAscTime() {
return Comparator.comparing(EventFeatureAmplitudeCurveDataList::getStartTime);
}
}
}

12
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventDetailServiceImpl.java
View File

@@ -79,12 +79,12 @@ public class EventDetailServiceImpl implements EventDetailService {
stringBuilder.append(") and (");
for (int i = 0; i < waveType.size(); i++) {
if (waveType.size() - i != 1) {
stringBuilder.append("wave_type =").append(waveType.get(i)).append(" or ");
stringBuilder.append("wave_type ='").append(waveType.get(i)).append("' or ");
} else {
stringBuilder.append("wave_type =").append(waveType.get(i)).append(" ");
stringBuilder.append("wave_type ='").append(waveType.get(i)).append("' ");
}
}
stringBuilder.append(") order by time desc ");
stringBuilder.append(") order by time desc");
stringBuilder.append(" tz('Asia/Shanghai')");
//sql语句
String sql = "SELECT * FROM pqs_eventdetail WHERE " + stringBuilder;
@@ -114,12 +114,12 @@ public class EventDetailServiceImpl implements EventDetailService {
stringBuilder.append(") and (");
for (int i = 0; i < waveType.size(); i++) {
if (waveType.size() - i != 1) {
stringBuilder.append("wave_type =").append(waveType.get(i)).append(" or ");
stringBuilder.append("wave_type ='").append(waveType.get(i)).append("' or ");
} else {
stringBuilder.append("wave_type =").append(waveType.get(i)).append(" ");
stringBuilder.append("wave_type ='").append(waveType.get(i)).append("' ");
}
}
stringBuilder.append(") order by time desc ");
stringBuilder.append(") order by time desc");
int i = (pageNum - 1)*pageSize;
stringBuilder.append("LIMIT ").append(pageSize).append(" OFFSET ").append(i).append(" tz('Asia/Shanghai')");
//sql语句

2
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java
View File

@@ -1511,7 +1511,7 @@ public class ReportServiceImpl implements ReportService {
*/
public void setPosition(Bar bar,String position,String color){
//设置标签
com.github.abel533.echarts.Label label = new Label();
Label label = new Label();
label.show(true);
label.position(position);
TextStyle textStyle = new TextStyle();