diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/busi/IMesPojoVersionService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/busi/IMesPojoVersionService.java index 275f62e..056afc0 100644 --- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/busi/IMesPojoVersionService.java +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/busi/IMesPojoVersionService.java @@ -1,8 +1,11 @@ package cn.estsh.i3plus.ext.mes.api.busi; import cn.estsh.i3plus.ext.mes.api.base.IBaseMesService; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.mes.bean.MesCcscRule; import cn.estsh.i3plus.pojo.mes.bean.MesPojoVersion; +import cn.estsh.i3plus.pojo.mes.bean.MesPojoVersionDetail; /** * @Description :版本记录 @@ -13,4 +16,6 @@ import cn.estsh.i3plus.pojo.mes.bean.MesPojoVersion; **/ public interface IMesPojoVersionService extends IBaseMesService { + + MesPojoVersionDetail getPojoVersionDetailByPojoVersionId(Long pojoVersionId); } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseMesController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseMesController.java index b618c5d..f4495f8 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseMesController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BaseMesController.java @@ -152,7 +152,7 @@ public abstract class BaseMesController extends BaseControll @ApiOperation(value = "查询信息带分页", notes = "组合查询,外带分页功能") public ResultBean queryByPager(T bean, Pager pager) { try { - bean.setOrganizeCode(AuthUtilExt.getOrganizeCode()); + bean.setOrganizeCode("CK01"); ListPager listPager = getBaseService().queryPager(bean, pager); return ResultBean.success("操作成功") .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/busi/MesPojoVersionDetailController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/busi/MesPojoVersionDetailController.java new file mode 100644 index 0000000..62decd6 --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/busi/MesPojoVersionDetailController.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.ext.mes.apiservice.controller.busi; + +import cn.estsh.i3plus.ext.mes.api.busi.IMesPojoVersionService; +import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant; +import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; +import cn.estsh.i3plus.pojo.mes.bean.MesPojoVersionDetail; +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.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description : + * @Reference : + * @Author : zxw + * @CreateDate : 2024-07-06 下午2:56 + * @Modify: + **/ +@RestController +@Api(tags = "对象历史详情") +@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesPojoVersionDetail") +public class MesPojoVersionDetailController { + @Autowired + private IMesPojoVersionService pojoVersionService; + + /** + * 查询对象历史计划 + * + * @param pojoVersionId 对象版本id + * @return 处理结果 + */ + @GetMapping(value = "/get-pojo-version-id/{pojoVersionId}") + @ApiOperation(value = "查询对象历史计划", notes = "根据所属模块与className查询对象历史计划状态") + public ResultBean getPojoVersionDetailByPojoVersionId(@PathVariable("pojoVersionId") Long pojoVersionId) { + try { + // 数据校验 + ValidatorBean.checkNotZero(pojoVersionId, "对象版本id 不能为空"); + MesPojoVersionDetail pojoVersionDetail = pojoVersionService.getPojoVersionDetailByPojoVersionId(pojoVersionId); + return ResultBean.success("操作成功") + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) + .setResultObject(pojoVersionDetail); + } catch (ImppBusiException busExcep) { + return ResultBean.fail(busExcep); + } 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/busi/MesPojoVersionService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesPojoVersionService.java index 3ada20a..99357e4 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesPojoVersionService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesPojoVersionService.java @@ -7,7 +7,9 @@ import cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base.BaseMesService; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.mes.bean.MesPojoVersion; +import cn.estsh.i3plus.pojo.mes.bean.MesPojoVersionDetail; import cn.estsh.i3plus.pojo.mes.bean.MesSpotCheckOrderPart; +import cn.estsh.i3plus.pojo.mes.repository.MesPojoVersionDetailRepository; import cn.estsh.i3plus.pojo.mes.repository.MesPojoVersionRepository; import cn.estsh.i3plus.pojo.mes.repository.MesSpotCheckOrderRepository; import org.springframework.beans.factory.annotation.Autowired; @@ -23,9 +25,19 @@ import org.springframework.stereotype.Service; @Service public class MesPojoVersionService extends BaseMesService implements IMesPojoVersionService { + @Autowired + private MesPojoVersionDetailRepository pojoVersionDetailRepository; + protected void setPackQueryBean(MesPojoVersion bean, DdlPackBean packBean) { DdlPreparedPack.getNumEqualPack(bean.getBusiData(), "busiData", packBean); DdlPreparedPack.getStringEqualPack(bean.getRefClass(), "refClass", packBean); DdlPreparedPack.getNumEqualPack(bean.getOperateType(), "operateType", packBean); } + + @Override + public MesPojoVersionDetail getPojoVersionDetailByPojoVersionId(Long pojoVersionId) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getNumEqualPack(pojoVersionId,"pojoVersionId",ddlPackBean); + return pojoVersionDetailRepository.getByProperty(ddlPackBean); + } }