修复分析计算

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/Enum/SmartAnalyseEnum.java

 package com.yeejoin.amos.boot.module.jxiop.biz.Enum;
 
 public enum SmartAnalyseEnum {
+
 	FAN_QJHF("FAN_QJHF", "风机区间变量划分"),
-    FAN_XGX("FAN_XGX","风机相关性"),
 
-    FAN_ZXZ("FAN_ZXZ","风机中心值"),
+	FAN_XGX("FAN_XGX", "风机相关性"),
+
+	FAN_ZXZ("FAN_ZXZ", "风机中心值"),
 
-    PV_QJHF("PV_QJHF","光伏区间变量划分"),
+	PV_QJHF("PV_QJHF", "光伏区间变量划分"),
 
-    PV_XGX("PV_XGX","光伏相关性"),
+	PV_XGX("PV_XGX", "光伏相关性"),
 
-    PV_ZXZ("PV_ZXZ","光伏中心值");
+	PV_ZXZ("PV_ZXZ", "光伏中心值");
 
 	private String key;
+
 	private String name;
 
 	public String getKey() {

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/config/TdEngineConfig.java

@@ -76,7 +76,7 @@ public class TdEngineConfig {
         final MybatisSqlSessionFactoryBean sessionFactory = new MybatisSqlSessionFactoryBean();
         sessionFactory.setDataSource(culsterDataSource);
         sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver()
-                .getResources(TdEngineConfig.MAPPER_LOCATION));
+                .getResources(MAPPER_LOCATION));
         sessionFactory.setTypeAliasesPackage("com.yeejoin.amos.boot.module.jxiop.biz.entity");
         //mybatis 数据库字段与实体类属性驼峰映射配置
         sessionFactory.getObject().getConfiguration().setMapUnderscoreToCamelCase(true);

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

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
+import com.yeejoin.amos.boot.module.jxiop.biz.Enum.SmartAnalyseEnum;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizFanHealthIndex;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizPvPointProcessVariableClassification;
 import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.IdxBizFanHealthIndexMapper;
@@ -62,9 +63,17 @@ public class AnalyseController extends BaseController {
 	IPermissionService permissionService;
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@ApiOperation(httpMethod = "GET", value = "获取执行结果", notes = "获取执行结果")
+	@GetMapping(value = "/isRun")
+	public ResponseModel<String> isRun(@RequestParam(required = true) String key) {
+		return ResponseHelper.buildResponse(commonServiceImpl.isRun(key));
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@ApiOperation(httpMethod = "GET", value = "工况测点区间划分-风机", notes = "工况测点区间划分-风机")
 	@GetMapping(value = "/getFanConditionVariablesByTime")
-    public ResponseModel<String> getFanConditionVariablesByTime(@RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime) {
+	public ResponseModel<String> getFanConditionVariablesByTime(@RequestParam(required = false) String startTime,
+			@RequestParam(required = false) String endTime) {
 		if (StringUtils.isEmpty(startTime) && StringUtils.isEmpty(endTime)) {
 			Date currentDayStartTime = DateUtils.getCurrentDayStartTime(new Date());
 			Date currentDayEndTime = DateUtils.getCurrentDayEndTime(new Date());
@@ -77,7 +86,8 @@ public class AnalyseController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@ApiOperation(httpMethod = "GET", value = "工况测点区间划分-光伏", notes = "工况测点区间划分-光伏")
 	@GetMapping(value = "/getPvConditionVariablesByTime")
-    public ResponseModel<String> getPvConditionVariablesByTime(@RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime) {
+	public ResponseModel<String> getPvConditionVariablesByTime(@RequestParam(required = false) String startTime,
+			@RequestParam(required = false) String endTime) {
 		if (StringUtils.isEmpty(startTime) && StringUtils.isEmpty(endTime)) {
 			Date currentDayStartTime = DateUtils.getCurrentDayStartTime(new Date());
 			Date currentDayEndTime = DateUtils.getCurrentDayEndTime(new Date());
@@ -90,17 +100,18 @@ public class AnalyseController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@ApiOperation(httpMethod = "GET", value = "相关性分析-风机", notes = "相关性分析-风机")
 	@GetMapping(value = "/getFanConditionVariablesByTimeAnalyse")
-    public ResponseModel<String> getFanConditionVariablesByTimeAnalyse(@RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime) {
+	public ResponseModel<String> getFanConditionVariablesByTimeAnalyse(@RequestParam(required = false) String startTime,
+			@RequestParam(required = false) String endTime) {
 		if (StringUtils.isEmpty(startTime) && StringUtils.isEmpty(endTime)) {
 			Date currentDayStartTime = DateUtils.getCurrentDayStartTime(new Date());
 			Date currentDayEndTime = DateUtils.getCurrentDayEndTime(new Date());
 			startTime = DateUtils.convertDateToString(currentDayStartTime, DateUtils.DATE_TIME_PATTERN);
 			endTime = DateUtils.convertDateToString(currentDayEndTime, DateUtils.DATE_TIME_PATTERN);
 		}
-        return ResponseHelper.buildResponse(commonServiceImpl.getFanConditionVariablesByTimeAnalyseThread(startTime, endTime));
+		return ResponseHelper
+				.buildResponse(commonServiceImpl.getFanConditionVariablesByTimeAnalyseThread(startTime, endTime));
 	}
 
-
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@PostMapping(value = "/getFanConditionVariablesByTimeAnalyseNew")
 	@ApiOperation(httpMethod = "POST", value = "相关性分析 - 风机 - 新", notes = "相关性分析 - 风机 - 新")
@@ -109,63 +120,73 @@ public class AnalyseController extends BaseController {
 		return ResponseHelper.buildResponse(null);
 	}
 
-
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@ApiOperation(httpMethod = "GET", value = "相关性分析 - 光伏 - 新", notes = "相关性分析 - 光伏 - 新")
 	@GetMapping(value = "/getPvConditionVariablesByTimeAnalyseNew")
-    public ResponseModel<String> getPvConditionVariablesByTimeAnalyseNew(@RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime) throws InterruptedException {
+	public ResponseModel<String> getPvConditionVariablesByTimeAnalyseNew(
+			@RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime)
+			throws InterruptedException {
 		if (StringUtils.isEmpty(startTime) && StringUtils.isEmpty(endTime)) {
 			startTime = DateUtils.convertDateToString(DateUtil.beginOfYear(new Date()), DateUtils.DATE_TIME_PATTERN);
-            endTime = DateUtils.convertDateToString(DateUtils.getCurrentDayEndTime(new Date()), DateUtils.DATE_TIME_PATTERN);
+			endTime = DateUtils.convertDateToString(DateUtils.getCurrentDayEndTime(new Date()),
+					DateUtils.DATE_TIME_PATTERN);
 		}
 		commonServiceImpl.chuliPv(startTime, endTime);
-        return ResponseHelper.buildResponse(commonServiceImpl.getPvConditionVariablesByTimeAnalyseThread(startTime, endTime));
+		return ResponseHelper
+				.buildResponse(commonServiceImpl.getPvConditionVariablesByTimeAnalyseThread(startTime, endTime));
 	}
 
-
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@ApiOperation(httpMethod = "GET", value = "相关性分析-风机", notes = "相关性分析-风机")
 	@GetMapping(value = "/getPvConditionVariablesByTimeAnalyse")
-    public ResponseModel<String> getPvConditionVariablesByTimeAnalyse(@RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime) {
+	public ResponseModel<String> getPvConditionVariablesByTimeAnalyse(@RequestParam(required = false) String startTime,
+			@RequestParam(required = false) String endTime) {
 		if (StringUtils.isEmpty(startTime) && StringUtils.isEmpty(endTime)) {
 			Date currentDayStartTime = DateUtils.getCurrentDayStartTime(new Date());
 			Date currentDayEndTime = DateUtils.getCurrentDayEndTime(new Date());
 			startTime = DateUtils.convertDateToString(currentDayStartTime, DateUtils.DATE_TIME_PATTERN);
 			endTime = DateUtils.convertDateToString(currentDayEndTime, DateUtils.DATE_TIME_PATTERN);
 		}
-        return ResponseHelper.buildResponse(commonServiceImpl.getPvConditionVariablesByTimeAnalyseThread(startTime, endTime));
+		return ResponseHelper
+				.buildResponse(commonServiceImpl.getPvConditionVariablesByTimeAnalyseThread(startTime, endTime));
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@ApiOperation(httpMethod = "GET", value = "中心值计算-风机", notes = "中心值计算-风机")
 	@GetMapping(value = "/getFanConditionVariablesByTimeAnalyse1")
-    public ResponseModel<String> getFanConditionVariablesByTimeAnalyse1(@RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime) {
+	public ResponseModel<String> getFanConditionVariablesByTimeAnalyse1(
+			@RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime) {
 		if (StringUtils.isEmpty(startTime) && StringUtils.isEmpty(endTime)) {
 			Date currentDayStartTime = DateUtils.getCurrentDayStartTime(new Date());
 			Date currentDayEndTime = DateUtils.getCurrentDayEndTime(new Date());
 			startTime = DateUtils.convertDateToString(currentDayStartTime, DateUtils.DATE_TIME_PATTERN);
 			endTime = DateUtils.convertDateToString(currentDayEndTime, DateUtils.DATE_TIME_PATTERN);
 		}
-        return ResponseHelper.buildResponse(commonServiceImpl.getFanConditionVariablesByTimeAnalyse1Thread(startTime, endTime));
+		return ResponseHelper
+				.buildResponse(commonServiceImpl.getFanConditionVariablesByTimeAnalyse1Thread(startTime, endTime));
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@ApiOperation(httpMethod = "GET", value = "中心值计算-光伏", notes = "中心值计算-光伏")
 	@GetMapping(value = "/getPvConditionVariablesByTimeAnalyse1")
-    public ResponseModel<String> getPvConditionVariablesByTimeAnalyse1(@RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime) {
+	public ResponseModel<String> getPvConditionVariablesByTimeAnalyse1(@RequestParam(required = false) String startTime,
+			@RequestParam(required = false) String endTime) {
 		if (StringUtils.isEmpty(startTime) && StringUtils.isEmpty(endTime)) {
 			Date currentDayStartTime = DateUtils.getCurrentDayStartTime(new Date());
 			Date currentDayEndTime = DateUtils.getCurrentDayEndTime(new Date());
 			startTime = DateUtils.convertDateToString(currentDayStartTime, DateUtils.DATE_TIME_PATTERN);
 			endTime = DateUtils.convertDateToString(currentDayEndTime, DateUtils.DATE_TIME_PATTERN);
 		}
-        return ResponseHelper.buildResponse(commonServiceImpl.getPvConditionVariablesByTimeAnalyse1Thread(startTime, endTime));
+		return ResponseHelper
+				.buildResponse(commonServiceImpl.getPvConditionVariablesByTimeAnalyse1Thread(startTime, endTime));
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@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 endTime) {
+	public ResponseModel<Map<String, Object>> getInfluxdbDataByConditon(@RequestParam String stationType,
+			@RequestParam String pointId, @RequestParam(required = false) String startTime,
+			@RequestParam(required = false) String endTime) {
 
 		if (!StringUtils.isEmpty(startTime)) {
 			try {
@@ -190,30 +211,35 @@ public class AnalyseController extends BaseController {
 			} catch (Exception e) {
 				e.printStackTrace();
 			}
-            startTime = DateUtils.convertDateToString(DateUtils.dateAddHours(sevenAgoDayStartTime, -8), DateUtils.DATE_TIME_PATTERN);
+			startTime = DateUtils.convertDateToString(DateUtils.dateAddHours(sevenAgoDayStartTime, -8),
+					DateUtils.DATE_TIME_PATTERN);
 		}
 		DateUtils.dateAddHours(DateUtils.getCurrentDayStartTime(new Date()), -8);
 		if (StringUtils.isEmpty(endTime)) {
-            endTime = DateUtils.convertDateToString(DateUtils.dateAddHours(new Date(), -8), DateUtils.DATE_TIME_PATTERN);
+			endTime = DateUtils.convertDateToString(DateUtils.dateAddHours(new Date(), -8),
+					DateUtils.DATE_TIME_PATTERN);
 		}
-        return ResponseHelper.buildResponse(commonServiceImpl.getInfluxdbDataByConditon(stationType, pointId, startTime, endTime));
+		return ResponseHelper
+				.buildResponse(commonServiceImpl.getInfluxdbDataByConditon(stationType, pointId, startTime, endTime));
 	}
 
-
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@ApiOperation(httpMethod = "GET", value = "根据测点查单位信息", notes = "根据测点查单位信息")
 	@GetMapping(value = "/getUnitByIndexAddress")
-    public ResponseModel<Map<String, String>> getUnitByIndexAddress(@RequestParam String stationType, @RequestParam String pointId) {
+	public ResponseModel<Map<String, String>> getUnitByIndexAddress(@RequestParam String stationType,
+			@RequestParam String pointId) {
 		return ResponseHelper.buildResponse(commonServiceImpl.getUnitByIndexAddress(stationType, pointId));
 	}
 
-
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@ApiOperation(httpMethod = "post", value = "获取influxdb数据", notes = "获取influxdb数据")
 	@PostMapping(value = "/getInfluxdbDataByConditon")
-    public ResponseModel<Map<String, Object>> getDataByConditon(@RequestParam String stationType, @RequestParam(required = false) String pointId, @RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime, @RequestBody Map<String, Object> map) {
+	public ResponseModel<Map<String, Object>> getDataByConditon(@RequestParam String stationType,
+			@RequestParam(required = false) String pointId, @RequestParam(required = false) String startTime,
+			@RequestParam(required = false) String endTime, @RequestBody Map<String, Object> map) {
 		if ("FD".equals(stationType)) {
-            if (ObjectUtils.isEmpty(map.get("EQUIPINDEX")) || CharSequenceUtil.isEmpty(map.get("EQUIPINDEX").toString())) {
+			if (ObjectUtils.isEmpty(map.get("EQUIPINDEX"))
+					|| CharSequenceUtil.isEmpty(map.get("EQUIPINDEX").toString())) {
 				return ResponseHelper.buildResponse(new HashMap<>());
 			}
 			LambdaQueryWrapper<IdxBizFanHealthIndex> indexLambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -221,7 +247,8 @@ public class AnalyseController extends BaseController {
 			indexLambdaQueryWrapper.eq(IdxBizFanHealthIndex::getEquipmentName, map.get("EQUIPNAME"));
 			indexLambdaQueryWrapper.eq(IdxBizFanHealthIndex::getPointName, map.get("EQUIPINDEX")).last("limit 1");
 
-            List<IdxBizFanHealthIndex> idxBizFanHealthIndices = idxBizFanHealthIndexMapper.selectList(indexLambdaQueryWrapper);
+			List<IdxBizFanHealthIndex> idxBizFanHealthIndices = idxBizFanHealthIndexMapper
+					.selectList(indexLambdaQueryWrapper);
 			if (CollectionUtils.isNotEmpty(idxBizFanHealthIndices)) {
 				pointId = idxBizFanHealthIndices.get(0).getIndexAddress();
 			}
@@ -250,19 +277,23 @@ public class AnalyseController extends BaseController {
 			} catch (Exception e) {
 				e.printStackTrace();
 			}
-            startTime = DateUtils.convertDateToString(DateUtils.dateAddHours(sevenAgoDayStartTime, -8), DateUtils.DATE_TIME_PATTERN);
+			startTime = DateUtils.convertDateToString(DateUtils.dateAddHours(sevenAgoDayStartTime, -8),
+					DateUtils.DATE_TIME_PATTERN);
 		}
 		DateUtils.dateAddHours(DateUtils.getCurrentDayStartTime(new Date()), -8);
 		if (StringUtils.isEmpty(endTime)) {
-            endTime = DateUtils.convertDateToString(DateUtils.dateAddHours(new Date(), -8), DateUtils.DATE_TIME_PATTERN);
+			endTime = DateUtils.convertDateToString(DateUtils.dateAddHours(new Date(), -8),
+					DateUtils.DATE_TIME_PATTERN);
 		}
-        return ResponseHelper.buildResponse(commonServiceImpl.getInfluxdbDataByConditon(stationType, pointId, startTime, endTime));
+		return ResponseHelper
+				.buildResponse(commonServiceImpl.getInfluxdbDataByConditon(stationType, pointId, startTime, endTime));
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@ApiOperation(httpMethod = "GET", value = "预警详情信息", notes = "预警详情信息")
 	@GetMapping(value = "/getAlramInfoDetail")
-    public ResponseModel<Map<String, Object>> getAlramInfoDetailOfFan(@RequestParam(required = true) String id, @RequestParam(required = true) String type) {
+	public ResponseModel<Map<String, Object>> getAlramInfoDetailOfFan(@RequestParam(required = true) String id,
+			@RequestParam(required = true) String type) {
 		if ("FAN".equals(type)) {
 			return ResponseHelper.buildResponse(iAlarmInfoDetailService.getAlramInfoDetailOfFan(id));
 		} else {
@@ -274,31 +305,36 @@ public class AnalyseController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@ApiOperation(httpMethod = "GET", value = "预警详情信息-光伏", notes = "预警详情信息-光伏")
 	@GetMapping(value = "/queryIndexByArae")
-    public ResponseModel<Map<String, Object>> queryIndexByArae(@RequestParam(required = false) String area, String analysisType, String startTimeTop, String endTimeTop) {
+	public ResponseModel<Map<String, Object>> queryIndexByArae(@RequestParam(required = false) String area,
+			String analysisType, String startTimeTop, String endTimeTop) {
 
 		SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        if ( null != endTimeTop){
+		if (null != endTimeTop) {
 			Date endDate = DateUtils.dateAddHours(DateUtils.longStr2Date(endTimeTop), -8);
 			endTimeTop = formatter.format(endDate);
 		}
 		Date startDate = DateUtils.dateAddHours(DateUtils.longStr2Date(startTimeTop), -8);
 		startTimeTop = formatter.format(startDate);
 
-        List<FanHealthIndex> fanHealthIndices = fanHealthIndexMapper.selectData(null, area, null, null, analysisType, "片区", null, null, null, startTimeTop, endTimeTop);
-        List<PvHealthIndex> pvHealthIndices = pvHealthIndexMapper.selectData(null, area, null, null, analysisType, "片区", null, null, null, startTimeTop, endTimeTop);
+		List<FanHealthIndex> fanHealthIndices = fanHealthIndexMapper.selectData(null, area, null, null, analysisType,
+				"片区", null, null, null, startTimeTop, endTimeTop);
+		List<PvHealthIndex> pvHealthIndices = pvHealthIndexMapper.selectData(null, area, null, null, analysisType, "片区",
+				null, null, null, startTimeTop, endTimeTop);
 
 		for (PvHealthIndex pvHealthIndex : pvHealthIndices) {
 			FanHealthIndex fanHealthIndex = new FanHealthIndex();
-            BeanUtils.copyProperties(pvHealthIndex,fanHealthIndex);
+			BeanUtils.copyProperties(pvHealthIndex, fanHealthIndex);
 			fanHealthIndices.add(fanHealthIndex);
 		}
 		Map<String, Object> map = new HashMap<>();
 		List<Object> axisData = new ArrayList<>();
 		List<Object> seriesData = new ArrayList<>();
-        Map<String, List<FanHealthIndex>> mapList = fanHealthIndices.stream().collect(Collectors.groupingBy(FanHealthIndex::getAnalysisTime));
+		Map<String, List<FanHealthIndex>> mapList = fanHealthIndices.stream()
+				.collect(Collectors.groupingBy(FanHealthIndex::getAnalysisTime));
 		for (String s : mapList.keySet()) {
 			List<FanHealthIndex> fanHealthIndices1 = mapList.get(s);
-            Double healtnIndex = fanHealthIndices1.stream().collect(Collectors.averagingDouble(FanHealthIndex::getHealthIndex));
+			Double healtnIndex = fanHealthIndices1.stream()
+					.collect(Collectors.averagingDouble(FanHealthIndex::getHealthIndex));
 			seriesData.add(healtnIndex.intValue());
 			axisData.add(s);
 		}
@@ -311,7 +347,7 @@ public class AnalyseController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@ApiOperation(httpMethod = "GET", value = "获取当前人的权限-全国、片区、场站", notes = "获取当前人的权限-全国、片区、场站")
 	@GetMapping(value = "/getCurrentUserPermissions")
-    public ResponseModel<List<String>> getFanConditionVariablesByTime() {
+	public ResponseModel<List<String>> getCurrentUserPermissions() {
 		return ResponseHelper.buildResponse(permissionService.getCurrentUserPermissions());
 	}
 }