Merge remote-tracking branch 'origin/developer' into developer

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/AnalyseController.java

@@ -185,7 +185,7 @@ public class AnalyseController extends BaseController {
 	@ApiOperation(httpMethod = "GET", value = "获取influxdb数据", notes = "获取influxdb数据")
 	@GetMapping(value = "/getInfluxdbDataByConditon")
 	public ResponseModel<Map<String, Object>> getInfluxdbDataByConditon(@RequestParam String stationType,
-			@RequestParam String pointId, @RequestParam(required = false) String startTime,
+			@RequestParam(required = false) String pointId, @RequestParam(required = false) String startTime,
 			@RequestParam(required = false) String endTime) {
 
 		if (!StringUtils.isEmpty(startTime)) {

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/IdxBizFanHealthIndexController.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jxiop.biz.controller;
 
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -45,6 +46,8 @@ import java.sql.Timestamp;
 import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -770,7 +773,10 @@ public class IdxBizFanHealthIndexController extends BaseController {
 				Date endDate = DateUtils.dateParse(endTimeTop);
 				endTimeTop = formatter.format(endDate);
 			}
-			
+			//处理空指针问题 如果为空差15天前数据
+			if(StrUtil.isEmpty(startTimeTop)){
+				startTimeTop = LocalDateTime.now().minusDays(15).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+			}
 			Date startDate = DateUtils.dateParse(startTimeTop);
 				startTimeTop = formatter.format(startDate);
 			List<FanHealthIndexDay> fanHealthIndexDays = fanHealthIndexDayMapper.selectData(healthLevel, area, equipmentName, subSystem, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,null,null, orgCode);

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/IdxBizPvHealthIndexController.java

 package com.yeejoin.amos.boot.module.jxiop.biz.controller;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
@@ -31,6 +33,8 @@ import javax.servlet.http.HttpServletRequest;
 import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -358,8 +362,12 @@ public class IdxBizPvHealthIndexController extends BaseController {
 			List<PvHealthIndexDay> fanHealthIndexDays = pvHealthIndexDayMapper.selectData(station, requiredType, indexAddress, healthLevel, area, analysisObjType, subarray, pointName, startTimeTop, endTimeTop, equipmentName,(current-1)*size,size, orgCode);
 
 			Map<String,Object> map = new HashMap<>();
+			Double value=null;
+            if(CollectionUtil.isNotEmpty(fanHealthIndexDays)){
+				value = Double.parseDouble(df.format(fanHealthIndexDays.get(0).getHealthIndex()));
+			}
 
-			map.put("value", Double.parseDouble(df.format(fanHealthIndexDays.get(0).getHealthIndex())));
+			map.put("value", value);
 
 			return 	ResponseHelper.buildResponse(map);
 
@@ -427,7 +435,10 @@ public class IdxBizPvHealthIndexController extends BaseController {
 				Date endDate =DateUtils.dateParse(endTimeTop);
 				endTimeTop = formatter.format(endDate);
 			}
-
+			//处理空指针问题 如果为空差15天前数据
+			if(StrUtil.isEmpty(startTimeTop)){
+				startTimeTop = LocalDateTime.now().minusDays(15).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+			}
 			Date startDate = DateUtils.dateParse(startTimeTop);
 			startTimeTop = formatter.format(startDate);