From 3c556186daabf25b638472e2fca31e8aafaa73ed Mon Sep 17 00:00:00 2001 From: jun Date: Wed, 3 Jul 2024 10:05:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E6=B5=81=E7=A8=8B=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/ext/mes/api/base/IMesRouteService.java | 14 ++++++++++++ .../controller/base/MesRouteController.java | 20 +++++++++++++++++ .../mes/apiservice/daoimpl/MesCraftDaoImpl.java | 9 +++++--- .../serviceimpl/base/MesRouteServiceImpl.java | 26 ++++++++++++++++++++++ 4 files changed, 66 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesRouteService.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesRouteController.java create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesRouteServiceImpl.java diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesRouteService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesRouteService.java new file mode 100644 index 0000000..bc0b7a7 --- /dev/null +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesRouteService.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.ext.mes.api.base; + +import cn.estsh.i3plus.pojo.mes.bean.MesRoute; + +/** + * @Description : 流程表 + * @Reference : + * @Author : junsheng.li + * @CreateDate 2024/7/3 9:46 + * @Modify: + **/ +public interface IMesRouteService extends IBaseMesService { + +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesRouteController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesRouteController.java new file mode 100644 index 0000000..c623eb7 --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesRouteController.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.ext.mes.apiservice.controller.base; + +import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant; +import cn.estsh.i3plus.pojo.mes.bean.MesRoute; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description : 流程表 + * @Reference : + * @Author : junsheng.li + * @CreateDate 2024/7/3 9:45 + * @Modify: + **/ +@Api(description = "流程表") +@RestController +@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesRoute") +public class MesRouteController extends BaseMesController { +} diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesCraftDaoImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesCraftDaoImpl.java index f6bec4d..c4cbab9 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesCraftDaoImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesCraftDaoImpl.java @@ -9,12 +9,14 @@ import cn.estsh.i3plus.pojo.base.util.StringUtil; import cn.estsh.i3plus.pojo.mes.bean.MesCraft; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.persistence.EntityManager; import javax.persistence.Query; import java.util.ArrayList; +import java.util.List; /** * @Description :工艺信息 @@ -49,8 +51,8 @@ public class MesCraftDaoImpl implements IMesCraftDao { if (!StringUtil.isEmpty(mesCraft.getCraftName())) { hql.append(" and mc.craftName like '%").append(mesCraft.getCraftName()).append("%' "); } - Query query = entityManager.createQuery("select mc " + hql, MesCraft.class); - Query countQuery = entityManager.createQuery("select count(1) " + hql, Long.class); + Query query = entityManager.createQuery("select distinct mc " + hql, MesCraft.class); + Query countQuery = entityManager.createQuery("select count(1) " + hql+" group by mc.id ",Long.class); query.setParameter("organizeCode", mesCraft.getOrganizeCode()); query.setParameter("isValid", CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); query.setParameter("isDeleted", CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); @@ -66,7 +68,8 @@ public class MesCraftDaoImpl implements IMesCraftDao { query.setParameter("craftCode", mesCraft.getCraftCode()); countQuery.setParameter("craftCode", mesCraft.getCraftCode()); } - int count = Integer.parseInt(String.valueOf(countQuery.getSingleResult())); + List resultLst = countQuery.getResultList(); + int count = CollectionUtils.isEmpty(resultLst) ? 0 : resultLst.size(); pager = PagerHelper.getPager(pager, count); if (count <= 0) { return new ListPager<>(new ArrayList<>(), pager); diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesRouteServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesRouteServiceImpl.java new file mode 100644 index 0000000..920be9f --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesRouteServiceImpl.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; + +import cn.estsh.i3plus.ext.mes.api.base.IMesRouteService; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import cn.estsh.i3plus.pojo.mes.bean.MesRoute; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** + * @Description : 流程表 + * @Reference : + * @Author : junsheng.li + * @CreateDate 2024/7/3 9:47 + * @Modify: + **/ +@Service +@Slf4j +public class MesRouteServiceImpl extends BaseMesService implements IMesRouteService { + + @Override + protected void setPackQueryBean(MesRoute bean, DdlPackBean packBean) { + DdlPreparedPack.getStringLikerPack(bean.getRouteCode(), "routeCode", packBean); + DdlPreparedPack.getStringLikerPack(bean.getRouteName(), "routeName", packBean); + } +}