From 28d811db9e5ad79c7ab923e5df0ed40fc607c3f3 Mon Sep 17 00:00:00 2001 From: zpl Date: Fri, 3 Sep 2021 18:58:30 +0800 Subject: [PATCH 1/3] =?UTF-8?q?mq=E6=95=B0=E6=8D=AE=E6=8E=A5=E6=94=B6?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=95=B0=E6=8D=AE=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E5=8F=8A=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/ResourceStatusReceiveMapper.java | 2 +- .../impl/EdcDataResourceServiceImpl.java | 31 ++++++++++- .../impl/ResourceFaultReceiveServiceImpl.java | 20 ++++++- .../ResourceStatusReceiveServiceImpl.java | 55 +++++++++++++------ .../mapper/ResourceStatusReceiveMapper.xml | 13 +++-- 5 files changed, 94 insertions(+), 27 deletions(-) diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceStatusReceiveMapper.java b/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceStatusReceiveMapper.java index 1c74ed01..0ca8b6e2 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceStatusReceiveMapper.java +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceStatusReceiveMapper.java @@ -17,6 +17,6 @@ import org.springframework.stereotype.Repository; public interface ResourceStatusReceiveMapper extends BaseMapper { // 获取最新的记录 - ResourceStatusReceive getOneByMaxCreateDateTime(@Param("site") String site); + ResourceStatusReceive getOneByMaxCreateDateTime(@Param("site") String site, @Param("resrce") String resrce); } \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/EdcDataResourceServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/EdcDataResourceServiceImpl.java index 7b83fc87..4df0ff5e 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/EdcDataResourceServiceImpl.java +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/EdcDataResourceServiceImpl.java @@ -4,8 +4,11 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.foreverwin.mesnac.common.enums.HandleEnum; +import com.foreverwin.mesnac.common.util.StringUtil; import com.foreverwin.mesnac.meapi.mapper.DcParameterMapper; import com.foreverwin.mesnac.meapi.model.DcParameter; +import com.foreverwin.mesnac.meapi.model.Resrce; +import com.foreverwin.mesnac.meapi.service.ResrceService; import com.foreverwin.modular.core.exception.BusinessException; import com.foreverwin.modular.core.util.FrontPage; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,6 +17,8 @@ import com.foreverwin.mesnac.equip.model.EdcDataResource; import com.foreverwin.mesnac.equip.mapper.EdcDataResourceMapper; import com.foreverwin.mesnac.equip.service.EdcDataResourceService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; @@ -36,11 +41,14 @@ import java.util.UUID; @Transactional(rollbackFor = Exception.class) public class EdcDataResourceServiceImpl extends ServiceImpl implements EdcDataResourceService { + private static Logger logger = LoggerFactory.getLogger(EdcDataResourceServiceImpl.class); @Autowired private EdcDataResourceMapper edcDataResourceMapper; @Autowired private DcParameterMapper dcParameterMapper; + @Autowired + private ResrceService resrceService; @Override public IPage selectPage(FrontPage frontPage, EdcDataResource edcDataResource) { @@ -64,6 +72,25 @@ public class EdcDataResourceServiceImpl extends ServiceImpl getParamList = dcParameterMapper.getDcParameterByDcGroupBo(dcGroupBo); - if (getParamList.size()<1){ + if (getParamList.size() < 1){ + logger.info("数据收集组" + dcGroupBo + "未维护字段信息"); throw BusinessException.build("数据收集组" + dcGroupBo + "未维护字段信息"); } for (DcParameter dcParam:getParamList) { diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceFaultReceiveServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceFaultReceiveServiceImpl.java index 2263727e..92e06289 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceFaultReceiveServiceImpl.java +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceFaultReceiveServiceImpl.java @@ -3,7 +3,10 @@ package com.foreverwin.mesnac.equip.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.foreverwin.mesnac.common.enums.HandleEnum; import com.foreverwin.mesnac.common.util.StringUtil; +import com.foreverwin.mesnac.meapi.model.Resrce; +import com.foreverwin.mesnac.meapi.service.ResrceService; import com.foreverwin.modular.core.exception.BusinessException; import com.foreverwin.modular.core.util.FrontPage; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -12,6 +15,8 @@ import com.foreverwin.mesnac.equip.model.ResourceFaultReceive; import com.foreverwin.mesnac.equip.mapper.ResourceFaultReceiveMapper; import com.foreverwin.mesnac.equip.service.ResourceFaultReceiveService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; @@ -34,11 +39,12 @@ import java.util.UUID; @Transactional(rollbackFor = Exception.class) public class ResourceFaultReceiveServiceImpl extends ServiceImpl implements ResourceFaultReceiveService { + private static Logger logger = LoggerFactory.getLogger(ResourceFaultReceiveServiceImpl.class); - @Autowired - private ResourceFaultReceiveMapper resourceFaultReceiveMapper; @Autowired private ResourceFaultReceiveService resourceFaultReceiveService; + @Autowired + private ResrceService resrceService; @Override public IPage selectPage(FrontPage frontPage, ResourceFaultReceive resourceFaultReceive) { @@ -68,14 +74,24 @@ public class ResourceFaultReceiveServiceImpl extends ServiceImpl list = new ArrayList<>(); // 故障编码及故障时间 JSONArray jsonArray = JSON.parseArray(faultList); diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceStatusReceiveServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceStatusReceiveServiceImpl.java index b69a1308..011618ca 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceStatusReceiveServiceImpl.java +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceStatusReceiveServiceImpl.java @@ -6,6 +6,7 @@ import com.foreverwin.mesnac.common.util.StringUtil; import com.foreverwin.mesnac.meapi.model.Resrce; import com.foreverwin.mesnac.meapi.service.ResrceService; import com.foreverwin.modular.core.exception.BusinessException; +import com.foreverwin.modular.core.util.CommonMethods; import com.foreverwin.modular.core.util.FrontPage; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -13,6 +14,8 @@ import com.foreverwin.mesnac.equip.model.ResourceStatusReceive; import com.foreverwin.mesnac.equip.mapper.ResourceStatusReceiveMapper; import com.foreverwin.mesnac.equip.service.ResourceStatusReceiveService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; @@ -35,6 +38,7 @@ import java.util.UUID; @Transactional(rollbackFor = Exception.class) public class ResourceStatusReceiveServiceImpl extends ServiceImpl implements ResourceStatusReceiveService { + private static Logger logger = LoggerFactory.getLogger(ResourceStatusReceiveServiceImpl.class); @Autowired private ResourceStatusReceiveMapper resourceStatusReceiveMapper; @@ -62,6 +66,7 @@ public class ResourceStatusReceiveServiceImpl extends ServiceImpl + From b1d362c1e6af668f10738b63576370f0d1ecf995 Mon Sep 17 00:00:00 2001 From: zpl Date: Fri, 3 Sep 2021 19:28:41 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=87=AA=E6=8A=A5=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E4=BA=8B=E9=A1=B9=E6=96=B0=E5=A2=9E=E6=A3=80=E9=AA=8C=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SelfReportController.java | 25 +++++++++++++++++++ .../quality/mapper/SelfReportMapper.java | 4 +++ .../mesnac/quality/model/SelfReport.java | 11 ++++++++ 3 files changed, 40 insertions(+) diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/controller/SelfReportController.java b/quality/src/main/java/com/foreverwin/mesnac/quality/controller/SelfReportController.java index 3a7022c1..cf2be7c1 100644 --- a/quality/src/main/java/com/foreverwin/mesnac/quality/controller/SelfReportController.java +++ b/quality/src/main/java/com/foreverwin/mesnac/quality/controller/SelfReportController.java @@ -3,6 +3,7 @@ package com.foreverwin.mesnac.quality.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.foreverwin.mesnac.common.constant.Constants; +import com.foreverwin.mesnac.quality.mapper.SelfReportMapper; import com.foreverwin.mesnac.quality.model.SelfReport; import com.foreverwin.mesnac.quality.service.SelfReportService; import com.foreverwin.modular.core.util.CommonMethods; @@ -26,6 +27,9 @@ public class SelfReportController { @Autowired public SelfReportService selfReportService; + + @Autowired + public SelfReportMapper selfReportMapper; /** * 查询所有数据 * @@ -148,4 +152,25 @@ public class SelfReportController { public R removeByIds(List ids){ return R.ok(selfReportService.removeByIds(ids)); } + + + /** + * 查询设备和设备上的检验人员 + * @param + * @return + */ + @GetMapping("/selectResourceAndCheckUsr") + public R selectResourceAndCheckUsr() { + List result; + try { + String site = CommonMethods.getSite(); + result = selfReportMapper.selectResourceAndCheckUsr(site); + } catch (Exception e) { + return R.failed(e.getMessage()); + } + + return R.ok(result); + } + + } \ No newline at end of file diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/mapper/SelfReportMapper.java b/quality/src/main/java/com/foreverwin/mesnac/quality/mapper/SelfReportMapper.java index d9f8f19b..9a51143d 100644 --- a/quality/src/main/java/com/foreverwin/mesnac/quality/mapper/SelfReportMapper.java +++ b/quality/src/main/java/com/foreverwin/mesnac/quality/mapper/SelfReportMapper.java @@ -22,4 +22,8 @@ import java.util.List; public interface SelfReportMapper extends BaseMapper { List selectListByCondition(@Param("ew") QueryWrapper ew, @Param("locale") String locale, @Param("startTime") LocalDate startTime, @Param("endTime") LocalDate endTime, @Param("userGroupList")List userGroupList); + + /*查询设备和设备上的检验人员*/ + List selectResourceAndCheckUsr(@Param("site") String site); + } \ No newline at end of file diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/model/SelfReport.java b/quality/src/main/java/com/foreverwin/mesnac/quality/model/SelfReport.java index 1ed34e6e..3bfbfbc1 100644 --- a/quality/src/main/java/com/foreverwin/mesnac/quality/model/SelfReport.java +++ b/quality/src/main/java/com/foreverwin/mesnac/quality/model/SelfReport.java @@ -157,6 +157,17 @@ public class SelfReport extends Model { */ @TableField(exist = false) private String pbUser; + @TableField(exist = false) + private String checkUsr; + + + public String getCheckUsr() { + return checkUsr; + } + + public void setCheckUsr(String checkUsr) { + this.checkUsr = checkUsr; + } public String getProductCategory() { return productCategory; From 0c5054c79ddcb2d347ea5ce436194a6daa60eaa0 Mon Sep 17 00:00:00 2001 From: zpl Date: Fri, 3 Sep 2021 19:28:57 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=87=AA=E6=8A=A5=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E4=BA=8B=E9=A1=B9=E6=96=B0=E5=A2=9E=E6=A3=80=E9=AA=8C=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/SelfReportMapper.xml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/quality/src/main/resources/mapper/SelfReportMapper.xml b/quality/src/main/resources/mapper/SelfReportMapper.xml index 9b4255b1..c5f0fdf7 100644 --- a/quality/src/main/resources/mapper/SelfReportMapper.xml +++ b/quality/src/main/resources/mapper/SelfReportMapper.xml @@ -559,13 +559,17 @@ ) + + + + + + + + +