From 8058d0a24b7b4ae2d9e99c851bcd9d933f1bb6a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com> Date: Fri, 3 Sep 2021 10:28:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=97=A5=E5=BF=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mesnac/anomaly/dto/IntegrationLogDto.java | 108 ++++++++++++++++++ ...turing.java => PartsManufacturingDto.java} | 2 +- .../mesnac/anomaly/mapper/ReportMapper.java | 3 +- .../mesnac/anomaly/service/ReportService.java | 4 +- .../service/impl/ReportServiceImpl.java | 4 +- .../main/resources/mapper/ReportMapper.xml | 13 ++- 6 files changed, 127 insertions(+), 7 deletions(-) create mode 100644 anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/IntegrationLogDto.java rename anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/{PartsManufacturing.java => PartsManufacturingDto.java} (97%) diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/IntegrationLogDto.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/IntegrationLogDto.java new file mode 100644 index 00000000..9897b1c0 --- /dev/null +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/IntegrationLogDto.java @@ -0,0 +1,108 @@ +package com.foreverwin.mesnac.anomaly.dto; + +/** + * @Description TODO + * @Author zhaojiawei + * @Since 2021-09-03 + */ +public class IntegrationLogDto { + /** + * 接口类型 + */ + private String integrationType; + + /** + * 请求类型 + */ + private String category; + + /** + * 系统请求 + */ + private String integrationWay; + + /** + * 状态 + */ + private String status; + + /** + * 请求时间 + */ + private String requestDateTime; + + /** + * 返回参数 + */ + private String resultMessage; + + /** + * 请求岑书 + */ + private String param; + + public String getIntegrationType() { + return integrationType; + } + + public void setIntegrationType(String integrationType) { + this.integrationType = integrationType; + } + + public String getCategory() { + return category; + } + + public void setCategory(String category) { + this.category = category; + } + + public String getIntegrationWay() { + return integrationWay; + } + + public void setIntegrationWay(String integrationWay) { + this.integrationWay = integrationWay; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getRequestDateTime() { + return requestDateTime; + } + + public void setRequestDateTime(String requestDateTime) { + this.requestDateTime = requestDateTime; + } + + public String getResultMessage() { + return resultMessage; + } + + public void setResultMessage(String resultMessage) { + this.resultMessage = resultMessage; + } + + public String getParam() { + return param; + } + + public void setParam(String param) { + this.param = param; + } +} + + + + + + + + + diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/PartsManufacturing.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/PartsManufacturingDto.java similarity index 97% rename from anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/PartsManufacturing.java rename to anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/PartsManufacturingDto.java index 5c3d5abc..197a5bd2 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/PartsManufacturing.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/PartsManufacturingDto.java @@ -7,7 +7,7 @@ import java.time.LocalDateTime; * @Author zhaojiawei * @Since 2021-08-23 */ -public class PartsManufacturing { +public class PartsManufacturingDto { private String itemNumber; private String shopOrder; private String item; diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java index 5398e690..e651f1ba 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java @@ -1,5 +1,6 @@ package com.foreverwin.mesnac.anomaly.mapper; +import com.foreverwin.mesnac.anomaly.dto.IntegrationLogDto; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -14,7 +15,7 @@ import java.util.Map; @Repository public interface ReportMapper { - List> findIntegrationLog(@Param("site")String site,@Param("param") Map map); + List findIntegrationLog(@Param("site")String site, @Param("param") Map map); List> partsManufacturing(@Param("site")String site,@Param("locale")String locale, @Param("param") Map map); diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java index 26c3ec4b..55bd2772 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java @@ -1,5 +1,7 @@ package com.foreverwin.mesnac.anomaly.service; +import com.foreverwin.mesnac.anomaly.dto.IntegrationLogDto; + import java.util.List; import java.util.Map; @@ -9,7 +11,7 @@ import java.util.Map; * @Since 2021-08-23 */ public interface ReportService { - List> findIntegrationLog(Map map); + List findIntegrationLog(Map map); List> partsManufacturing(Map map); diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java index ea09981e..93451546 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java @@ -1,5 +1,6 @@ package com.foreverwin.mesnac.anomaly.service.impl; +import com.foreverwin.mesnac.anomaly.dto.IntegrationLogDto; import com.foreverwin.mesnac.anomaly.mapper.ReportMapper; import com.foreverwin.mesnac.anomaly.service.ReportService; import com.foreverwin.mesnac.meapi.model.NcCode; @@ -36,11 +37,10 @@ public class ReportServiceImpl implements ReportService { /** * 接口日志表 - * @param integration * @return */ @Override - public List> findIntegrationLog(Map map) { + public List findIntegrationLog(Map map) { String site = CommonMethods.getSite(); return reportMapper.findIntegrationLog(site,map); } diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml index ff6a82df..119d2999 100644 --- a/anomaly/src/main/resources/mapper/ReportMapper.xml +++ b/anomaly/src/main/resources/mapper/ReportMapper.xml @@ -2,8 +2,17 @@ - + SELECT INTEGRATION_TYPE, CATEGORY, INTEGRATION_WAY,STATUS, + REQUEST_DATE_TIME,RESULT_MESSAGE RESULT_MESSAGE,PARAM PARAM FROM Z_INTEGRATION_LOG SITE = #{site}