Skip to content

A
amos-boot-zx-biz
Commit 9c565fbf authored by lilongyang's avatar lilongyang
Browse files
Options

Merge branch 'developer' of http://36.40.66.175:5000/moa/jxdj_zx/amos-boot-zx-biz into developer

parents b40e4cf1 0f2eff66
Hide whitespace changes
Inline Side-by-side
Showing with 192 additions and 192 deletions
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/TDBigScreenAnalyseController.java
View file @ 9c565fbf
......@@ -867,7 +867,7 @@ public class TDBigScreenAnalyseController extends BaseController implements Appl
private Page<Map<String, Object>> subSystemPointInfo(String subSystem, String stationId, String equipmentName) {
StationBasic stationBasic = stationBasicMapper.selectById(stationId);
equipmentName = StrUtil.isNotEmpty(equipmentName) ? "%" + equipmentName + "风机%" : equipmentName;
equipmentName = StrUtil.isNotEmpty(equipmentName) && !equipmentName.equals("升压站") ? "%" + equipmentName + "风机%" : equipmentName;
List<Map<String, Object>> healthListInfo = idxBizFanHealthIndexMapper.getHealthInfoBySubSystem(subSystem,
stationBasic.getFanGatewayId(), equipmentName,stationBasic.getBoosterGatewayId());
......
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/TdInfoQueryController.java
View file @ 9c565fbf
......@@ -84,98 +84,98 @@ public class TdInfoQueryController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@PostMapping(value = "/getFanHealthIndexInfoOld")
@ApiOperation(httpMethod = "POST", value = "分页查询健康指数信息 - 风电", notes = "分页查询健康指数信息 - 风电")
@GatewayIdAutowired
public ResponseModel<Page<FanHealthIndex>> getFanHealthIndexInfoOld(@RequestBody FanHealthIndexDto dto) throws ParseException {
ReginParams reginParams = getSelectedOrgInfo();
String userId = reginParams.getUserModel().getUserId();
StdUserEmpower stdUserEmpower = userEmpowerMapper.selectOne(new QueryWrapper<StdUserEmpower>().eq("amos_user_id", userId).eq("permission_type", "YTH"));
String orgCode = "86"+"%";
if (!ObjectUtils.isEmpty(stdUserEmpower)) {
orgCode = stdUserEmpower.getAmosOrgCode().get(0)+"%";
}
dto.setOrgCode(orgCode);
Date currentDate = new Date();
if (CharSequenceUtil.isNotEmpty(dto.getStartDate())) {
String startDate = dto.getStartDate();
if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按天") && startDate.length() == 10) {
Date date = DateUtils.dateParse(startDate + " 00:00:00", DATE_TIME_PATTERN);
dto.setStartDate(DateUtils.dateFormat(DateUtils.dateAddHours(date, 0), DATE_TIME_PATTERN));
}else if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按小时") && startDate.length() == 13) {
Date date = DateUtils.dateParse(startDate + ":00:00", DATE_TIME_PATTERN);
dto.setStartDate(DateUtils.dateFormat(DateUtils.dateAddHours(date, -9), DATE_TIME_PATTERN));
} else if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按10分钟") && startDate.length() == 16) {
StringBuilder newStartDate = new StringBuilder(startDate);
int number = 0;
if((newStartDate.charAt(15) - '0') > 0) {
number = 9;
}
newStartDate.replace(15, 16, number+"");
Date startDateDate = DateUtils.dateParse(newStartDate + ":00", DATE_TIME_PATTERN);
dto.setStartDate(DateUtils.dateFormat(DateUtils.dateAddHours(startDateDate, -8), DATE_TIME_PATTERN));
} else {
Date date = DateUtils.dateParse(startDate, DATE_TIME_PATTERN);
dto.setStartDate(DateUtils.dateFormat(DateUtils.dateAddHours(date, -8), DATE_TIME_PATTERN));
}
}
if (CharSequenceUtil.isNotEmpty(dto.getEndDate())) {
String endDate = dto.getEndDate();
if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按天") && endDate.length() == 10) {
Date endDateDate = DateUtils.dateParse(endDate + " 23:59:59", DATE_TIME_PATTERN);
dto.setEndDate(DateUtils.dateFormat(DateUtils.dateAddHours(endDateDate, 0), DATE_TIME_PATTERN));
}else
if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按小时") && endDate.length() == 13) {
Date endDateDate = DateUtils.dateParse(endDate + ":59:59", DATE_TIME_PATTERN);
dto.setEndDate(DateUtils.dateFormat(DateUtils.dateAddHours(endDateDate, -9), DATE_TIME_PATTERN));
} else
if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按10分钟") && endDate.length() == 16) {
StringBuilder newEndDate = new StringBuilder(endDate);
newEndDate.replace(15, 16, "9");
Date endDateDate = DateUtils.dateParse(newEndDate + ":59", DATE_TIME_PATTERN);
dto.setEndDate(DateUtils.dateFormat(DateUtils.dateAddHours(endDateDate, -8), DATE_TIME_PATTERN));
} else {
Date endDateDate = DateUtils.dateParse(endDate, "yyyy-MM-dd HH:mm:ss");
dto.setEndDate(DateUtils.dateFormat(DateUtils.dateAddHours(endDateDate, -8), DATE_TIME_PATTERN));
}
}
Page<FanHealthIndex> resultPage = new Page<>(dto.getCurrent(), dto.getSize());
dto.setCurrent((dto.getCurrent() - 1) * dto.getSize());
if (CharSequenceUtil.isNotEmpty(dto.getSortsString())) {
ObjectMapper objectMapper = new ObjectMapper();
try {
List<Map<String, String>> list = objectMapper.readValue(dto.getSortsString(), new TypeReference<List<Map<String, String>>>(){});
dto.setSorts(list);
} catch (Exception e) {
e.printStackTrace();
}
}
List<Map<String, String>> orderWeight = dto.getSorts().stream().sorted(Comparator.comparing(t -> Integer.parseInt(t.get("orderWeight")))).collect(Collectors.toList());
List<String> orderByList = new ArrayList<>();
for (Map<String, String> map : orderWeight) {
String replace = map.get("order").replace("end", "");
String columnOrder = convert(map.get("columnKey")) + " " + replace;
orderByList.add(columnOrder);
}
String join = String.join(",", orderByList);
dto.setOrderColumns(join);
if (CharSequenceUtil.isNotEmpty(dto.getSortOne())) {
String[] split = dto.getSortOne().split(",");
String replace = split[1].replace("end", "");
String orderColumn = convert(split[0]) + " " + replace;
dto.setSortOne(orderColumn);
}
List<FanHealthIndex> fanHealthIndexIPage = fanHealthIndexMapper.getInfoByPage(dto);
fanHealthIndexIPage.forEach(item -> item.setHealthIndex(Double.valueOf(df.format(item.getHealthIndex()))));
Integer infoByPageTotal = fanHealthIndexMapper.getInfoByPageTotal(dto);
resultPage.setRecords(fanHealthIndexIPage);
resultPage.setTotal(infoByPageTotal);
return ResponseHelper.buildResponse(resultPage);
}
// @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
// @PostMapping(value = "/getFanHealthIndexInfoOld")
// @ApiOperation(httpMethod = "POST", value = "分页查询健康指数信息 - 风电", notes = "分页查询健康指数信息 - 风电")
// @GatewayIdAutowired
// public ResponseModel<Page<FanHealthIndex>> getFanHealthIndexInfoOld(@RequestBody FanHealthIndexDto dto) throws ParseException {
// ReginParams reginParams = getSelectedOrgInfo();
// String userId = reginParams.getUserModel().getUserId();
// StdUserEmpower stdUserEmpower = userEmpowerMapper.selectOne(new QueryWrapper<StdUserEmpower>().eq("amos_user_id", userId).eq("permission_type", "YTH"));
// String orgCode = "86"+"%";
// if (!ObjectUtils.isEmpty(stdUserEmpower)) {
// orgCode = stdUserEmpower.getAmosOrgCode().get(0)+"%";
// }
// dto.setOrgCode(orgCode);
//
// Date currentDate = new Date();
// if (CharSequenceUtil.isNotEmpty(dto.getStartDate())) {
// String startDate = dto.getStartDate();
// if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按天") && startDate.length() == 10) {
// Date date = DateUtils.dateParse(startDate + " 00:00:00", DATE_TIME_PATTERN);
// dto.setStartDate(DateUtils.dateFormat(DateUtils.dateAddHours(date, 0), DATE_TIME_PATTERN));
// }else if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按小时") && startDate.length() == 13) {
// Date date = DateUtils.dateParse(startDate + ":00:00", DATE_TIME_PATTERN);
// dto.setStartDate(DateUtils.dateFormat(DateUtils.dateAddHours(date, -9), DATE_TIME_PATTERN));
// } else if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按10分钟") && startDate.length() == 16) {
// StringBuilder newStartDate = new StringBuilder(startDate);
// int number = 0;
// if((newStartDate.charAt(15) - '0') > 0) {
// number = 9;
// }
// newStartDate.replace(15, 16, number+"");
// Date startDateDate = DateUtils.dateParse(newStartDate + ":00", DATE_TIME_PATTERN);
// dto.setStartDate(DateUtils.dateFormat(DateUtils.dateAddHours(startDateDate, -8), DATE_TIME_PATTERN));
// } else {
// Date date = DateUtils.dateParse(startDate, DATE_TIME_PATTERN);
// dto.setStartDate(DateUtils.dateFormat(DateUtils.dateAddHours(date, -8), DATE_TIME_PATTERN));
// }
// }
// if (CharSequenceUtil.isNotEmpty(dto.getEndDate())) {
// String endDate = dto.getEndDate();
//
// if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按天") && endDate.length() == 10) {
// Date endDateDate = DateUtils.dateParse(endDate + " 23:59:59", DATE_TIME_PATTERN);
// dto.setEndDate(DateUtils.dateFormat(DateUtils.dateAddHours(endDateDate, 0), DATE_TIME_PATTERN));
// }else
// if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按小时") && endDate.length() == 13) {
// Date endDateDate = DateUtils.dateParse(endDate + ":59:59", DATE_TIME_PATTERN);
// dto.setEndDate(DateUtils.dateFormat(DateUtils.dateAddHours(endDateDate, -9), DATE_TIME_PATTERN));
// } else
// if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按10分钟") && endDate.length() == 16) {
// StringBuilder newEndDate = new StringBuilder(endDate);
// newEndDate.replace(15, 16, "9");
// Date endDateDate = DateUtils.dateParse(newEndDate + ":59", DATE_TIME_PATTERN);
// dto.setEndDate(DateUtils.dateFormat(DateUtils.dateAddHours(endDateDate, -8), DATE_TIME_PATTERN));
// } else {
// Date endDateDate = DateUtils.dateParse(endDate, "yyyy-MM-dd HH:mm:ss");
// dto.setEndDate(DateUtils.dateFormat(DateUtils.dateAddHours(endDateDate, -8), DATE_TIME_PATTERN));
// }
// }
// Page<FanHealthIndex> resultPage = new Page<>(dto.getCurrent(), dto.getSize());
// dto.setCurrent((dto.getCurrent() - 1) * dto.getSize());
// if (CharSequenceUtil.isNotEmpty(dto.getSortsString())) {
// ObjectMapper objectMapper = new ObjectMapper();
// try {
// List<Map<String, String>> list = objectMapper.readValue(dto.getSortsString(), new TypeReference<List<Map<String, String>>>(){});
// dto.setSorts(list);
// } catch (Exception e) {
// e.printStackTrace();
// }
// }
// List<Map<String, String>> orderWeight = dto.getSorts().stream().sorted(Comparator.comparing(t -> Integer.parseInt(t.get("orderWeight")))).collect(Collectors.toList());
// List<String> orderByList = new ArrayList<>();
// for (Map<String, String> map : orderWeight) {
// String replace = map.get("order").replace("end", "");
// String columnOrder = convert(map.get("columnKey")) + " " + replace;
// orderByList.add(columnOrder);
// }
// String join = String.join(",", orderByList);
// dto.setOrderColumns(join);
// if (CharSequenceUtil.isNotEmpty(dto.getSortOne())) {
// String[] split = dto.getSortOne().split(",");
// String replace = split[1].replace("end", "");
// String orderColumn = convert(split[0]) + " " + replace;
// dto.setSortOne(orderColumn);
// }
//
// List<FanHealthIndex> fanHealthIndexIPage = fanHealthIndexMapper.getInfoByPage(dto);
// fanHealthIndexIPage.forEach(item -> item.setHealthIndex(Double.valueOf(df.format(item.getHealthIndex()))));
// Integer infoByPageTotal = fanHealthIndexMapper.getInfoByPageTotal(dto);
// resultPage.setRecords(fanHealthIndexIPage);
// resultPage.setTotal(infoByPageTotal);
// return ResponseHelper.buildResponse(resultPage);
// }
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@PostMapping(value = "/getFanHealthIndexInfo")
......@@ -404,101 +404,101 @@ public class TdInfoQueryController extends BaseController {
return ResponseHelper.buildResponse(resultPage);
}
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@PostMapping(value = "/getPvHealthIndexInfoOld")
@ApiOperation(httpMethod = "POST", value = "分页查询健康指数信息 - 光伏", notes = "分页查询健康指数信息 - 光伏")
@GatewayIdAutowired
public ResponseModel<Page<PvHealthIndex>> getPvHealthIndexInfoOld(@RequestBody PvHealthIndexDto dto) throws ParseException {
ReginParams reginParams = getSelectedOrgInfo();
String userId = reginParams.getUserModel().getUserId();
StdUserEmpower stdUserEmpower = userEmpowerMapper.selectOne(new QueryWrapper<StdUserEmpower>().eq("amos_user_id", userId).eq("permission_type", "YTH"));
String orgCode = "86"+"%";
if (!ObjectUtils.isEmpty(stdUserEmpower)) {
orgCode = stdUserEmpower.getAmosOrgCode().get(0)+"%";
}
dto.setOrgCode(orgCode);
if (CharSequenceUtil.isNotEmpty(dto.getStartDate())) {
String startDate = dto.getStartDate();
if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按天") && startDate.length() == 10) {
Date date = DateUtils.dateParse(startDate + " 00:00:00", DATE_TIME_PATTERN);
dto.setStartDate(DateUtils.dateFormat(DateUtils.dateAddHours(date, 0), DATE_TIME_PATTERN));
}else if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按小时") && startDate.length() == 13) {
Date date = DateUtils.dateParse(startDate + ":00:00", DATE_TIME_PATTERN);
dto.setStartDate(DateUtils.dateFormat(DateUtils.dateAddHours(date, -9), DATE_TIME_PATTERN));
} else if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按10分钟") && startDate.length() == 16) {
StringBuilder newStartDate = new StringBuilder(startDate);
int number = 0;
if((newStartDate.charAt(15) - '0') > 0) {
number = 9;
}
newStartDate.replace(15, 16, number+"");
Date startDateDate = DateUtils.dateParse(newStartDate + ":00", DATE_TIME_PATTERN);
dto.setStartDate(DateUtils.dateFormat(DateUtils.dateAddHours(startDateDate, -8), DATE_TIME_PATTERN));
} else {
Date date = DateUtils.dateParse(startDate, DATE_TIME_PATTERN);
dto.setStartDate(DateUtils.dateFormat(DateUtils.dateAddHours(date, -8), DATE_TIME_PATTERN));
}
}
if (CharSequenceUtil.isNotEmpty(dto.getEndDate())) {
String endDate = dto.getEndDate();
if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按天") && endDate.length() == 10) {
Date endDateDate = DateUtils.dateParse(endDate + " 23:59:59", DATE_TIME_PATTERN);
dto.setEndDate(DateUtils.dateFormat(DateUtils.dateAddHours(endDateDate, 0), DATE_TIME_PATTERN));
}else
if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按小时") && endDate.length() == 13) {
Date endDateDate = DateUtils.dateParse(endDate + ":59:59", DATE_TIME_PATTERN);
dto.setEndDate(DateUtils.dateFormat(DateUtils.dateAddHours(endDateDate, -9), DATE_TIME_PATTERN));
} else
if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按10分钟") && endDate.length() == 16) {
StringBuilder newEndDate = new StringBuilder(endDate);
newEndDate.replace(15, 16, "9");
Date endDateDate = DateUtils.dateParse(newEndDate + ":59", DATE_TIME_PATTERN);
dto.setEndDate(DateUtils.dateFormat(DateUtils.dateAddHours(endDateDate, -8), DATE_TIME_PATTERN));
} else {
Date endDateDate = DateUtils.dateParse(endDate, "yyyy-MM-dd HH:mm:ss");
dto.setEndDate(DateUtils.dateFormat(DateUtils.dateAddHours(endDateDate, -8), DATE_TIME_PATTERN));
}
}
if (CharSequenceUtil.isNotEmpty(dto.getSortsString())) {
ObjectMapper objectMapper = new ObjectMapper();
try {
List<Map<String, String>> list = objectMapper.readValue(dto.getSortsString(), new TypeReference<List<Map<String, String>>>(){});
dto.setSorts(list);
} catch (Exception e) {
e.printStackTrace();
}
}
Page<PvHealthIndex> resultPage = new Page<>(dto.getCurrent(), dto.getSize());
dto.setCurrent((dto.getCurrent() - 1) * dto.getSize());
List<Map<String, String>> orderWeight = dto.getSorts().stream().sorted(Comparator.comparing(t -> Integer.parseInt(t.get("orderWeight")))).collect(Collectors.toList());
List<String> orderByList = new ArrayList<>();
for (Map<String, String> map : orderWeight) {
String replace = map.get("order").replace("end", "");
String columnOrder = convert(map.get("columnKey")) + " " + replace;
orderByList.add(columnOrder);
}
if (CharSequenceUtil.isNotEmpty(dto.getSortOne())) {
String[] split = dto.getSortOne().split(",");
String replace = split[1].replace("end", "");
String orderColumn = convert(split[0]) + " " + replace;
dto.setSortOne(orderColumn);
}
String join = String.join(",", orderByList);
dto.setOrderColumns(join);
List<PvHealthIndex> pvHealthIndexIPage = pvHealthIndexMapper.getInfoByPage(dto);
pvHealthIndexIPage.forEach(item -> item.setHealthIndex(Double.valueOf(df.format(item.getHealthIndex()))));
Integer infoByPageTotal = pvHealthIndexMapper.getInfoByPageTotal(dto);
resultPage.setRecords(pvHealthIndexIPage);
resultPage.setTotal(infoByPageTotal);
return ResponseHelper.buildResponse(resultPage);
}
// @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
// @PostMapping(value = "/getPvHealthIndexInfoOld")
// @ApiOperation(httpMethod = "POST", value = "分页查询健康指数信息 - 光伏", notes = "分页查询健康指数信息 - 光伏")
// @GatewayIdAutowired
// public ResponseModel<Page<PvHealthIndex>> getPvHealthIndexInfoOld(@RequestBody PvHealthIndexDto dto) throws ParseException {
// ReginParams reginParams = getSelectedOrgInfo();
// String userId = reginParams.getUserModel().getUserId();
// StdUserEmpower stdUserEmpower = userEmpowerMapper.selectOne(new QueryWrapper<StdUserEmpower>().eq("amos_user_id", userId).eq("permission_type", "YTH"));
// String orgCode = "86"+"%";
// if (!ObjectUtils.isEmpty(stdUserEmpower)) {
// orgCode = stdUserEmpower.getAmosOrgCode().get(0)+"%";
// }
// dto.setOrgCode(orgCode);
//
// if (CharSequenceUtil.isNotEmpty(dto.getStartDate())) {
// String startDate = dto.getStartDate();
//
// if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按天") && startDate.length() == 10) {
// Date date = DateUtils.dateParse(startDate + " 00:00:00", DATE_TIME_PATTERN);
// dto.setStartDate(DateUtils.dateFormat(DateUtils.dateAddHours(date, 0), DATE_TIME_PATTERN));
// }else if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按小时") && startDate.length() == 13) {
// Date date = DateUtils.dateParse(startDate + ":00:00", DATE_TIME_PATTERN);
// dto.setStartDate(DateUtils.dateFormat(DateUtils.dateAddHours(date, -9), DATE_TIME_PATTERN));
// } else if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按10分钟") && startDate.length() == 16) {
// StringBuilder newStartDate = new StringBuilder(startDate);
// int number = 0;
// if((newStartDate.charAt(15) - '0') > 0) {
// number = 9;
// }
// newStartDate.replace(15, 16, number+"");
// Date startDateDate = DateUtils.dateParse(newStartDate + ":00", DATE_TIME_PATTERN);
// dto.setStartDate(DateUtils.dateFormat(DateUtils.dateAddHours(startDateDate, -8), DATE_TIME_PATTERN));
// } else {
// Date date = DateUtils.dateParse(startDate, DATE_TIME_PATTERN);
// dto.setStartDate(DateUtils.dateFormat(DateUtils.dateAddHours(date, -8), DATE_TIME_PATTERN));
// }
//
//
//
// }
// if (CharSequenceUtil.isNotEmpty(dto.getEndDate())) {
// String endDate = dto.getEndDate();
//
// if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按天") && endDate.length() == 10) {
// Date endDateDate = DateUtils.dateParse(endDate + " 23:59:59", DATE_TIME_PATTERN);
// dto.setEndDate(DateUtils.dateFormat(DateUtils.dateAddHours(endDateDate, 0), DATE_TIME_PATTERN));
// }else
// if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按小时") && endDate.length() == 13) {
// Date endDateDate = DateUtils.dateParse(endDate + ":59:59", DATE_TIME_PATTERN);
// dto.setEndDate(DateUtils.dateFormat(DateUtils.dateAddHours(endDateDate, -9), DATE_TIME_PATTERN));
// } else
// if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按10分钟") && endDate.length() == 16) {
// StringBuilder newEndDate = new StringBuilder(endDate);
// newEndDate.replace(15, 16, "9");
// Date endDateDate = DateUtils.dateParse(newEndDate + ":59", DATE_TIME_PATTERN);
// dto.setEndDate(DateUtils.dateFormat(DateUtils.dateAddHours(endDateDate, -8), DATE_TIME_PATTERN));
// } else {
// Date endDateDate = DateUtils.dateParse(endDate, "yyyy-MM-dd HH:mm:ss");
// dto.setEndDate(DateUtils.dateFormat(DateUtils.dateAddHours(endDateDate, -8), DATE_TIME_PATTERN));
// }
//
// }
// if (CharSequenceUtil.isNotEmpty(dto.getSortsString())) {
// ObjectMapper objectMapper = new ObjectMapper();
// try {
// List<Map<String, String>> list = objectMapper.readValue(dto.getSortsString(), new TypeReference<List<Map<String, String>>>(){});
// dto.setSorts(list);
// } catch (Exception e) {
// e.printStackTrace();
// }
// }
// Page<PvHealthIndex> resultPage = new Page<>(dto.getCurrent(), dto.getSize());
// dto.setCurrent((dto.getCurrent() - 1) * dto.getSize());
// List<Map<String, String>> orderWeight = dto.getSorts().stream().sorted(Comparator.comparing(t -> Integer.parseInt(t.get("orderWeight")))).collect(Collectors.toList());
// List<String> orderByList = new ArrayList<>();
// for (Map<String, String> map : orderWeight) {
// String replace = map.get("order").replace("end", "");
// String columnOrder = convert(map.get("columnKey")) + " " + replace;
// orderByList.add(columnOrder);
// }
// if (CharSequenceUtil.isNotEmpty(dto.getSortOne())) {
// String[] split = dto.getSortOne().split(",");
// String replace = split[1].replace("end", "");
// String orderColumn = convert(split[0]) + " " + replace;
// dto.setSortOne(orderColumn);
// }
// String join = String.join(",", orderByList);
// dto.setOrderColumns(join);
// List<PvHealthIndex> pvHealthIndexIPage = pvHealthIndexMapper.getInfoByPage(dto);
// pvHealthIndexIPage.forEach(item -> item.setHealthIndex(Double.valueOf(df.format(item.getHealthIndex()))));
// Integer infoByPageTotal = pvHealthIndexMapper.getInfoByPageTotal(dto);
// resultPage.setRecords(pvHealthIndexIPage);
// resultPage.setTotal(infoByPageTotal);
// return ResponseHelper.buildResponse(resultPage);
// }
......
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/tdengine2/FanHealthIndex.xml
View file @ 9c565fbf
......@@ -189,10 +189,10 @@
</where>
<if test="dto.orderColumns != null and dto.orderColumns != ''">
order by ${dto.orderColumns}
order by ${dto.orderColumns},ts desc
</if>
<if test="(dto.orderColumns == null or dto.orderColumns == '') and dto.sortOne != null and dto.sortOne != ''">
order by ${dto.sortOne}
order by ${dto.sortOne},ts desc
</if>
limit #{dto.current}, #{dto.size}
</select>
......
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/tdengine2/PvHealthIndex.xml
View file @ 9c565fbf
......@@ -220,10 +220,10 @@
</where>
<if test="dto.orderColumns != null and dto.orderColumns != ''">
order by ${dto.orderColumns}
order by ${dto.orderColumns},ts desc
</if>
<if test="(dto.orderColumns == null or dto.orderColumns == '') and dto.sortOne != null and dto.sortOne != ''">
order by ${dto.sortOne}
order by ${dto.sortOne},ts desc
</if>
limit #{dto.current}, #{dto.size}
</select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment