From 2e0b760e1c26015d1835f4338006d6fa04707248 Mon Sep 17 00:00:00 2001
From: ali <ali9696@163.com>
Date: 星期三, 19 三月 2025 18:40:18 +0800
Subject: [PATCH] Merge branch 'develop1.0' of https://github.com/Andy-Yin/zhitan-ems into develop1.0
---
readme/img/image-yc.png | 0
readme/logo-chinese.png | 0
readme/img/image-zhuoyue.png | 0
zhitan-admin/src/main/java/com/zhitan/web/controller/keyequipment/MonthlyKeyEquipmentController.java | 104 +++++++++++++++-------------------
README.md | 20 +++++-
zhitan-admin/src/main/java/com/zhitan/web/controller/keyequipment/DailyKeyEquipmenteController.java | 14 ++--
zhitan-admin/src/main/java/com/zhitan/web/controller/keyequipment/YearKeyEquipmentController.java | 11 +--
7 files changed, 76 insertions(+), 73 deletions(-)
diff --git a/README.md b/README.md
index 3f71c89..6e221bd 100644
--- a/README.md
+++ b/README.md
@@ -3,9 +3,13 @@
</div>
<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">鏅虹⒊鑳芥簮绠＄悊绯荤粺</h1>
<p align="center">鍩轰簬SpringBoot鍜岃嫢渚濇鏋跺紑鍙�</p>
+<p align="center">鑳界⒊骞冲彴鍚庡彴灞曠ず&鎺ュ彛宸插畬鍏ㄥ紑婧愶紝浠ｇ爜瀹屽锛屽姛鑳介綈鍏紝杩愯姝ｅ父</p>
+<p align="center">鏁伴噰鍜屾暟鎹竻娲楅儴鍒嗙綉涓婂紑婧愮殑搴撳緢澶氾紝瀛︿範鑰呭彲浠ュ弬鑰冨弸鍟嗛泦鎴�</p>
+<p align="center"><span style="color: red;">閫氳繃鏈」鐩紝瀛︿範鑰呭彲浠ユ帉鎻¤兘婧愮鐞嗚涓氱殑鍔熻兘鍜屼笟鍔★紝浠ュ強鎶�鏈灦鏋勩��</span></p>
+
<p align="center">
- <a href='https://gitee.com/zhitan-ems/zhitan-ems/stargazers'><img src='https://gitee.com/zhitan-ems/zhitan-ems/badge/star.svg?theme=dark' alt='star'></img></a>
- <a href='https://gitee.com/zhitan-ems/zhitan-ems/members'><img src='https://gitee.com/zhitan-ems/zhitan-ems/badge/fork.svg?theme=dark' alt='fork'></img></a>
+ <a href='https://gitee.com/liulingling1993/zhitan-ems/stargazers'><img src='https://gitee.com/liulingling1993/zhitan-ems/badge/star.svg?theme=dark' alt='star'></img></a>
+ <a href='https://gitee.com/liulingling1993/zhitan-ems/members'><img src='https://gitee.com/liulingling1993/zhitan-ems/badge/fork.svg?theme=dark' alt='fork'></img></a>
</p>
## 浠嬬粛
@@ -14,7 +18,17 @@
閽堝瀹㈡埛鍦烘櫙锛氭斂搴溿�佸洯鍖恒�佷紒涓氥�佸伐鐭裤�佸叕鍏卞缓绛戠瓑銆�
-## 璇峰ぇ瀹舵湁闂鎻恑ssue鍚с�傘�傘��
+## 銆愭敞鎰忋�戝畬鏁磋兘纰崇鐞嗗钩鍙板寘鍚笁涓儴鍒嗭紝<span style="color: red;">鏈粨搴撳彧鍖呭惈鑳界⒊骞冲彴灞曠ず绔�</span>
+##### 鑳界⒊骞冲彴灞曠ず绔細<span style="color: red;">涔熷嵆鏈」鐩兘纰冲钩鍙板悗鍙板睍绀洪儴鍒嗭紝浠ｇ爜瀹屽锛岃繍琛屾甯搞�傞�氳繃鏈」鐩紝瀛︿範鑰呭彲浠ユ帉鎻¤兘婧愮鐞嗚涓氱殑鍔熻兘鍜屼笟鍔★紝浠ュ強鎶�鏈灦鏋勩��</span>
+##### 鏁版嵁閲囬泦绋嬪簭锛氫篃鍗砿qtt鉃★笍鏃跺簭搴撳姛鑳斤紝甯傞潰涓婂紑婧愬簱闈炲父澶氾紝鍙弬鑰僼hingsjs绛夌煡鍚嶉」鐩紝鎴栬�呰嚜宸辩敤netty鑷繁瀹炵幇銆�
+##### 鏁版嵁娓呮礂鏈嶅姟锛氫篃鍗虫椂搴忓簱鉃★笍鍏崇郴搴擄紝瀛︿範鑰呭彲浠ヤ娇鐢╦ava鑷甫鐨刋XL job绛夎鍒掍换鍔″伐鍏疯嚜宸辨寜鐓т笟鍔″姛鑳斤紝鏉ュ疄鐜版暟鎹竻娲楁湇鍔°��
+
+## 鍏充簬闂绛旂枒
+
+##### 鍥犳�绘槸鏈変汉鎭舵剰涓炬姤鎴戜滑浠撳簱锛岃鎴戜滑鍋氬晢涓氭帹骞匡紝椤炬垜宸茬粡鍒犻櫎浜嗘墍鏈夎仈绯绘柟寮忓拰浜ゆ祦缇�
+##### 婕旂ずdemo銆乴ogo銆佹埅鍥剧瓑涔熸崲鎴愪簡涓�х殑鍚嶅瓧锛屽幓鎺変簡鎵�鏈夋湁鍙兘娑夊強鍒版秹瀚屾帹骞跨殑瀛楃溂锛堟垜浠篃涓嶇煡閬揼it琚妇鎶ョ殑瑙勫垯鏄粈涔堛�傘�傘�傦級
+##### 鎵�浠ュぇ瀹跺鏋滄湁闂锛屾彁issue鍚с�傘�傘��
+##
## 鍦ㄧ嚎浣撻獙
diff --git a/readme/img/image-yc.png b/readme/img/image-yc.png
new file mode 100644
index 0000000..f186f13
--- /dev/null
+++ b/readme/img/image-yc.png
Binary files differ
diff --git a/readme/img/image.png b/readme/img/image-zhuoyue.png
similarity index 100%
rename from readme/img/image.png
rename to readme/img/image-zhuoyue.png
Binary files differ
diff --git a/readme/logo-chinese.png b/readme/logo-chinese.png
index 5c08b1c..a91e11c 100644
--- a/readme/logo-chinese.png
+++ b/readme/logo-chinese.png
Binary files differ
diff --git a/zhitan-admin/src/main/java/com/zhitan/web/controller/keyequipment/DailyKeyEquipmenteController.java b/zhitan-admin/src/main/java/com/zhitan/web/controller/keyequipment/DailyKeyEquipmenteController.java
index 07dbc79..ac287f6 100644
--- a/zhitan-admin/src/main/java/com/zhitan/web/controller/keyequipment/DailyKeyEquipmenteController.java
+++ b/zhitan-admin/src/main/java/com/zhitan/web/controller/keyequipment/DailyKeyEquipmenteController.java
@@ -3,7 +3,6 @@
import com.zhitan.basicdata.domain.FacilityArchives;
import com.zhitan.common.core.controller.BaseController;
import com.zhitan.common.core.domain.AjaxResult;
-import com.zhitan.common.core.page.TableDataInfo;
import com.zhitan.keyequipment.domain.DailyKeyEquipment;
import com.zhitan.keyequipment.service.IDailyKeyEquipmentService;
import com.zhitan.model.domain.EnergyIndex;
@@ -43,14 +42,14 @@
@GetMapping("/list")
@ApiOperation(value = "閲嶇偣璁惧鑳借�楀垎鏋愶紙鏃ワ級鍒楄〃")
- public TableDataInfo list(DataItem dataItem) throws ParseException {
+ public AjaxResult list(DataItem dataItem) throws ParseException {
List<ModelNode> nodeId = modelNodeService.getModelNodeByModelCode(dataItem.getIndexCode());
if(CollectionUtils.isEmpty(nodeId)){
- return getDataTable(new ArrayList<>());
+ return success(new ArrayList<>());
}
List<EnergyIndex> energyList = modelNodeService.getSettingIndex(nodeId.get(0).getNodeId());
if(CollectionUtils.isEmpty(energyList)){
- return getDataTable(new ArrayList<>());
+ return success(new ArrayList<>());
}
List<String> indexIds = energyList.stream().map(EnergyIndex::getIndexId).collect(Collectors.toList());
List<DailyKeyEquipment> dataList=new ArrayList<>();
@@ -74,9 +73,10 @@
dataList.add(report);
i++;
};
- startPage();
+
List<DailyKeyEquipment> list = dailykeyEquipment.getdailyKeyEquipmentList(indexIds, dataList,dataItem.getBeginTime(),dataItem.getEndTime(), dataItem.getTimeType(),dataItem.getEnergyType());
- return getDataTable(list);
+
+ return success(list);
}
@GetMapping("/listChart")
@@ -93,7 +93,7 @@
}
/*鎵�鏈夎澶�*/
@GetMapping("/getFacilityArchives")
- @ApiOperation(value = "鏌ヨ鎵�鏈夎澶囧垪琛�")
+ @ApiOperation(value = "鏌ヨ閲嶇偣璁惧鍒楄〃")
public AjaxResult getFacilityArchives() {
try {
List<FacilityArchives> list=dailykeyEquipment.getFacilityArchives();
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]); //鏈�
diff --git a/zhitan-admin/src/main/java/com/zhitan/web/controller/keyequipment/YearKeyEquipmentController.java b/zhitan-admin/src/main/java/com/zhitan/web/controller/keyequipment/YearKeyEquipmentController.java
index 4b1b56b..4d24ed4 100644
--- a/zhitan-admin/src/main/java/com/zhitan/web/controller/keyequipment/YearKeyEquipmentController.java
+++ b/zhitan-admin/src/main/java/com/zhitan/web/controller/keyequipment/YearKeyEquipmentController.java
@@ -3,7 +3,6 @@
import cn.hutool.core.date.DateUtil;
import com.zhitan.common.core.controller.BaseController;
import com.zhitan.common.core.domain.AjaxResult;
-import com.zhitan.common.core.page.TableDataInfo;
import com.zhitan.keyequipment.domain.YearKeyEquipment;
import com.zhitan.keyequipment.service.IYearKeyEquipmentService;
import com.zhitan.model.domain.EnergyIndex;
@@ -43,14 +42,14 @@
@GetMapping("/list")
@ApiOperation(value = "閲嶇偣璁惧鑳借�楃粺璁★紙骞达級鍒楄〃")
- public TableDataInfo list(DataItem dataItem) throws ParseException {
+ public AjaxResult list(DataItem dataItem) throws ParseException {
List<ModelNode> nodeId = modelNodeService.getModelNodeByModelCode(dataItem.getIndexCode());
if(CollectionUtils.isEmpty(nodeId)){
- return getDataTable(new ArrayList<>());
+ return success(new ArrayList<>());
}
List<EnergyIndex> energyList = modelNodeService.getSettingIndex(nodeId.get(0).getNodeId());
if(CollectionUtils.isEmpty(energyList)){
- return getDataTable(new ArrayList<>());
+ return success(new ArrayList<>());
}
List<String> indexIds = energyList.stream().map(EnergyIndex::getIndexId).collect(Collectors.toList());
List<YearKeyEquipment> dataList=new ArrayList<>();
@@ -75,9 +74,9 @@
dataList.add(report);
i++;
}
- startPage();
+
List<YearKeyEquipment> list = yearKeyEquipmentService.getYearKeyEquipmentList(indexIds, dataList,dataItem.getBeginTime(),dataItem.getEndTime(), dataItem.getTimeType(),dataItem.getEnergyType());
- return getDataTable(list);
+ return success(list);
}
@GetMapping("/listChart")
--
Gitblit v1.9.3