From 5d36e1f987ef21e44ded2e8a1d06c28094ec1e76 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期六, 19 四月 2025 12:39:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhitan-admin/src/main/java/com/zhitan/web/controller/keyequipment/MonthlyKeyEquipmentController.java | 104 +++++++++++++++++++++++----------------------------
1 files changed, 47 insertions(+), 57 deletions(-)
diff --git a/zhitan-admin/src/main/java/com/zhitan/web/controller/keyequipment/MonthlyKeyEquipmentController.java b/zhitan-admin/src/main/java/com/zhitan/web/controller/keyequipment/MonthlyKeyEquipmentController.java
index 7cb93ba..11164fc 100644
--- a/zhitan-admin/src/main/java/com/zhitan/web/controller/keyequipment/MonthlyKeyEquipmentController.java
+++ b/zhitan-admin/src/main/java/com/zhitan/web/controller/keyequipment/MonthlyKeyEquipmentController.java
@@ -1,7 +1,6 @@
package com.zhitan.web.controller.keyequipment;
-import com.github.pagehelper.PageInfo;
import com.zhitan.common.core.controller.BaseController;
import com.zhitan.common.core.domain.AjaxResult;
import com.zhitan.keyequipment.domain.MonthlyKeyEquipment;
@@ -25,14 +24,14 @@
import java.util.stream.Collectors;
/**
- *閲嶇偣璁惧鑳借�楃粺璁� 鏈�
+ * 閲嶇偣璁惧鑳借�楃粺璁� 鏈�
*
* @author sys
* @date 2021-01-11
*/
@RestController
@RequestMapping("/keyEquipment/MonthlyKeyEquipment")
-@Api(value = "閲嶇偣璁惧鑳借�楃粺璁★紙鏈堬級",tags = {"璁惧鍗曡�楀垎鏋�"})
+@Api(value = "閲嶇偣璁惧鑳借�楃粺璁★紙鏈堬級", tags = {"璁惧鍗曡�楀垎鏋�"})
public class MonthlyKeyEquipmentController extends BaseController {
@Autowired
@@ -42,59 +41,49 @@
@GetMapping("/list")
@ApiOperation(value = "閲嶇偣璁惧鑳借�楃粺璁★紙鏈堬級鍒楄〃")
- public AjaxResult list(DataItem dataItem) {
- try {
- List<MonthlyKeyEquipment> dataList=new ArrayList<>();
+ public AjaxResult list(DataItem dataItem) throws ParseException {
+ List<MonthlyKeyEquipment> dataList = new ArrayList<>();
- Map tableColumn =new HashMap<>();//琛ㄦ暟鎹�
- DateFormat df = new SimpleDateFormat("yyyy-MM");
- SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- String aa= df.format(dataItem.getDataTime());
- String bb="";
- int i = 1;
- String beginTime=aa+"-01 00:00:00";
- dataItem.setBeginTime(sf.parse(beginTime));
- String endTime=aa+"-"+Integer.valueOf(getLastDayOfMonth(aa).substring(getLastDayOfMonth(aa).length()-2))+" 00:00:00";
- dataItem.setEndTime(sf.parse(endTime));
- while (i <= Integer.valueOf(getLastDayOfMonth(aa).substring(getLastDayOfMonth(aa).length()-2))) {
- if(i>9){
- bb=aa+"-"+i+" 00:00:00";
- }else{
- bb=aa+"-0"+i+" 00:00:00";
- }
- MonthlyKeyEquipment report=new MonthlyKeyEquipment();
- report.setDataTime(sf.parse(bb));
- report.setValue("value"+i);
- dataList.add(report);
- tableColumn.put("value"+i,String.valueOf(i)+"鏃�");
- i++;
+ Map tableColumn = new HashMap<>();//琛ㄦ暟鎹�
+ DateFormat df = new SimpleDateFormat("yyyy-MM");
+ SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String aa = df.format(dataItem.getDataTime());
+ String bb = "";
+ int i = 1;
+ String beginTime = aa + "-01 00:00:00";
+ dataItem.setBeginTime(sf.parse(beginTime));
+ String endTime = aa + "-" + Integer.valueOf(getLastDayOfMonth(aa).substring(getLastDayOfMonth(aa).length() - 2)) + " 00:00:00";
+ dataItem.setEndTime(sf.parse(endTime));
+ while (i <= Integer.valueOf(getLastDayOfMonth(aa).substring(getLastDayOfMonth(aa).length() - 2))) {
+ if (i > 9) {
+ bb = aa + "-" + i + " 00:00:00";
+ } else {
+ bb = aa + "-0" + i + " 00:00:00";
}
- List<Map> table=new ArrayList<>();
- MonthlyKeyEquipment reportList =new MonthlyKeyEquipment();
- table.add(tableColumn);
- reportList.setTablehead(table);
- List<ModelNode> nodeId = modelNodeService.getModelNodeByModelCode(dataItem.getIndexCode());
- if(CollectionUtils.isEmpty(nodeId)){
- return AjaxResult.success(reportList);
- }
- List<EnergyIndex> energyList = modelNodeService.getSettingIndex(nodeId.get(0).getNodeId());
- if(CollectionUtils.isEmpty(energyList)){
- return AjaxResult.success(reportList);
- }
- List<String> indexIds = energyList.stream().map(EnergyIndex::getIndexId).collect(Collectors.toList());
-
- startPage();
- List<MonthlyKeyEquipment> list = monthlyKeyEquipmentService.getMonthlyKeyEquipmentList(indexIds, dataList,dataItem.getBeginTime(),dataItem.getEndTime(), dataItem.getTimeType(),dataItem.getEnergyType());
- int count=Integer.valueOf(getLastDayOfMonth(aa).substring(getLastDayOfMonth(aa).length()-2));
- list.forEach(monthlyReport -> monthlyReport.setCount(count));
- reportList.setTabledata(list);
- reportList.setTotal(new PageInfo(list).getTotal());
-
- return AjaxResult.success(reportList);
- } catch (Exception ex) {
- logger.error("鑾峰彇鍑洪敊锛�", ex);
- return AjaxResult.error("鑾峰彇鍑洪敊!");
+ MonthlyKeyEquipment report = new MonthlyKeyEquipment();
+ report.setDataTime(sf.parse(bb));
+ report.setValue("value" + i);
+ dataList.add(report);
+ tableColumn.put("value" + i, String.valueOf(i) + "鏃�");
+ i++;
}
+ List<Map> table = new ArrayList<>();
+ MonthlyKeyEquipment reportList = new MonthlyKeyEquipment();
+ table.add(tableColumn);
+ reportList.setTablehead(table);
+ List<ModelNode> nodeId = modelNodeService.getModelNodeByModelCode(dataItem.getIndexCode());
+ if (CollectionUtils.isEmpty(nodeId)) {
+ return success(new ArrayList<>());
+ }
+ List<EnergyIndex> energyList = modelNodeService.getSettingIndex(nodeId.get(0).getNodeId());
+ if (CollectionUtils.isEmpty(energyList)) {
+ return success(new ArrayList<>());
+ }
+ List<String> indexIds = energyList.stream().map(EnergyIndex::getIndexId).collect(Collectors.toList());
+
+ List<MonthlyKeyEquipment> list = monthlyKeyEquipmentService.getMonthlyKeyEquipmentList(indexIds, dataList, dataItem.getBeginTime(), dataItem.getEndTime(), dataItem.getTimeType(), dataItem.getEnergyType());
+
+ return success(list);
}
@GetMapping("/listChart")
@@ -102,14 +91,15 @@
public AjaxResult listChart(DataItem dataItem) throws ParseException {
DateFormat df = new SimpleDateFormat("yyyy-MM");
SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- String aa= df.format(dataItem.getDataTime());
- String beginTime=aa+"-01 00:00:00";
+ String aa = df.format(dataItem.getDataTime());
+ String beginTime = aa + "-01 00:00:00";
dataItem.setBeginTime(sf.parse(beginTime));
- String endTime=aa+"-"+Integer.valueOf(getLastDayOfMonth(aa).substring(getLastDayOfMonth(aa).length()-2))+" 00:00:00";
+ String endTime = aa + "-" + Integer.valueOf(getLastDayOfMonth(aa).substring(getLastDayOfMonth(aa).length() - 2)) + " 00:00:00";
dataItem.setEndTime(sf.parse(endTime));
- List<MonthlyKeyEquipment> list = monthlyKeyEquipmentService.getListChart(dataItem.getIndexId(),dataItem.getBeginTime(),dataItem.getEndTime(), dataItem.getTimeType(),dataItem.getEnergyType());
+ List<MonthlyKeyEquipment> list = monthlyKeyEquipmentService.getListChart(dataItem.getIndexId(), dataItem.getBeginTime(), dataItem.getEndTime(), dataItem.getTimeType(), dataItem.getEnergyType());
return AjaxResult.success(list);
}
+
public static String getLastDayOfMonth(String yearMonth) {
int year = Integer.parseInt(yearMonth.split("-")[0]); //骞�
int month = Integer.parseInt(yearMonth.split("-")[1]); //鏈�
--
Gitblit v1.9.3