From 426d0a685a81af841b17936700f26e5acf79cc3f Mon Sep 17 00:00:00 2001
From: gxwebsoft <Websoft5386339>
Date: Sat, 3 Feb 2024 16:42:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/TowerProjectController.java    | 20 +++++++++++++++++++
 src/main/resources/application-dev.yml        |  5 ++---
 src/main/resources/application.yml            |  6 +++---
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerProjectController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerProjectController.java
index 5442f90..b08538b 100644
--- a/src/main/java/com/gxwebsoft/tower/controller/TowerProjectController.java
+++ b/src/main/java/com/gxwebsoft/tower/controller/TowerProjectController.java
@@ -60,9 +60,29 @@ public class TowerProjectController extends BaseController {
                 new LambdaQueryWrapper<TowerProject>()
                         .eq(TowerProject::getProjectStatus, "未开工")
         );
+        Integer okNum = towerProjectService.count(
+          new LambdaQueryWrapper<TowerProject>()
+            .eq(TowerProject::getProjectStatus, "已完成")
+        );
+        Integer notStartNum2 = towerProjectService.count(
+          new LambdaQueryWrapper<TowerProject>()
+            .eq(TowerProject::getProjectStatus, "停工中")
+        );
+        Integer notStartNum3 = towerProjectService.count(
+          new LambdaQueryWrapper<TowerProject>()
+            .eq(TowerProject::getProjectStatus, "停工已拆机")
+        );
+        Integer notStartNum4 = towerProjectService.count(
+          new LambdaQueryWrapper<TowerProject>()
+            .eq(TowerProject::getProjectStatus, "完工未拆机")
+        );
         data.put("totalNum", totalNum);
         data.put("startedNum", startedNum);
         data.put("notStartNum", notStartNum);
+        data.put("okNum", okNum);
+        data.put("notStartNum2", notStartNum2);
+        data.put("notStartNum3", notStartNum3);
+        data.put("notStartNum4", notStartNum4);
         return success(data);
     }
 
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 69a4d3a..7645dae 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -3,7 +3,7 @@
 # 数据源配置
 spring:
   datasource:
-    url: jdbc:mysql://42.194.212.185:3308/tower?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
+    url: jdbc:mysql://1.14.159.185:3318/tower?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
     username: tower
     password: FXFZrhHbs3pma6Zh
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -20,6 +20,5 @@ logging:
 config:
   # 开发环境接口
   server-url: http://localhost:10041/api
-  upload-path: /Users/liangxin/Project/JAVA/tower-java
-  file-server: http://localhost:10041
+  upload-path: /Users/gxwebsoft/Documents/uploads/
 
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 4b9ca5f..724ae45 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -5,8 +5,8 @@ server:
 # 多环境配置
 spring:
   profiles:
-#    active: dev
-    active: prod
+    active: dev
+#    active: prod
 
   application:
     name: server
@@ -96,4 +96,4 @@ wx:
     configs:
       - appid: wx74f04ad0cdb862ef
         secret: 4b31d6be04439f1b56042d9bfabd62d6
-        msgDataFormat: JSON
\ No newline at end of file
+        msgDataFormat: JSON