diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/CompanyServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/CompanyServiceImpl.java index 2dbfa80b6..915739d58 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/CompanyServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/CompanyServiceImpl.java @@ -266,7 +266,7 @@ public class CompanyServiceImpl extends ServiceImpl impl Integer standardType = MapUtils.getInteger(map, "standardType", 0); Integer projectType = MapUtils.getInteger(map, "projectType", 1); if (tempCompany != null) { - if (tempCompany.getCompanyType() == 1) { + if (tempCompany.getCompanyType() == 1) { //总部 map.put("headquartersSn", MapUtils.getString(map, "sn")); map.put("companyType", "2"); List fistComapnyList = companyMapper.getFirstCompanyList(map); diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/controller/DustNoiseDataController.java b/src/main/java/com/zhgd/xmgl/modules/environment/controller/DustNoiseDataController.java index bfce750d9..e08b7853a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/environment/controller/DustNoiseDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/environment/controller/DustNoiseDataController.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.environment.entity.DustNoiseData; +import com.zhgd.xmgl.modules.environment.entity.ProjectTodayAlarmInfoVo; import com.zhgd.xmgl.modules.environment.service.IDustNoiseDataService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -11,10 +12,7 @@ import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/controller/EnvironmentAlarmController.java b/src/main/java/com/zhgd/xmgl/modules/environment/controller/EnvironmentAlarmController.java index 7277c6cb5..ab3941d84 100644 --- a/src/main/java/com/zhgd/xmgl/modules/environment/controller/EnvironmentAlarmController.java +++ b/src/main/java/com/zhgd/xmgl/modules/environment/controller/EnvironmentAlarmController.java @@ -3,13 +3,18 @@ package com.zhgd.xmgl.modules.environment.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.mybatis.EntityMap; +import com.zhgd.xmgl.modules.environment.entity.ProjectTodayAlarmInfoDetailQO; +import com.zhgd.xmgl.modules.environment.entity.ProjectTodayAlarmInfoDetailVo; +import com.zhgd.xmgl.modules.environment.entity.ProjectTodayAlarmInfoVo; import com.zhgd.xmgl.modules.environment.service.IEnvironmentAlarmService; +import com.zhgd.xmgl.modules.project.entity.qo.QueryProjectTodayAlarmInfoQO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -86,7 +91,32 @@ public class EnvironmentAlarmController { @ApiImplicitParam(name = "selectType", value = "查询条件，1查询当天", paramType = "query", required = false, dataType = "String"), }) @PostMapping("/selectEnvironmentAlarmCountTotal") - public Result> selectEnvironmentAlarmCountTotal(@RequestBody Map map) { + public Result> selectEnvironmentAlarmCountTotal(@RequestBody Map map) { return Result.success(environmentAlarmService.selectEnvironmentAlarmCountTotal(map)); } -} + + /** + * 查询项目今日报警/预警情况 + * + * @return + */ + @ApiOperation(value = "查询项目今日报警/预警情况", notes = "查询项目今日报警/预警情况", httpMethod = "POST") + @PostMapping(value = "/queryProjectTodayAlarmInfo") + public Result queryProjectTodayAlarmInfo(@RequestBody @Validated QueryProjectTodayAlarmInfoQO qo) { + return Result.success(environmentAlarmService.queryProjectTodayAlarmInfo(qo)); + } + + + /** + * 查询某个项目今日PM10报警/预警情况 + * + * @return + */ + @ApiOperation(value = "查询某个项目今日PM10报警/预警情况", notes = "查询某个项目今日PM10报警/预警情况", httpMethod = "POST") + @PostMapping(value = "/queryProjectTodayAlarmInfoDetail") + public Result queryProjectTodayAlarmInfoDetail(ProjectTodayAlarmInfoDetailQO qo) { + return Result.success(environmentAlarmService.queryProjectTodayAlarmInfoDetail(qo)); + } + + + } diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/entity/Pm10TodayData.java b/src/main/java/com/zhgd/xmgl/modules/environment/entity/Pm10TodayData.java new file mode 100644 index 000000000..7b45ed8b1 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/environment/entity/Pm10TodayData.java @@ -0,0 +1,16 @@ +package com.zhgd.xmgl.modules.environment.entity; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@Data +@ApiModel(description = "今日PM10数据") +public class Pm10TodayData { + @ApiModelProperty(value = "数据上传时间") + private Date uploadDate; + @ApiModelProperty(value = "PM10数据") + private Double pm10; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/entity/ProjectTodayAlarmInfoDetailQO.java b/src/main/java/com/zhgd/xmgl/modules/environment/entity/ProjectTodayAlarmInfoDetailQO.java new file mode 100644 index 000000000..37cd4d1f0 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/environment/entity/ProjectTodayAlarmInfoDetailQO.java @@ -0,0 +1,12 @@ +package com.zhgd.xmgl.modules.environment.entity; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel("查询某个项目今日PM10报警/预警情况") +public class ProjectTodayAlarmInfoDetailQO { + @ApiModelProperty(value = "所属项目SN") + private String projectSn; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/entity/ProjectTodayAlarmInfoDetailVo.java b/src/main/java/com/zhgd/xmgl/modules/environment/entity/ProjectTodayAlarmInfoDetailVo.java new file mode 100644 index 000000000..6be5582a8 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/environment/entity/ProjectTodayAlarmInfoDetailVo.java @@ -0,0 +1,18 @@ +package com.zhgd.xmgl.modules.environment.entity; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +@ApiModel(description = "查询某个项目今日PM10报警/预警情况") +public class ProjectTodayAlarmInfoDetailVo { + @ApiModelProperty(value = "pm10今日报警次数") + private Integer pm10DeviceTodayAlarmSum; + @ApiModelProperty(value = "pm10今日预警次数") + private Integer pm10DeviceTodayPreAlarmSum; + + private List pm10TodayDataList; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/entity/ProjectTodayAlarmInfoVo.java b/src/main/java/com/zhgd/xmgl/modules/environment/entity/ProjectTodayAlarmInfoVo.java new file mode 100644 index 000000000..2ce8f5a26 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/environment/entity/ProjectTodayAlarmInfoVo.java @@ -0,0 +1,19 @@ +package com.zhgd.xmgl.modules.environment.entity; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +@ApiModel("项目今日报警/预警情况") +public class ProjectTodayAlarmInfoVo { + @ApiModelProperty(value = "项目报警数量") + private Integer projectAlarmNum; + @ApiModelProperty(value = "项目预警数量") + private Integer projectPreAlarmNum; + @ApiModelProperty(value = "项目今日预警/报警数量") + private List projectTodayAlarmNums; + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/entity/ProjectTodayAlarmNum.java b/src/main/java/com/zhgd/xmgl/modules/environment/entity/ProjectTodayAlarmNum.java new file mode 100644 index 000000000..5001f43a9 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/environment/entity/ProjectTodayAlarmNum.java @@ -0,0 +1,15 @@ +package com.zhgd.xmgl.modules.environment.entity; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class ProjectTodayAlarmNum { + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称") + private String projectName; + private Integer todayAlarmNum; + private Integer todayPreAlarmNum; +} \ No newline at end of file diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/mapper/EnvironmentAlarmMapper.java b/src/main/java/com/zhgd/xmgl/modules/environment/mapper/EnvironmentAlarmMapper.java index f55e2651a..0ae44a1d2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/environment/mapper/EnvironmentAlarmMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/environment/mapper/EnvironmentAlarmMapper.java @@ -5,9 +5,10 @@ import java.util.Map; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.jeecg.common.mybatis.EntityMap; +import com.zhgd.xmgl.modules.environment.entity.*; +import com.zhgd.xmgl.modules.project.entity.qo.QueryProjectTodayAlarmInfoQO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import com.zhgd.xmgl.modules.environment.entity.EnvironmentAlarm; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** @@ -38,4 +39,11 @@ public interface EnvironmentAlarmMapper extends BaseMapper { Map selectTodayEnvironmentAlarmCount(Map map); List> selectEnvironmentDevTodayAlarmCount(Map map); + + List queryProjectTodayAlarmNum(QueryProjectTodayAlarmInfoQO qo); + + List queryDeviceTodayAvgData(ProjectTodayAlarmInfoDetailQO qo); + + ProjectTodayAlarmInfoDetailVo queryDeviceTodayAlramSum(ProjectTodayAlarmInfoDetailQO qo); + } diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/mapper/xml/EnvironmentAlarmMapper.xml b/src/main/java/com/zhgd/xmgl/modules/environment/mapper/xml/EnvironmentAlarmMapper.xml index 07ba2a650..7b9eef1ff 100644 --- a/src/main/java/com/zhgd/xmgl/modules/environment/mapper/xml/EnvironmentAlarmMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/environment/mapper/xml/EnvironmentAlarmMapper.xml @@ -3,11 +3,12 @@ + + + \ No newline at end of file diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/service/IEnvironmentAlarmService.java b/src/main/java/com/zhgd/xmgl/modules/environment/service/IEnvironmentAlarmService.java index 25a147a6e..d328524df 100644 --- a/src/main/java/com/zhgd/xmgl/modules/environment/service/IEnvironmentAlarmService.java +++ b/src/main/java/com/zhgd/xmgl/modules/environment/service/IEnvironmentAlarmService.java @@ -3,10 +3,9 @@ package com.zhgd.xmgl.modules.environment.service; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.zhgd.jeecg.common.mybatis.EntityMap; -import com.zhgd.xmgl.modules.environment.entity.DustNoiseData; -import com.zhgd.xmgl.modules.environment.entity.EnvironmentAlarm; +import com.zhgd.xmgl.modules.environment.entity.*; import com.baomidou.mybatisplus.extension.service.IService; -import com.zhgd.xmgl.modules.environment.entity.EnvironmentDev; +import com.zhgd.xmgl.modules.project.entity.qo.QueryProjectTodayAlarmInfoQO; import java.util.List; import java.util.Map; @@ -30,4 +29,8 @@ public interface IEnvironmentAlarmService extends IService { Map selectEnvironmentAlarmCountTotal(Map map); void saveEnvironmentAlarmImage(JSONObject json); + + ProjectTodayAlarmInfoVo queryProjectTodayAlarmInfo(QueryProjectTodayAlarmInfoQO qo); + + ProjectTodayAlarmInfoDetailVo queryProjectTodayAlarmInfoDetail(ProjectTodayAlarmInfoDetailQO qo); } diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/EnvironmentAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/EnvironmentAlarmServiceImpl.java index 7c3bfd8eb..4bd232f51 100644 --- a/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/EnvironmentAlarmServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/EnvironmentAlarmServiceImpl.java @@ -4,30 +4,27 @@ import cn.xuyanwu.spring.file.storage.FileInfo; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.async.AsyncEnvironment; import com.zhgd.xmgl.modules.basicdata.entity.Notice; +import com.zhgd.xmgl.modules.basicdata.service.ICompanyService; +import com.zhgd.xmgl.modules.basicdata.service.INoticeService; import com.zhgd.xmgl.modules.basicdata.service.UploadFileService; import com.zhgd.xmgl.modules.bigdevice.mapper.BigDeviceVideoMapper; -import com.zhgd.xmgl.modules.environment.entity.DustNoiseData; -import com.zhgd.xmgl.modules.environment.entity.EnvironmentAlarm; -import com.zhgd.xmgl.modules.environment.entity.EnvironmentDev; -import com.zhgd.xmgl.modules.environment.entity.EnvironmentWarning; +import com.zhgd.xmgl.modules.environment.entity.*; import com.zhgd.xmgl.modules.environment.mapper.EnvironmentAlarmMapper; import com.zhgd.xmgl.modules.environment.mapper.EnvironmentWarningMapper; -import com.zhgd.xmgl.modules.basicdata.service.ICompanyService; import com.zhgd.xmgl.modules.environment.service.IEnvironmentAlarmService; -import com.zhgd.xmgl.modules.basicdata.service.INoticeService; +import com.zhgd.xmgl.modules.project.entity.qo.QueryProjectTodayAlarmInfoQO; import com.zhgd.xmgl.util.DateUtil; import org.apache.commons.collections.MapUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.sql.Timestamp; @@ -804,19 +801,19 @@ public class EnvironmentAlarmServiceImpl extends ServiceImpl imageList= (List) json.get("imageList"); StringBuilder imageBuilder=new StringBuilder(); if(imageList!=null&&imageList.size()>0){ - for(String base64data:imageList){ + for (String base64data : imageList) { FileInfo fileInfo = uploadFileService.uploadFileBase64Image(base64data); if (fileInfo != null) { - if(imageBuilder.length()>0){ + if (imageBuilder.length() > 0) { imageBuilder.append(","); } imageBuilder.append(fileInfo.getUrl()); } } } - List dataId= (List) json.get("dataId"); - if(dataId!=null&&dataId.size()>0){ - for (Long id:dataId){ + List dataId = (List) json.get("dataId"); + if (dataId != null && dataId.size() > 0) { + for (Long id : dataId) { EnvironmentAlarm environmentAlarm = new EnvironmentAlarm(); environmentAlarm.setId(id); environmentAlarm.setImageUrl(imageBuilder.toString()); @@ -824,4 +821,33 @@ public class EnvironmentAlarmServiceImpl extends ServiceImpl list = environmentAlarmMapper.queryProjectTodayAlarmNum(qo); + ProjectTodayAlarmInfoVo vo = new ProjectTodayAlarmInfoVo(); + vo.setProjectTodayAlarmNums(list); + if (!CollectionUtils.isEmpty(list)) { + int projectAlarmNum = 0; + int projectPreAlarmNum = 0; + for (ProjectTodayAlarmNum num : list) { + projectPreAlarmNum += num.getTodayAlarmNum(); + } + vo.setProjectAlarmNum(projectAlarmNum); + vo.setProjectPreAlarmNum(projectPreAlarmNum); + } + return vo; + } + + @Override + public ProjectTodayAlarmInfoDetailVo queryProjectTodayAlarmInfoDetail(ProjectTodayAlarmInfoDetailQO qo) { + ProjectTodayAlarmInfoDetailVo vo = environmentAlarmMapper.queryDeviceTodayAlramSum(qo); + if (vo == null) { + vo = new ProjectTodayAlarmInfoDetailVo(); + } + List pm10TodayDatas = environmentAlarmMapper.queryDeviceTodayAvgData(qo); + vo.setPm10TodayDataList(pm10TodayDatas); + return vo; + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectController.java b/src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectController.java index 4393962e5..43b188c92 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectController.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectController.java @@ -11,7 +11,7 @@ import com.zhgd.xmgl.modules.project.entity.Project; import com.zhgd.xmgl.modules.project.entity.vo.GroupByProjectProgressVo; import com.zhgd.xmgl.modules.project.entity.vo.GroupByProjectTypeVo; import com.zhgd.xmgl.modules.project.entity.vo.ProjectDurationVO; -import com.zhgd.xmgl.modules.project.enums.ProgressSanjiangProjectEnum; +import com.zhgd.xmgl.modules.project.enums.SanjiangProgressProjectEnum; import com.zhgd.xmgl.modules.project.service.IProjectService; import com.zhgd.xmgl.util.MessageUtil; import io.swagger.annotations.Api; @@ -319,8 +319,8 @@ public class ProjectController { */ @ApiOperation(value = "查询每个不同项目进度的名称、数量", notes = "查询每个不同项目进度的名称、数量", httpMethod = "GET") @GetMapping(value = "/groupBy/projectProgress") - public Result> groupByProjectProgress(Map map) { - return Result.success(projectService.groupByProjectProgress(map)); + public Result> groupByProjectProgress() { + return Result.success(projectService.groupByProjectProgress()); } /** @@ -331,8 +331,8 @@ public class ProjectController { */ @ApiOperation(value = "查询三江的所有项目进度", notes = "查询三江的所有项目进度", httpMethod = "GET") @GetMapping(value = "/getProjectProgress") - public Result> getProjectProgress() { - return Result.success(Arrays.asList(ProgressSanjiangProjectEnum.values())); + public Result> getProjectProgress() { + return Result.success(Arrays.asList(SanjiangProgressProjectEnum.values())); } } diff --git a/src/main/java/com/zhgd/xmgl/modules/project/entity/qo/QueryProjectTodayAlarmInfoQO.java b/src/main/java/com/zhgd/xmgl/modules/project/entity/qo/QueryProjectTodayAlarmInfoQO.java new file mode 100644 index 000000000..5b77a4c0e --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/project/entity/qo/QueryProjectTodayAlarmInfoQO.java @@ -0,0 +1,18 @@ +package com.zhgd.xmgl.modules.project.entity.qo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +@ApiModel(description = "查询项目今日报警/预警情况") +public class QueryProjectTodayAlarmInfoQO { + @ApiModelProperty(value = "账号类型，1系统管理员，2企业管理员账号，3企业区账号，4企业市账号，5项目账号，6项目子账号，7项目部账号") + @NotNull + private java.lang.Integer accountType; + @ApiModelProperty(value = "userId") + @NotNull + private java.lang.Long userId; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/project/entity/vo/GroupByProjectProgressVo.java b/src/main/java/com/zhgd/xmgl/modules/project/entity/vo/GroupByProjectProgressVo.java index 94b39f3a2..ba56b6e95 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/entity/vo/GroupByProjectProgressVo.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/entity/vo/GroupByProjectProgressVo.java @@ -6,5 +6,6 @@ import lombok.Data; @Data public class GroupByProjectProgressVo { private Integer count; - private String projectProgress; + private String projectProgressName; + private Integer projectProgress; } diff --git a/src/main/java/com/zhgd/xmgl/modules/project/enums/ProgressSanjiangProjectEnum.java b/src/main/java/com/zhgd/xmgl/modules/project/enums/SanjiangProgressProjectEnum.java similarity index 95% rename from src/main/java/com/zhgd/xmgl/modules/project/enums/ProgressSanjiangProjectEnum.java rename to src/main/java/com/zhgd/xmgl/modules/project/enums/SanjiangProgressProjectEnum.java index 5bc716324..03c58b0b1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/enums/ProgressSanjiangProjectEnum.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/enums/SanjiangProgressProjectEnum.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; * 三江项目进度枚举 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) -public enum ProgressSanjiangProjectEnum { +public enum SanjiangProgressProjectEnum { /** * 三江项目进度：总坪施工 */ @@ -76,7 +76,7 @@ public enum ProgressSanjiangProjectEnum { private Integer id; private String type; - private ProgressSanjiangProjectEnum(Integer id, String type) { + private SanjiangProgressProjectEnum(Integer id, String type) { this.id = id; this.type = type; } diff --git a/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectMapper.java b/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectMapper.java index 720cd34e6..c519145be 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectMapper.java @@ -82,5 +82,5 @@ public interface ProjectMapper extends BaseMapper { List groupByProjectType(Map map); - List groupByProjectProgress(Map map); + List groupByProjectProgress(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectMapper.xml b/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectMapper.xml index 673211af3..7c4139465 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectMapper.xml @@ -656,8 +656,7 @@ HAVING p.custom_project_type is NOT null - SELECT COUNT(p.project_id) AS count,p.project_progress FROM `project` p diff --git a/src/main/java/com/zhgd/xmgl/modules/project/service/IProjectService.java b/src/main/java/com/zhgd/xmgl/modules/project/service/IProjectService.java index c71d2bd4b..12ed9425a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/service/IProjectService.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/service/IProjectService.java @@ -66,5 +66,5 @@ public interface IProjectService extends IService { List groupByProjectType(Map map); - List groupByProjectProgress(Map map); + List groupByProjectProgress(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectServiceImpl.java index 82790e002..b101bfa2e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectServiceImpl.java @@ -35,6 +35,7 @@ import com.zhgd.xmgl.modules.project.entity.ProjectConfig; import com.zhgd.xmgl.modules.project.entity.vo.GroupByProjectProgressVo; import com.zhgd.xmgl.modules.project.entity.vo.GroupByProjectTypeVo; import com.zhgd.xmgl.modules.project.entity.vo.ProjectDurationVO; +import com.zhgd.xmgl.modules.project.enums.SanjiangProgressProjectEnum; import com.zhgd.xmgl.modules.project.mapper.ProjectConfigMapper; import com.zhgd.xmgl.modules.project.mapper.ProjectEnterpriseMapper; import com.zhgd.xmgl.modules.project.mapper.ProjectMapper; @@ -54,10 +55,12 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; /** * @Description: 项目 @@ -503,8 +506,24 @@ public class ProjectServiceImpl extends ServiceImpl impl } @Override - public List groupByProjectProgress(Map map) { - return projectMapper.groupByProjectProgress(map); + public List groupByProjectProgress() { + List projectProgressVos = projectMapper.groupByProjectProgress(); + if (!CollectionUtils.isEmpty(projectProgressVos)) { + Map idNameMap = projectProgressVos.stream().collect(Collectors.toMap(o -> o.getProjectProgress(), o->o)); + for (SanjiangProgressProjectEnum e : SanjiangProgressProjectEnum.values()) { + GroupByProjectProgressVo vo = idNameMap.get(e.getId()); + if (vo == null) { + GroupByProjectProgressVo groupByProjectProgressVo = new GroupByProjectProgressVo(); + groupByProjectProgressVo.setCount(0); + groupByProjectProgressVo.setProjectProgressName(e.getType()); + groupByProjectProgressVo.setProjectProgress(e.getId()); + projectProgressVos.add(groupByProjectProgressVo); + } else { + vo.setProjectProgressName(e.getType()); + } + } + } + return projectProgressVos; } }