From e5a2b8bbfb1bb7ed52ce41f6f1075a3743ba89b0 Mon Sep 17 00:00:00 2001 From: guo Date: Wed, 24 Jan 2024 14:08:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B2=A5=E9=9D=92=E6=8B=8C=E5=90=88=E7=AB=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PitchMixStationDataController.java | 185 ------------------ .../PitchMixStationExceedDataController.java | 185 ------------------ ...PitchMixStationMaterialDataController.java | 11 ++ .../PitchMixStationProdDataController.java | 44 +++++ .../PitchMixStationMaterialDataMapper.java | 5 + .../mapper/PitchMixStationProdDataMapper.java | 14 ++ .../xml/PitchMixStationMaterialDataMapper.xml | 22 +++ .../xml/PitchMixStationProdDataMapper.xml | 79 ++++++++ .../IPitchMixStationMaterialDataService.java | 3 + .../IPitchMixStationProdDataService.java | 11 ++ ...itchMixStationMaterialDataServiceImpl.java | 8 + .../PitchMixStationProdDataServiceImpl.java | 58 ++++++ 12 files changed, 255 insertions(+), 370 deletions(-) delete mode 100644 src/main/java/com/zhgd/xmgl/modules/pitchmixstation/controller/PitchMixStationDataController.java delete mode 100644 src/main/java/com/zhgd/xmgl/modules/pitchmixstation/controller/PitchMixStationExceedDataController.java diff --git a/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/controller/PitchMixStationDataController.java b/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/controller/PitchMixStationDataController.java deleted file mode 100644 index 540b3f1a9..000000000 --- a/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/controller/PitchMixStationDataController.java +++ /dev/null @@ -1,185 +0,0 @@ -package com.zhgd.xmgl.modules.pitchmixstation.controller; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiImplicitParams; - -import java.util.HashMap; - -import springfox.documentation.annotations.ApiIgnore; - -import java.util.List; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.zhgd.jeecg.common.api.vo.Result; -import com.zhgd.jeecg.common.system.query.QueryGenerator; -import com.zhgd.jeecg.common.util.oConvertUtils; -import org.apache.commons.collections.MapUtils; -import com.zhgd.xmgl.modules.pitchmixstation.entity.PitchMixStationData; -import com.zhgd.xmgl.modules.pitchmixstation.service.IPitchMixStationDataService; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import lombok.extern.slf4j.Slf4j; - -import org.jeecgframework.poi.excel.def.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; - - -/** - * @Title: Controller - * @Description: 沥青拌合站数据 - * @author： pds - * @date： 2023-10-27 - * @version： V1.0 - */ -@RestController -@RequestMapping("/xmgl/pitchMixStationData") -@Slf4j -@Api(tags = "沥青拌合站数据相关Api") -public class PitchMixStationDataController { - @Autowired - private IPitchMixStationDataService pitchMixStationDataService; - - /** - * 分页列表查询 - * - * @return - */ - @ApiOperation(value = "分页列表查询沥青拌合站数据信息", notes = "分页列表查询沥青拌合站数据信息", httpMethod = "GET") - @ApiImplicitParams({ - @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"), - @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), - }) - @GetMapping(value = "/page") - public Result> queryPageList(@ApiIgnore @RequestParam HashMap paramMap) { - return Result.success(pitchMixStationDataService.queryPageList(paramMap)); - } - - /** - * 列表查询 - * - * @return - */ - @ApiOperation(value = "列表查询沥青拌合站数据信息", notes = "列表查询沥青拌合站数据信息", httpMethod = "GET") - @GetMapping(value = "/list") - public Result> queryList(@ApiIgnore @RequestParam HashMap paramMap) { - return Result.success(pitchMixStationDataService.queryList(paramMap)); - } - - /** - * 添加 - * - * @param pitchMixStationData - * @return - */ - @ApiOperation(value = "添加沥青拌合站数据信息", notes = "添加沥青拌合站数据信息", httpMethod = "POST") - @PostMapping(value = "/add") - public Result add(@RequestBody PitchMixStationData pitchMixStationData) { - pitchMixStationDataService.save(pitchMixStationData); - return Result.ok(); - } - - /** - * 编辑 - * - * @param pitchMixStationData - * @return - */ - @ApiOperation(value = "编辑沥青拌合站数据信息", notes = "编辑沥青拌合站数据信息", httpMethod = "POST") - @PostMapping(value = "/edit") - public Result edit(@RequestBody PitchMixStationData pitchMixStationData) { - pitchMixStationDataService.updateById(pitchMixStationData); - return Result.ok(); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @ApiOperation(value = "删除沥青拌合站数据信息", notes = "删除沥青拌合站数据信息", httpMethod = "POST") - @ApiImplicitParam(name = "id", value = "沥青拌合站数据ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}") - @PostMapping(value = "/delete") - public Result delete(@ApiIgnore @RequestBody HashMap map) { - String id = MapUtils.getString(map, "id"); - Result result = new Result(); - PitchMixStationData pitchMixStationData = pitchMixStationDataService.getById(id); - if (pitchMixStationData == null) { - result.error500("未找到对应实体"); - } else { - boolean ok = pitchMixStationDataService.removeById(id); - if (ok) { - result.success("删除成功!"); - } - } - - return result; - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @ApiOperation(value = "通过id查询沥青拌合站数据信息", notes = "通过id查询沥青拌合站数据信息", httpMethod = "GET") - @ApiImplicitParam(name = "id", value = "沥青拌合站数据ID", paramType = "query", required = true, dataType = "Integer") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name = "id", required = true) String id) { - Result result = new Result(); - PitchMixStationData pitchMixStationData = pitchMixStationDataService.getById(id); - if (pitchMixStationData == null) { - result.error500("未找到对应实体"); - } else { - result.setResult(pitchMixStationData); - result.setSuccess(true); - } - return result; - } - - /** - * 导出excel - * - * @param request - * @param response - */ - @ApiOperation(value = "导出excel沥青拌合站数据信息", notes = "导出excel沥青拌合站数据信息", httpMethod = "POST") - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) { - // Step.1 组装查询条件 - QueryWrapper queryWrapper = null; - try { - String paramsStr = request.getParameter("paramsStr"); - if (oConvertUtils.isNotEmpty(paramsStr)) { - String deString = URLDecoder.decode(paramsStr, "UTF-8"); - PitchMixStationData pitchMixStationData = JSON.parseObject(deString, PitchMixStationData.class); - queryWrapper = QueryGenerator.initQueryWrapper(pitchMixStationData, request.getParameterMap()); - } - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } - - //Step.2 AutoPoi 导出Excel - ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); - List pageList = pitchMixStationDataService.list(queryWrapper); - //导出文件名称 - mv.addObject(NormalExcelConstants.FILE_NAME, "沥青拌合站数据列表"); - mv.addObject(NormalExcelConstants.CLASS, PitchMixStationData.class); - mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("沥青拌合站数据列表数据", "导出人:Jeecg", "导出信息")); - mv.addObject(NormalExcelConstants.DATA_LIST, pageList); - return mv; - } - -} diff --git a/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/controller/PitchMixStationExceedDataController.java b/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/controller/PitchMixStationExceedDataController.java deleted file mode 100644 index 4ebcdb23e..000000000 --- a/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/controller/PitchMixStationExceedDataController.java +++ /dev/null @@ -1,185 +0,0 @@ -package com.zhgd.xmgl.modules.pitchmixstation.controller; - -import com.zhgd.xmgl.modules.pitchmixstation.entity.PitchMixStationExceedData; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiImplicitParams; - -import java.util.HashMap; - -import springfox.documentation.annotations.ApiIgnore; - -import java.util.List; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.zhgd.jeecg.common.api.vo.Result; -import com.zhgd.jeecg.common.system.query.QueryGenerator; -import com.zhgd.jeecg.common.util.oConvertUtils; -import org.apache.commons.collections.MapUtils; -import com.zhgd.xmgl.modules.pitchmixstation.service.IPitchMixStationExceedDataService; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import lombok.extern.slf4j.Slf4j; - -import org.jeecgframework.poi.excel.def.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; - - -/** - * @Title: Controller - * @Description: 沥青拌合站超标数据 - * @author： pds - * @date： 2023-10-27 - * @version： V1.0 - */ -@RestController -@RequestMapping("/xmgl/pitchMixStationExceedData") -@Slf4j -@Api(tags = "沥青拌合站超标数据相关Api") -public class PitchMixStationExceedDataController { - @Autowired - private IPitchMixStationExceedDataService pitchMixStationExceedDataService; - - /** - * 分页列表查询 - * - * @return - */ - @ApiOperation(value = "分页列表查询沥青拌合站超标数据信息", notes = "分页列表查询沥青拌合站超标数据信息", httpMethod = "GET") - @ApiImplicitParams({ - @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"), - @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), - }) - @GetMapping(value = "/page") - public Result> queryPageList(@ApiIgnore @RequestParam HashMap paramMap) { - return Result.success(pitchMixStationExceedDataService.queryPageList(paramMap)); - } - - /** - * 列表查询 - * - * @return - */ - @ApiOperation(value = "列表查询沥青拌合站超标数据信息", notes = "列表查询沥青拌合站超标数据信息", httpMethod = "GET") - @GetMapping(value = "/list") - public Result> queryList(@ApiIgnore @RequestParam HashMap paramMap) { - return Result.success(pitchMixStationExceedDataService.queryList(paramMap)); - } - - /** - * 添加 - * - * @param pitchMixStationExceedData - * @return - */ - @ApiOperation(value = "添加沥青拌合站超标数据信息", notes = "添加沥青拌合站超标数据信息", httpMethod = "POST") - @PostMapping(value = "/add") - public Result add(@RequestBody PitchMixStationExceedData pitchMixStationExceedData) { - pitchMixStationExceedDataService.save(pitchMixStationExceedData); - return Result.ok(); - } - - /** - * 编辑 - * - * @param pitchMixStationExceedData - * @return - */ - @ApiOperation(value = "编辑沥青拌合站超标数据信息", notes = "编辑沥青拌合站超标数据信息", httpMethod = "POST") - @PostMapping(value = "/edit") - public Result edit(@RequestBody PitchMixStationExceedData pitchMixStationExceedData) { - pitchMixStationExceedDataService.updateById(pitchMixStationExceedData); - return Result.ok(); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @ApiOperation(value = "删除沥青拌合站超标数据信息", notes = "删除沥青拌合站超标数据信息", httpMethod = "POST") - @ApiImplicitParam(name = "id", value = "沥青拌合站超标数据ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}") - @PostMapping(value = "/delete") - public Result delete(@ApiIgnore @RequestBody HashMap map) { - String id = MapUtils.getString(map, "id"); - Result result = new Result(); - PitchMixStationExceedData pitchMixStationExceedData = pitchMixStationExceedDataService.getById(id); - if (pitchMixStationExceedData == null) { - result.error500("未找到对应实体"); - } else { - boolean ok = pitchMixStationExceedDataService.removeById(id); - if (ok) { - result.success("删除成功!"); - } - } - - return result; - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @ApiOperation(value = "通过id查询沥青拌合站超标数据信息", notes = "通过id查询沥青拌合站超标数据信息", httpMethod = "GET") - @ApiImplicitParam(name = "id", value = "沥青拌合站超标数据ID", paramType = "query", required = true, dataType = "Integer") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name = "id", required = true) String id) { - Result result = new Result(); - PitchMixStationExceedData pitchMixStationExceedData = pitchMixStationExceedDataService.getById(id); - if (pitchMixStationExceedData == null) { - result.error500("未找到对应实体"); - } else { - result.setResult(pitchMixStationExceedData); - result.setSuccess(true); - } - return result; - } - - /** - * 导出excel - * - * @param request - * @param response - */ - @ApiOperation(value = "导出excel沥青拌合站超标数据信息", notes = "导出excel沥青拌合站超标数据信息", httpMethod = "POST") - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) { - // Step.1 组装查询条件 - QueryWrapper queryWrapper = null; - try { - String paramsStr = request.getParameter("paramsStr"); - if (oConvertUtils.isNotEmpty(paramsStr)) { - String deString = URLDecoder.decode(paramsStr, "UTF-8"); - PitchMixStationExceedData pitchMixStationExceedData = JSON.parseObject(deString, PitchMixStationExceedData.class); - queryWrapper = QueryGenerator.initQueryWrapper(pitchMixStationExceedData, request.getParameterMap()); - } - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } - - //Step.2 AutoPoi 导出Excel - ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); - List pageList = pitchMixStationExceedDataService.list(queryWrapper); - //导出文件名称 - mv.addObject(NormalExcelConstants.FILE_NAME, "沥青拌合站超标数据列表"); - mv.addObject(NormalExcelConstants.CLASS, PitchMixStationExceedData.class); - mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("沥青拌合站超标数据列表数据", "导出人:Jeecg", "导出信息")); - mv.addObject(NormalExcelConstants.DATA_LIST, pageList); - return mv; - } - -} diff --git a/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/controller/PitchMixStationMaterialDataController.java b/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/controller/PitchMixStationMaterialDataController.java index fda06234a..d6ff5b585 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/controller/PitchMixStationMaterialDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/controller/PitchMixStationMaterialDataController.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.pitchmixstation.controller; +import com.zhgd.xmgl.base.entity.vo.SectorVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; @@ -136,4 +137,14 @@ public class PitchMixStationMaterialDataController { return result; } + @ApiOperation(value = "原材用量统计", notes = "原材用量统计", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), + @ApiImplicitParam(name = "devSn", value = "设备sn", paramType = "body", required = false, dataType = "String"), + @ApiImplicitParam(name = "type", value = "1今日2、7日3、30日", paramType = "body", required = true, dataType = "Integer"), + }) + @PostMapping(value = "/countMaterialName") + public Result countMaterialName(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(pitchMixStationMaterialDataService.countMaterialName(paramMap)); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/controller/PitchMixStationProdDataController.java b/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/controller/PitchMixStationProdDataController.java index 084d3431d..dd3696137 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/controller/PitchMixStationProdDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/controller/PitchMixStationProdDataController.java @@ -1,5 +1,8 @@ package com.zhgd.xmgl.modules.pitchmixstation.controller; +import com.zhgd.xmgl.base.entity.vo.SectorVo; +import com.zhgd.xmgl.base.entity.vo.TrendVo; +import com.zhgd.xmgl.modules.concretemixstation.entity.vo.CountConcreteMixStationDataVo; import com.zhgd.xmgl.modules.pitchmixstation.entity.PitchMixStationProdData; import com.zhgd.xmgl.modules.pitchmixstation.service.IPitchMixStationProdDataService; import io.swagger.annotations.Api; @@ -136,4 +139,45 @@ public class PitchMixStationProdDataController { return result; } + + @ApiOperation(value = "各设备产量趋势", notes = "各设备产量趋势", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), + @ApiImplicitParam(name = "type", value = "1今日2、7日3、30日", paramType = "body", required = true, dataType = "Integer"), + }) + @PostMapping(value = "/countConcreteMixStationDataTrend") + public Result> countConcreteMixStationDataTrend(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(pitchMixStationProdDataService.countConcreteMixStationDataTrend(paramMap)); + } + + @ApiOperation(value = "统计混凝土拌合站生产数据（实时监测）", notes = "统计混凝土拌合站生产数据（实时监测）", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), + @ApiImplicitParam(name = "devSn", value = "设备sn", paramType = "body", required = false, dataType = "String"), + }) + @PostMapping(value = "/countConcreteMixStationData") + public Result countConcreteMixStationData(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(pitchMixStationProdDataService.countConcreteMixStationData(paramMap)); + } + + @ApiOperation(value = "生产质量统计", notes = "生产质量统计", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), + @ApiImplicitParam(name = "devSn", value = "设备sn", paramType = "body", required = false, dataType = "String"), + }) + @PostMapping(value = "/countUseStatus") + public Result countUseStatus(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(pitchMixStationProdDataService.countUseStatus(paramMap)); + } + + @ApiOperation(value = "各配比产量", notes = "各配比产量", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), + @ApiImplicitParam(name = "devSn", value = "设备sn", paramType = "body", required = false, dataType = "String"), + @ApiImplicitParam(name = "type", value = "1今日2、7日3、30日", paramType = "body", required = true, dataType = "Integer"), + }) + @PostMapping(value = "/countPowerLevel") + public Result countPowerLevel(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(pitchMixStationProdDataService.countPowerLevel(paramMap)); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/mapper/PitchMixStationMaterialDataMapper.java b/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/mapper/PitchMixStationMaterialDataMapper.java index fe62f0e87..256b78332 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/mapper/PitchMixStationMaterialDataMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/mapper/PitchMixStationMaterialDataMapper.java @@ -1,9 +1,13 @@ package com.zhgd.xmgl.modules.pitchmixstation.mapper; +import com.zhgd.xmgl.base.entity.vo.SectorOneVo; import org.apache.ibatis.annotations.Mapper; import com.zhgd.xmgl.modules.pitchmixstation.entity.PitchMixStationMaterialData; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.HashMap; +import java.util.List; + /** * @Description: 沥青拌合站材料用量数据 * @author： pds @@ -13,4 +17,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; @Mapper public interface PitchMixStationMaterialDataMapper extends BaseMapper { + List countMaterialName(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/mapper/PitchMixStationProdDataMapper.java b/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/mapper/PitchMixStationProdDataMapper.java index 0647eca6f..fdf2c60dd 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/mapper/PitchMixStationProdDataMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/mapper/PitchMixStationProdDataMapper.java @@ -1,9 +1,16 @@ package com.zhgd.xmgl.modules.pitchmixstation.mapper; +import com.zhgd.xmgl.base.entity.vo.SectorOneVo; +import com.zhgd.xmgl.base.entity.vo.TrendOneVo; +import com.zhgd.xmgl.modules.concretemixstation.entity.vo.CountConcreteMixStationDataVo; import com.zhgd.xmgl.modules.pitchmixstation.entity.PitchMixStationProdData; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + /** * @Description: 沥青拌合站生产数据 * @author： pds @@ -13,4 +20,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; @Mapper public interface PitchMixStationProdDataMapper extends BaseMapper { + List countConcreteMixStationDataTrend(HashMap paramMap); + + CountConcreteMixStationDataVo countConcreteMixStationData(HashMap paramMap); + + ArrayList countUseStatus(HashMap paramMap); + + ArrayList countPowerLevel(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/mapper/xml/PitchMixStationMaterialDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/mapper/xml/PitchMixStationMaterialDataMapper.xml index d9825719d..8ceeea014 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/mapper/xml/PitchMixStationMaterialDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/mapper/xml/PitchMixStationMaterialDataMapper.xml @@ -1,4 +1,26 @@ + diff --git a/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/mapper/xml/PitchMixStationProdDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/mapper/xml/PitchMixStationProdDataMapper.xml index 96f827155..fb135b5fe 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/mapper/xml/PitchMixStationProdDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/mapper/xml/PitchMixStationProdDataMapper.xml @@ -1,4 +1,83 @@ + + + + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/service/IPitchMixStationMaterialDataService.java b/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/service/IPitchMixStationMaterialDataService.java index 07bb9d3bf..5b99ecb76 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/service/IPitchMixStationMaterialDataService.java +++ b/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/service/IPitchMixStationMaterialDataService.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.pitchmixstation.service; +import com.zhgd.xmgl.base.entity.vo.SectorVo; import com.zhgd.xmgl.modules.pitchmixstation.entity.PitchMixStationMaterialData; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -22,4 +23,6 @@ public interface IPitchMixStationMaterialDataService extends IService paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/service/IPitchMixStationProdDataService.java b/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/service/IPitchMixStationProdDataService.java index 3866455f4..ea7c374ec 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/service/IPitchMixStationProdDataService.java +++ b/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/service/IPitchMixStationProdDataService.java @@ -1,5 +1,8 @@ package com.zhgd.xmgl.modules.pitchmixstation.service; +import com.zhgd.xmgl.base.entity.vo.SectorVo; +import com.zhgd.xmgl.base.entity.vo.TrendVo; +import com.zhgd.xmgl.modules.concretemixstation.entity.vo.CountConcreteMixStationDataVo; import com.zhgd.xmgl.modules.pitchmixstation.entity.PitchMixStationProdData; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -22,4 +25,12 @@ public interface IPitchMixStationProdDataService extends IService paramMap); + + List countConcreteMixStationDataTrend(HashMap paramMap); + + CountConcreteMixStationDataVo countConcreteMixStationData(HashMap paramMap); + + SectorVo countUseStatus(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/service/impl/PitchMixStationMaterialDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/service/impl/PitchMixStationMaterialDataServiceImpl.java index 316f167d8..b18935b58 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/service/impl/PitchMixStationMaterialDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/service/impl/PitchMixStationMaterialDataServiceImpl.java @@ -1,5 +1,7 @@ package com.zhgd.xmgl.modules.pitchmixstation.service.impl; +import com.zhgd.xmgl.base.entity.vo.SectorOneVo; +import com.zhgd.xmgl.base.entity.vo.SectorVo; import com.zhgd.xmgl.modules.pitchmixstation.entity.PitchMixStationMaterialData; import com.zhgd.xmgl.modules.pitchmixstation.mapper.PitchMixStationMaterialDataMapper; import com.zhgd.xmgl.modules.pitchmixstation.service.IPitchMixStationMaterialDataService; @@ -66,4 +68,10 @@ public class PitchMixStationMaterialDataServiceImpl extends ServiceImpl paramMap) { + List list = baseMapper.countMaterialName(paramMap); + return SectorVo.getSectorVo(list); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/service/impl/PitchMixStationProdDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/service/impl/PitchMixStationProdDataServiceImpl.java index e04a28c1f..7d8407524 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/service/impl/PitchMixStationProdDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/service/impl/PitchMixStationProdDataServiceImpl.java @@ -1,8 +1,20 @@ package com.zhgd.xmgl.modules.pitchmixstation.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.zhgd.xmgl.base.entity.vo.SectorOneVo; +import com.zhgd.xmgl.base.entity.vo.SectorVo; +import com.zhgd.xmgl.base.entity.vo.TrendOneVo; +import com.zhgd.xmgl.base.entity.vo.TrendVo; +import com.zhgd.xmgl.enums.ParamEnum; +import com.zhgd.xmgl.modules.concretemixstation.entity.ConcreteMixStationDev; +import com.zhgd.xmgl.modules.concretemixstation.entity.vo.CountConcreteMixStationDataVo; +import com.zhgd.xmgl.modules.pitchmixstation.entity.PitchMixStationDev; import com.zhgd.xmgl.modules.pitchmixstation.entity.PitchMixStationProdData; +import com.zhgd.xmgl.modules.pitchmixstation.mapper.PitchMixStationDevMapper; import com.zhgd.xmgl.modules.pitchmixstation.mapper.PitchMixStationProdDataMapper; import com.zhgd.xmgl.modules.pitchmixstation.service.IPitchMixStationProdDataService; +import com.zhgd.xmgl.util.DateUtils; +import org.apache.commons.collections.MapUtils; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -11,8 +23,11 @@ import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.xmgl.util.PageUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; import com.zhgd.xmgl.util.RefUtil; import org.springframework.transaction.annotation.Transactional; @@ -29,6 +44,8 @@ import org.springframework.beans.factory.annotation.Autowired; public class PitchMixStationProdDataServiceImpl extends ServiceImpl implements IPitchMixStationProdDataService { @Autowired private PitchMixStationProdDataMapper pitchMixStationProdDataMapper; + @Autowired + private PitchMixStationDevMapper pitchMixStationDevMapper; @Override public IPage queryPageList(HashMap paramMap) { @@ -66,4 +83,45 @@ public class PitchMixStationProdDataServiceImpl extends ServiceImpl countConcreteMixStationDataTrend(HashMap paramMap) { + String projectSn = MapUtils.getString(paramMap, "projectSn"); + Integer type = MapUtils.getInteger(paramMap, "type"); + List trendVos = pitchMixStationDevMapper.selectList(new LambdaQueryWrapper() + .eq(PitchMixStationDev::getProjectSn, projectSn)).stream().map(c -> new TrendVo(c.getDevName(), c.getDevSn())).collect(Collectors.toList()); + List list = baseMapper.countConcreteMixStationDataTrend(paramMap); + if (Objects.equals(type, 1)) { + List dateTimeStrList = DateUtils.getDateTimeStrList(100, "HH:00"); + String format = "HH:00"; + return TrendVo.getTrendVos(trendVos, list, dateTimeStrList, format); + } else if (Objects.equals(type, 2)) { + List dateTimeStrList = DateUtils.getDateTimeStrList(60, "yyyy-MM-dd"); + String format = "yyyy-MM-dd"; + return TrendVo.getTrendVos(trendVos, list, dateTimeStrList, format); + } else if (Objects.equals(type, 3)) { + List dateTimeStrList = DateUtils.getDateTimeStrList(80, "yyyy-MM-dd"); + String format = "yyyy-MM-dd"; + return TrendVo.getTrendVos(trendVos, list, dateTimeStrList, format); + } else { + return null; + } + } + + @Override + public CountConcreteMixStationDataVo countConcreteMixStationData(HashMap paramMap) { + return baseMapper.countConcreteMixStationData(paramMap); + } + + @Override + public SectorVo countUseStatus(HashMap paramMap) { + ArrayList list = baseMapper.countUseStatus(paramMap); + return SectorVo.getSectorVoByEnum(list, ParamEnum.ConcreteMixStationDataUseStatusEnum.values()); + } + + @Override + public SectorVo countPowerLevel(HashMap paramMap) { + ArrayList list = baseMapper.countPowerLevel(paramMap); + return SectorVo.getSectorVo(list); + } }