Gitlink
/
microservices
0
1
Fork 12
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request '软件工程统计接口，移至OpenController' (#842) from liuhuazhong/microservices:xjy_software_fact_statis into xjy_software_fact_statis

This commit is contained in:
otto 2025-03-14 09:32:04 +08:00
parent e51799addd 99c029c593
commit 5ae14817fd
2 changed files with 24 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/common/controller/OpenController.java
View File

@ -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());
}
}

38
microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/specialArea/controller/SoftwareFactStatisticsController.java
View File

@ -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());
}
}