From 18bbf3aebd8426b6b73ca502e768fad600dc2b40 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Wed, 27 Mar 2024 15:00:59 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9C=81=E4=BE=A7=E5=A4=A7=E5=B1=8F-=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/constant/Constant.java | 4 +++ .../screen/controller/ScIndexController.java | 5 ++-- .../screen/mapper/IScIndexMapper.java | 15 ++++++++++ .../service/impl/ScIndexServiceImpl.java | 29 ++++++++++++++++++- .../main/resources/mapper/ScIndexMapper.xml | 15 ++++++++++ 5 files changed, 65 insertions(+), 3 deletions(-) diff --git a/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/constant/Constant.java b/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/constant/Constant.java index 5653c82..e488ac1 100644 --- a/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/constant/Constant.java +++ b/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/constant/Constant.java @@ -45,6 +45,10 @@ public class Constant { public final static String MANAGER = "manager"; public final static String DUTY = "duty"; public final static String CITY = "city"; + public final static String ZJ = "在建"; + public final static String DJ = "待建"; + public final static String TC = "投产"; + public final static String TG = "停工"; diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/ScIndexController.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/ScIndexController.java index 34f8048..8b52cfd 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/ScIndexController.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/ScIndexController.java @@ -5,6 +5,7 @@ import com.securitycontrol.entity.screen.dto.ScreenParamDto; import com.securitycontrol.screen.service.IScIndexService; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -17,14 +18,14 @@ import javax.annotation.Resource; * @description:省侧大屏-web */ @RestController -@RequestMapping("/screen/scIndex/") +@RequestMapping("/largeScreen/scIndex/") public class ScIndexController { @Resource(name = "IScIndexService") private IScIndexService service; @ApiOperation(value = "工程统计") - @GetMapping("proStatusStatistics") + @PostMapping("proStatusStatistics") public AjaxResult proStatusStatistics(ScreenParamDto dto){ return service.proStatusStatistics(dto); } diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/IScIndexMapper.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/IScIndexMapper.java index 7e164bf..18db4ee 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/IScIndexMapper.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/IScIndexMapper.java @@ -1,7 +1,12 @@ package com.securitycontrol.screen.mapper; +import com.securitycontrol.entity.screen.dto.ScreenParamDto; +import org.apache.ibatis.annotations.MapKey; import org.springframework.stereotype.Repository; +import java.util.List; +import java.util.Map; + /** * @author:cwchen * @date:2024-03-27-10:15 @@ -10,4 +15,14 @@ import org.springframework.stereotype.Repository; */ @Repository(value = "IScIndexMapper") public interface IScIndexMapper { + /** + * 工程统计 + * @param dto + * @return List> + * @description + * @author cwchen + * @date 2024/3/27 13:15 + */ + @MapKey("id") + List> proStatusStatistics(ScreenParamDto dto); } diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/ScIndexServiceImpl.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/ScIndexServiceImpl.java index 3dd5018..bc4f5dc 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/ScIndexServiceImpl.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/ScIndexServiceImpl.java @@ -1,5 +1,6 @@ package com.securitycontrol.screen.service.impl; +import com.securitycontrol.common.core.constant.Constant; import com.securitycontrol.common.core.web.domain.AjaxResult; import com.securitycontrol.entity.screen.dto.ScreenParamDto; import com.securitycontrol.screen.mapper.IScIndexMapper; @@ -8,6 +9,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.*; /** * @author:cwchen @@ -24,6 +26,31 @@ public class ScIndexServiceImpl implements IScIndexService { @Override public AjaxResult proStatusStatistics(ScreenParamDto dto) { - return null; + Map dataMap = new HashMap<>(16); + List> list = new ArrayList<>(16); + int zjNum = 0, djNum = 0, tcNum = 0, tgNum = 0; + try { + list = mapper.proStatusStatistics(dto); + for (Map map : list) { + String name = String.valueOf(map.get("name")); + if(Objects.equals(name, Constant.ZJ)){ + zjNum = Integer.parseInt(String.valueOf(map.get("num"))); + }else if(Objects.equals(name, Constant.DJ)){ + djNum = Integer.parseInt(String.valueOf(map.get("num"))); + }else if(Objects.equals(name, Constant.TC)){ + tcNum = Integer.parseInt(String.valueOf(map.get("num"))); + }else if(Objects.equals(name, Constant.TG)){ + tgNum = Integer.parseInt(String.valueOf(map.get("num"))); + } + } + } catch (Exception e) { + log.error("工程统计", e); + } + dataMap.put("zjNum", zjNum); + dataMap.put("djNum", djNum); + dataMap.put("tcNum", tcNum); + dataMap.put("tgNum", tgNum); + dataMap.put("allNum", zjNum + djNum + tcNum + tgNum); + return AjaxResult.success(dataMap); } } diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ScIndexMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ScIndexMapper.xml index 145b08d..a50de8c 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ScIndexMapper.xml +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ScIndexMapper.xml @@ -2,4 +2,19 @@ + + \ No newline at end of file