From be175fe739e687cd1d45da58f2cb7dd0c36d001f Mon Sep 17 00:00:00 2001 From: jiazx0107@163.com <jiazx0107@163.com> Date: 星期五, 11 八月 2023 11:48:10 +0800 Subject: [PATCH] 调整Pressure的接口包位置到COre中,然后增加modBus-TCP协议通讯报道 --- igds-core/src/main/java/com/ld/igds/check/service/impl/CoreCheckStandardServiceImpl.java | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/igds-core/src/main/java/com/ld/igds/check/service/impl/CoreCheckStandardServiceImpl.java b/igds-core/src/main/java/com/ld/igds/check/service/impl/CoreCheckStandardServiceImpl.java index aa5a242..fca817d 100644 --- a/igds-core/src/main/java/com/ld/igds/check/service/impl/CoreCheckStandardServiceImpl.java +++ b/igds-core/src/main/java/com/ld/igds/check/service/impl/CoreCheckStandardServiceImpl.java @@ -48,15 +48,18 @@ } @Override - public List<CheckItemData> getCheckItemByStandard(String checkId, String companyId, String foodVariety) { + public List<CheckItemData> getCheckItemByStandard(String companyId,String checkId,String foodVariety) { List<CheckItemData> result = new ArrayList<>(); + if (StringUtils.isEmpty(foodVariety)) { return result; } + if (StringUtils.isEmpty(companyId)) { companyId = ContextUtil.getDefaultCompanyId(); } + List<CheckStandardData> list = checkStandardMapper.getCheckStandard(companyId, foodVariety); if (null == list) { return result; @@ -65,10 +68,8 @@ CheckItemData item; for (CheckStandardData data : list) { item = new CheckItemData(); - BeanUtils.copyProperties(data, item); item.setCheckId(checkId); - if (data.getUpperLimit() > 0.0 && StringUtils.isNotEmpty(data.getOperaSymbol())) { item.setOperaSymbolValue(data.getOperaSymbol() + " " + data.getUpperLimit()); } -- Gitblit v1.9.3