From 99c029c59327f6a320a9152f67995623f405a2d8 Mon Sep 17 00:00:00 2001
From: liuhuazhong <liuhuazhong@qq.com>
Date: Fri, 14 Mar 2025 09:22:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=AF=E4=BB=B6=E5=B7=A5=E7=A8=8B=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=8E=A5=E5=8F=A3=EF=BC=8C=E7=A7=BB=E8=87=B3OpenContr?=
 =?UTF-8?q?oller?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pms/common/controller/OpenController.java | 24 ++++++++++++
 .../SoftwareFactStatisticsController.java     | 38 -------------------
 2 files changed, 24 insertions(+), 38 deletions(-)
 delete mode 100644 microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/specialArea/controller/SoftwareFactStatisticsController.java

diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/common/controller/OpenController.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/common/controller/OpenController.java
index 6b14dde11..b9a1bedb6 100644
--- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/common/controller/OpenController.java
+++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/common/controller/OpenController.java
@@ -3,8 +3,10 @@ package com.microservices.pms.common.controller;
 import com.microservices.common.core.utils.html.EscapeUtil;
 import com.microservices.common.core.web.controller.BaseController;
 import com.microservices.common.core.web.domain.AjaxResult;
+import com.microservices.pms.specialArea.service.SoftwareFactStatisticsServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -23,6 +25,9 @@ public class OpenController extends BaseController {
     @Value("${http.gitLinkUrl}")
     public String gitLinkUrl;
 
+    @Autowired
+    private SoftwareFactStatisticsServiceImpl softwareFactStatisticsService;
+    
     /**
      * 查询项目管理企业列表
      */
@@ -33,4 +38,23 @@ public class OpenController extends BaseController {
                 (Object) EscapeUtil.removeExtraSlashOfUrl(gitLinkUrl + "/login")
         );
     }
+
+    @ApiOperation(value = "今日工作态势")
+    @GetMapping("/specialArea/softwareFact/statis/todayWorkSituation")
+    public AjaxResult todayWorkSituation(){
+        return AjaxResult.success(softwareFactStatisticsService.todayWorkSituation());
+    }
+
+    @ApiOperation(value = "周、月工作态势")
+    @GetMapping("/specialArea/softwareFact/statis/weekMonthWorkSituation")
+    public AjaxResult weekMonthWorkSituation(String type){
+        return AjaxResult.success(softwareFactStatisticsService.weekMonthWorkSituation(type));
+    }
+
+    @ApiOperation(value = "项目研发状态")
+    @GetMapping("/specialArea/softwareFact/statis/projectSituation")
+    public AjaxResult projectSituation(){
+        return AjaxResult.success(softwareFactStatisticsService.projectSituation());
+    }
+
 }
diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/specialArea/controller/SoftwareFactStatisticsController.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/specialArea/controller/SoftwareFactStatisticsController.java
deleted file mode 100644
index 90953edcf..000000000
--- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/specialArea/controller/SoftwareFactStatisticsController.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.microservices.pms.specialArea.controller;
-
-import com.microservices.common.core.web.domain.AjaxResult;
-import com.microservices.pms.specialArea.service.SoftwareFactStatisticsServiceImpl;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController()
-@RequestMapping("/specialArea/softwareFact/statis")
-@Api(tags = "项目管理-软件工厂统计相关接口")
-@RequiredArgsConstructor
-public class SoftwareFactStatisticsController {
-
-    private final SoftwareFactStatisticsServiceImpl softwareFactStatisticsService;
-
-    @ApiOperation(value = "今日工作态势")
-    @GetMapping("/todayWorkSituation")
-    public AjaxResult todayWorkSituation(){
-        return AjaxResult.success(softwareFactStatisticsService.todayWorkSituation());
-    }
-
-    @ApiOperation(value = "周、月工作态势")
-    @GetMapping("/weekMonthWorkSituation")
-    public AjaxResult weekMonthWorkSituation(String type){
-        return AjaxResult.success(softwareFactStatisticsService.weekMonthWorkSituation(type));
-    }
-
-    @ApiOperation(value = "项目研发状态")
-    @GetMapping("/projectSituation")
-    public AjaxResult projectSituation(){
-       return AjaxResult.success(softwareFactStatisticsService.projectSituation());
-    }
-
-}