From a17d95ec4a1649bac4d9aebbe99784f33a5954e4 Mon Sep 17 00:00:00 2001
From: DYL0109 <1332079466@qq.com>
Date: 星期五, 17 一月 2025 22:15:08 +0800
Subject: [PATCH] !18 测试 Merge pull request !18 from DYL0109/develop1.0

---
 zhitan-admin/src/main/java/com/zhitan/web/controller/auxiliaryinput/ProductOutputController.java |   60 ++++++++++-------------------
 zhitan-admin/src/main/java/com/zhitan/web/controller/homepage/HomePageController.java            |    8 +---
 zhitan-admin/src/main/java/com/zhitan/web/controller/alarm/AlarmAnalyisisController.java         |    2 
 3 files changed, 24 insertions(+), 46 deletions(-)

diff --git a/zhitan-admin/src/main/java/com/zhitan/web/controller/alarm/AlarmAnalyisisController.java b/zhitan-admin/src/main/java/com/zhitan/web/controller/alarm/AlarmAnalyisisController.java
index bcc801c..8766e28 100644
--- a/zhitan-admin/src/main/java/com/zhitan/web/controller/alarm/AlarmAnalyisisController.java
+++ b/zhitan-admin/src/main/java/com/zhitan/web/controller/alarm/AlarmAnalyisisController.java
@@ -12,7 +12,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 /**
- * description todu
+geng * description 鎶ヨ鍒嗘瀽鐩稿叧鍔熻兘
  *
  * @author hmj
  * @date 2024-10-26 17:31
diff --git a/zhitan-admin/src/main/java/com/zhitan/web/controller/auxiliaryinput/ProductOutputController.java b/zhitan-admin/src/main/java/com/zhitan/web/controller/auxiliaryinput/ProductOutputController.java
index c3abae5..2b253e2 100644
--- a/zhitan-admin/src/main/java/com/zhitan/web/controller/auxiliaryinput/ProductOutputController.java
+++ b/zhitan-admin/src/main/java/com/zhitan/web/controller/auxiliaryinput/ProductOutputController.java
@@ -34,10 +34,9 @@
      */
     @PreAuthorize("@ss.hasPermi('system:prodoutput:list')")
     @GetMapping("/productoutput/list")
-    public TableDataInfo list(ProductOutput productOutput, @RequestParam Long pageNum, @RequestParam Long pageSize)
-    {
+    public TableDataInfo list(ProductOutput productOutput, @RequestParam Long pageNum, @RequestParam Long pageSize) {
         productOutput.setDataType("1");
-        Page<ProductOutput> list = auxiliaryInputService.selectProductOutputPage(productOutput,pageNum,pageSize);
+        Page<ProductOutput> list = auxiliaryInputService.selectProductOutputPage(productOutput, pageNum, pageSize);
         return getDataTable(list);
     }
 
@@ -47,8 +46,7 @@
     @PreAuthorize("@ss.hasPermi('system:prodoutput:export')")
     @Log(title = "浜у搧浜ч噺褰曞叆", businessType = BusinessType.EXPORT)
     @PostMapping("/productoutput/export")
-    public void export(HttpServletResponse response, ProductOutput productOutput)
-    {
+    public void export(HttpServletResponse response, ProductOutput productOutput) {
         productOutput.setDataType("1");
         List<ProductOutput> list = auxiliaryInputService.selectProductOutputList(productOutput);
         ExcelUtil<ProductOutput> util = new ExcelUtil<ProductOutput>(ProductOutput.class);
@@ -60,8 +58,7 @@
      */
     @PreAuthorize("@ss.hasPermi('system:prodoutput:query')")
     @GetMapping(value = "/productoutput/{productOutputId}")
-    public AjaxResult getInfo(@PathVariable("productOutputId") String productOutputId)
-    {
+    public AjaxResult getInfo(@PathVariable("productOutputId") String productOutputId) {
         return success(auxiliaryInputService.selectProductOutputById(productOutputId));
     }
 
@@ -71,8 +68,7 @@
     @PreAuthorize("@ss.hasPermi('system:prodoutput:add')")
     @Log(title = "浜у搧浜ч噺褰曞叆", businessType = BusinessType.INSERT)
     @PostMapping(value = "/productoutput")
-    public AjaxResult add(@RequestBody ProductOutput productOutput)
-    {
+    public AjaxResult add(@RequestBody ProductOutput productOutput) {
         productOutput.setProductOutputId(UUID.randomUUID().toString());
         productOutput.setDataType("1");
         return toAjax(auxiliaryInputService.insertProductOutput(productOutput));
@@ -84,8 +80,7 @@
     @PreAuthorize("@ss.hasPermi('system:prodoutput:edit')")
     @Log(title = "浜у搧浜ч噺褰曞叆", businessType = BusinessType.UPDATE)
     @PutMapping(value = "/productoutput")
-    public AjaxResult edit(@RequestBody ProductOutput productOutput)
-    {
+    public AjaxResult edit(@RequestBody ProductOutput productOutput) {
         return toAjax(auxiliaryInputService.updateProductOutput(productOutput));
     }
 
@@ -95,8 +90,7 @@
     @PreAuthorize("@ss.hasPermi('system:prodoutput:remove')")
     @Log(title = "浜у搧浜ч噺褰曞叆", businessType = BusinessType.DELETE)
     @DeleteMapping("/productoutput/{ids}")
-    public AjaxResult remove(@PathVariable String[] ids)
-    {
+    public AjaxResult remove(@PathVariable String[] ids) {
         return toAjax(auxiliaryInputService.deleteProductOutputByIds(ids));
     }
 
@@ -106,10 +100,9 @@
      */
     @PreAuthorize("@ss.hasPermi('system:meter:list')")
     @GetMapping("/meter/list")
-    public TableDataInfo meterList(ProductOutput productOutput, @RequestParam Long pageNum, @RequestParam Long pageSize)
-    {
+    public TableDataInfo meterList(ProductOutput productOutput, @RequestParam Long pageNum, @RequestParam Long pageSize) {
         productOutput.setDataType("2");
-        Page<ProductOutput> list = auxiliaryInputService.selectProductOutputPage(productOutput,pageNum,pageSize);
+        Page<ProductOutput> list = auxiliaryInputService.selectProductOutputPage(productOutput, pageNum, pageSize);
         return getDataTable(list);
     }
 
@@ -119,8 +112,7 @@
     @PreAuthorize("@ss.hasPermi('system:meter:export')")
     @Log(title = "鑳芥簮浠〃褰曞叆", businessType = BusinessType.EXPORT)
     @PostMapping("/meter/export")
-    public void meterExport(HttpServletResponse response, ProductOutput productOutput)
-    {
+    public void meterExport(HttpServletResponse response, ProductOutput productOutput) {
         productOutput.setDataType("2");
         List<ProductOutput> list = auxiliaryInputService.selectProductOutputList(productOutput);
         ExcelUtil<ProductOutput> util = new ExcelUtil<ProductOutput>(ProductOutput.class);
@@ -132,8 +124,7 @@
      */
     @PreAuthorize("@ss.hasPermi('system:meter:query')")
     @GetMapping(value = "/meter/{productOutputId}")
-    public AjaxResult meterGetInfo(@PathVariable("productOutputId") String productOutputId)
-    {
+    public AjaxResult meterGetInfo(@PathVariable("productOutputId") String productOutputId) {
         return success(auxiliaryInputService.selectProductOutputById(productOutputId));
     }
 
@@ -143,8 +134,7 @@
     @PreAuthorize("@ss.hasPermi('system:meter:add')")
     @Log(title = "鑳芥簮浠〃褰曞叆", businessType = BusinessType.INSERT)
     @PostMapping(value = "/meter")
-    public AjaxResult meterAdd(@RequestBody ProductOutput productOutput)
-    {
+    public AjaxResult meterAdd(@RequestBody ProductOutput productOutput) {
         productOutput.setProductOutputId(UUID.randomUUID().toString());
         productOutput.setDataType("2");
         return toAjax(auxiliaryInputService.insertProductOutput(productOutput));
@@ -156,8 +146,7 @@
     @PreAuthorize("@ss.hasPermi('system:meter:edit')")
     @Log(title = "鑳芥簮浠〃褰曞叆", businessType = BusinessType.UPDATE)
     @PutMapping(value = "/meter")
-    public AjaxResult meterEdit(@RequestBody ProductOutput productOutput)
-    {
+    public AjaxResult meterEdit(@RequestBody ProductOutput productOutput) {
         return toAjax(auxiliaryInputService.updateProductOutput(productOutput));
     }
 
@@ -167,8 +156,7 @@
     @PreAuthorize("@ss.hasPermi('system:meter:remove')")
     @Log(title = "鑳芥簮浠〃褰曞叆", businessType = BusinessType.DELETE)
     @DeleteMapping("/meter/{ids}")
-    public AjaxResult meterRemove(@PathVariable String[] ids)
-    {
+    public AjaxResult meterRemove(@PathVariable String[] ids) {
         return toAjax(auxiliaryInputService.deleteProductOutputByIds(ids));
     }
 
@@ -177,10 +165,9 @@
      */
     @PreAuthorize("@ss.hasPermi('system:energyindex:list')")
     @GetMapping("/energyindex/list")
-    public TableDataInfo energyIndexList(ProductOutput productOutput, @RequestParam Long pageNum, @RequestParam Long pageSize)
-    {
+    public TableDataInfo energyIndexList(ProductOutput productOutput, @RequestParam Long pageNum, @RequestParam Long pageSize) {
         productOutput.setDataType("3");
-        Page<ProductOutput> list = auxiliaryInputService.selectProductOutputPage(productOutput,pageNum,pageSize);
+        Page<ProductOutput> list = auxiliaryInputService.selectProductOutputPage(productOutput, pageNum, pageSize);
         return getDataTable(list);
     }
 
@@ -190,8 +177,7 @@
     @PreAuthorize("@ss.hasPermi('system:energyindex:export')")
     @Log(title = "鑳芥簮鎸囨爣褰曞叆", businessType = BusinessType.EXPORT)
     @PostMapping("/energyindex/export")
-    public void energyIndexExport(HttpServletResponse response, ProductOutput productOutput)
-    {
+    public void energyIndexExport(HttpServletResponse response, ProductOutput productOutput) {
         productOutput.setDataType("3");
         List<ProductOutput> list = auxiliaryInputService.selectProductOutputList(productOutput);
         ExcelUtil<ProductOutput> util = new ExcelUtil<ProductOutput>(ProductOutput.class);
@@ -203,8 +189,7 @@
      */
     @PreAuthorize("@ss.hasPermi('system:energyindex:query')")
     @GetMapping(value = "/energyindex/{productOutputId}")
-    public AjaxResult energyIndexGetInfo(@PathVariable("productOutputId") String productOutputId)
-    {
+    public AjaxResult energyIndexGetInfo(@PathVariable("productOutputId") String productOutputId) {
         return success(auxiliaryInputService.selectProductOutputById(productOutputId));
     }
 
@@ -214,8 +199,7 @@
     @PreAuthorize("@ss.hasPermi('system:energyindex:add')")
     @Log(title = "鑳芥簮鎸囨爣褰曞叆", businessType = BusinessType.INSERT)
     @PostMapping(value = "/energyindex")
-    public AjaxResult energyIndexAdd(@RequestBody ProductOutput productOutput)
-    {
+    public AjaxResult energyIndexAdd(@RequestBody ProductOutput productOutput) {
         productOutput.setProductOutputId(UUID.randomUUID().toString());
         productOutput.setDataType("3");
         return toAjax(auxiliaryInputService.insertProductOutput(productOutput));
@@ -227,8 +211,7 @@
     @PreAuthorize("@ss.hasPermi('system:energyindex:edit')")
     @Log(title = "鑳芥簮鎸囨爣褰曞叆", businessType = BusinessType.UPDATE)
     @PutMapping(value = "/energyindex")
-    public AjaxResult energyIndexEdit(@RequestBody ProductOutput productOutput)
-    {
+    public AjaxResult energyIndexEdit(@RequestBody ProductOutput productOutput) {
         return toAjax(auxiliaryInputService.updateProductOutput(productOutput));
     }
 
@@ -238,8 +221,7 @@
     @PreAuthorize("@ss.hasPermi('system:energyindex:remove')")
     @Log(title = "鑳芥簮鎸囨爣褰曞叆", businessType = BusinessType.DELETE)
     @DeleteMapping("/energyindex/{ids}")
-    public AjaxResult energyIndexRemove(@PathVariable String[] ids)
-    {
+    public AjaxResult energyIndexRemove(@PathVariable String[] ids) {
         return toAjax(auxiliaryInputService.deleteProductOutputByIds(ids));
     }
 
diff --git a/zhitan-admin/src/main/java/com/zhitan/web/controller/homepage/HomePageController.java b/zhitan-admin/src/main/java/com/zhitan/web/controller/homepage/HomePageController.java
index 00cff85..ae6de23 100644
--- a/zhitan-admin/src/main/java/com/zhitan/web/controller/homepage/HomePageController.java
+++ b/zhitan-admin/src/main/java/com/zhitan/web/controller/homepage/HomePageController.java
@@ -25,17 +25,13 @@
 
     @Autowired
     public IHomePageService homepageService;
+
    /**
-    * @description: 鍏ㄥ巶鑳借�楃粺璁�
-    * @param timeType
-    * @return
-    * @author: hmj
-    * @date: 2024/10/8 13:41
+    * &#064;description:  鍏ㄥ巶鑳借�楃粺璁�
     */
    @GetMapping("/energyConsumptionSummation")
    public AjaxResult energyConsumptionSummation(String timeType) {
        try {
-//           String modelcode = "Composite_Indicators";
            String modelcode = "COMPREHENSIVE_CODE";
            return AjaxResult.success(homepageService.energyConsumptionSummation(timeType,modelcode));
        } catch (Exception ex) {

--
Gitblit v1.9.3