From 4cf06dea83cc00e0dd6a00753dc739086b136941 Mon Sep 17 00:00:00 2001 From: jun Date: Fri, 11 Oct 2024 14:17:26 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=94=A8V107Melos=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=9B=91=E6=8E=A7=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/api/busi/board/IMesYfBoardService.java | 7 +++ .../controller/board/MesBusiBoardController.java | 48 ++++++++++++++++++++ .../serviceimpl/board/IMesYfBoardServiceImpl.java | 28 ++++++++++++ .../model/board/MesGepicsInspectionInfoModel.java | 52 ++++++++++++++++++++++ 4 files changed, 135 insertions(+) create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/board/MesBusiBoardController.java create mode 100644 modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/board/MesGepicsInspectionInfoModel.java diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/busi/board/IMesYfBoardService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/busi/board/IMesYfBoardService.java index 54b1da3..5471e21 100644 --- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/busi/board/IMesYfBoardService.java +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/busi/board/IMesYfBoardService.java @@ -1,7 +1,11 @@ package cn.estsh.i3plus.ext.mes.api.busi.board; +import cn.estsh.i3plus.ext.mes.pojo.model.board.MesGepicsInspectionInfoModel; import cn.estsh.i3plus.ext.mes.pojo.model.board.MesWorkCenterBoardConditionModel; import cn.estsh.i3plus.ext.mes.pojo.model.board.MesWorkCenterBoardResultModel; +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import cn.estsh.i3plus.pojo.base.common.Pager; +import io.swagger.annotations.ApiOperation; import java.util.List; @@ -31,4 +35,7 @@ public interface IMesYfBoardService { MesWorkCenterBoardResultModel queryAbnormalDowntime(MesWorkCenterBoardConditionModel conditionModel); + @ApiOperation("查询V107Melos数据监控") + ListPager queryGepicsInspectionInfo(MesGepicsInspectionInfoModel infoModel, Pager pager); + } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/board/MesBusiBoardController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/board/MesBusiBoardController.java new file mode 100644 index 0000000..b41b1b3 --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/board/MesBusiBoardController.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.ext.mes.apiservice.controller.board; + +import cn.estsh.i3plus.ext.mes.api.busi.board.IMesYfBoardService; +import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant; +import cn.estsh.i3plus.ext.mes.pojo.model.board.MesGepicsInspectionInfoModel; +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; +import cn.estsh.impp.framework.boot.exception.ImppBusiException; +import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; +import cn.estsh.impp.framework.boot.util.ResultBean; +import cn.estsh.impp.framework.boot.util.ValidatorBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +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; + +/** + * @Description : 报表 + * @Reference : + * @Author : junsheng.li + * @CreateDate 2024/10/11 13:58 + * @Modify: + **/ +@Api("报表") +@RestController +@RequestMapping(MesCommonConstant.MES_YANFEN + "/board") +public class MesBusiBoardController { + + @Autowired + private IMesYfBoardService mesYfBoardService; + + @ApiOperation(value = "查询V107Melos数据", notes = "查询V107Melos数据") + @PostMapping("/query-gepics-inspection-info") + public ResultBean queryGepicsInspectionInfo(@RequestBody MesGepicsInspectionInfoModel infoModel, Pager pager){ + try { + ValidatorBean.beginValid(infoModel) + .notNull("organizeCode", infoModel.getOrganizeCode()); + return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setListPager(mesYfBoardService.queryGepicsInspectionInfo(infoModel,pager)); + } catch (ImppBusiException e) { + return ResultBean.fail(e); + } catch (Exception e) { + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/board/IMesYfBoardServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/board/IMesYfBoardServiceImpl.java index d3bce3d..5aa106f 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/board/IMesYfBoardServiceImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/board/IMesYfBoardServiceImpl.java @@ -2,14 +2,20 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.board; import cn.estsh.i3plus.ext.mes.api.busi.board.IMesYfBoardService; import cn.estsh.i3plus.ext.mes.apiservice.dao.board.IMesYfBoardDao; +import cn.estsh.i3plus.ext.mes.pojo.model.board.MesGepicsInspectionInfoModel; import cn.estsh.i3plus.ext.mes.pojo.model.board.MesWorkCenterBoardConditionModel; import cn.estsh.i3plus.ext.mes.pojo.model.board.MesWorkCenterBoardResultModel; import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.base.common.PagerHelper; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.mes.bean.*; +import cn.estsh.i3plus.pojo.mes.bean.edi.wh.order.MesCimGmGepics; import cn.estsh.i3plus.pojo.mes.repository.*; +import cn.estsh.i3plus.pojo.mes.repository.wh.MesCimGmGepicsRepository; import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import org.apache.commons.lang3.StringUtils; @@ -52,6 +58,9 @@ public class IMesYfBoardServiceImpl implements IMesYfBoardService { @Autowired private MesSpotCheckOrderRepository mesSpotCheckOrderRepository; + @Autowired + private MesCimGmGepicsRepository mesCimGmGepicsRepository; + private static final String START_TIME = "START_TIME"; private static final String END_TIME = "END_TIME"; @@ -336,6 +345,25 @@ public class IMesYfBoardServiceImpl implements IMesYfBoardService { return resultModel; } + @Override + public ListPager queryGepicsInspectionInfo(MesGepicsInspectionInfoModel infoModel, Pager pager) { + //查询数据 + DdlPackBean packBean = DdlPackBean.getDdlPackBean(infoModel.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(infoModel.getGaRule(), "gaRule", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.VALID, "status", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.VALID, "type", packBean); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, packBean); + pager = PagerHelper.getPager(pager, mesCimGmGepicsRepository.findByHqlWhereCount(packBean)); + List mesCimGmGepicsList = mesCimGmGepicsRepository.findByHqlWherePage(packBean, pager); + if(CollectionUtils.isEmpty(mesCimGmGepicsList)){ + return new ListPager<>(new ArrayList<>(),pager); + } + //数据组装 + List modelList = new ArrayList<>(mesCimGmGepicsList.size()); + mesCimGmGepicsList.forEach(item -> modelList.add(new MesGepicsInspectionInfoModel(item))); + return new ListPager<>(modelList,pager); + } + /** * 获取看板查询时间区段 * @param timeRangeIdentification 显示维度 diff --git a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/board/MesGepicsInspectionInfoModel.java b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/board/MesGepicsInspectionInfoModel.java new file mode 100644 index 0000000..6b3d918 --- /dev/null +++ b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/board/MesGepicsInspectionInfoModel.java @@ -0,0 +1,52 @@ +package cn.estsh.i3plus.ext.mes.pojo.model.board; + +import cn.estsh.i3plus.pojo.mes.bean.edi.wh.order.MesCimGmGepics; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 通用V107Melos数据监控Model + * @Reference : + * @Author : junsheng.li + * @CreateDate 2024/10/11 13:21 + * @Modify: + **/ +@Data +@ApiModel("通用V107Melos数据监控Model") +public class MesGepicsInspectionInfoModel { + @ApiParam("工厂代码") + private String organizeCode; + + @ApiModelProperty(name = "gaRule") + private String gaRule; + + @ApiParam("GA号") + private String gepicsCsnNo; + + @ApiParam("需求日期") + private String gepicsDate; + + @ApiParam("需求时间") + private String gepicsTime; + + @ApiParam("GA号") + private String melosCsnNo; + + @ApiParam("需求日期") + private String melosDate; + + @ApiParam("需求时间") + private String melosTime; + + public MesGepicsInspectionInfoModel(){ + + } + + public MesGepicsInspectionInfoModel(MesCimGmGepics mesCimGmGepics){ + this.gepicsCsnNo = mesCimGmGepics.getCsnNo(); + this.gepicsDate = mesCimGmGepics.getDate(); + this.gepicsTime = mesCimGmGepics.getTime(); + } +}