接口日志表

integration/src/main/java/com/foreverwin/mesnac/integration/controller/IntegrationLogController.java

@@ -1,8 +1,14 @@
 package com.foreverwin.mesnac.integration.controller;
 
 
+import com.foreverwin.mesnac.integration.model.IntegrationLog;
+import com.foreverwin.mesnac.integration.service.IntegrationLogService;
+import com.foreverwin.modular.core.util.R;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  *
@@ -12,6 +18,12 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @RequestMapping("/Z-INTEGRATION-LOG")
 public class IntegrationLogController {
+    @Autowired
+    private IntegrationLogService integrationLogService;
 
+    @PostMapping("/findIntegrationLog")
+    public R findIntegrationLog(@RequestBody IntegrationLog integration){
+        return R.ok(integrationLogService.findIntegrationLog(integration));
+    }
 
 }

integration/src/main/java/com/foreverwin/mesnac/integration/mapper/IntegrationLogMapper.java

@@ -2,8 +2,11 @@ package com.foreverwin.mesnac.integration.mapper;
 
 import com.foreverwin.mesnac.integration.model.IntegrationLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * <p>
  *  Mapper 接口
@@ -15,4 +18,5 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface IntegrationLogMapper extends BaseMapper<IntegrationLog> {
 
+    List<IntegrationLog> findIntegrationLog(@Param("integration") IntegrationLog integration);
 }

integration/src/main/java/com/foreverwin/mesnac/integration/model/IntegrationLog.java

@@ -1,13 +1,13 @@
 package com.foreverwin.mesnac.integration.model;
 
-import java.io.Serializable;
-
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
 import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.IdType;
 
 /**
  * <p>
@@ -94,6 +94,12 @@ public class IntegrationLog extends Model<IntegrationLog> {
    @TableField("CREATED_DATE_TIME")
    private LocalDateTime createdDateTime;
 
+   @TableField(exist = false)
+   private LocalDateTime startDateTime;
+
+   @TableField(exist = false)
+   private LocalDateTime endDateTime;
+
 
    public String getHandle() {
       return handle;
@@ -207,6 +213,22 @@ public class IntegrationLog extends Model<IntegrationLog> {
       this.createdDateTime = createdDateTime;
    }
 
+   public LocalDateTime getStartDateTime() {
+      return startDateTime;
+   }
+
+   public void setStartDateTime(LocalDateTime startDateTime) {
+      this.startDateTime = startDateTime;
+   }
+
+   public LocalDateTime getEndDateTime() {
+      return endDateTime;
+   }
+
+   public void setEndDateTime(LocalDateTime endDateTime) {
+      this.endDateTime = endDateTime;
+   }
+
    public static final String HANDLE = "HANDLE";
 
    public static final String SITE = "SITE";

integration/src/main/java/com/foreverwin/mesnac/integration/service/IntegrationLogService.java

@@ -3,6 +3,8 @@ package com.foreverwin.mesnac.integration.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.foreverwin.mesnac.integration.model.IntegrationLog;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -14,4 +16,6 @@ import com.foreverwin.mesnac.integration.model.IntegrationLog;
 public interface IntegrationLogService extends IService<IntegrationLog> {
 
     void saveIntegrationLog(IntegrationLog integrationLog);
+
+    List<IntegrationLog> findIntegrationLog(IntegrationLog integration);
 }

integration/src/main/java/com/foreverwin/mesnac/integration/service/impl/IntegrationLogServiceImpl.java

@@ -1,14 +1,17 @@
 package com.foreverwin.mesnac.integration.service.impl;
 
-import com.foreverwin.mesnac.integration.model.IntegrationLog;
-import com.foreverwin.mesnac.integration.mapper.IntegrationLogMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.foreverwin.mesnac.integration.mapper.IntegrationLogMapper;
+import com.foreverwin.mesnac.integration.model.IntegrationLog;
 import com.foreverwin.mesnac.integration.service.IntegrationLogService;
-import org.springframework.stereotype.Service;
+import com.foreverwin.modular.core.util.CommonMethods;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -30,4 +33,11 @@ public class IntegrationLogServiceImpl extends ServiceImpl<IntegrationLogMapper,
     public void saveIntegrationLog(IntegrationLog integrationLog) {
         integrationLogMapper.insert(integrationLog);
     }
+
+    @Override
+    public List<IntegrationLog> findIntegrationLog(IntegrationLog integration) {
+        String site = CommonMethods.getSite();
+        integration.setSite(site);
+        return integrationLogMapper.findIntegrationLog(integration);
+    }
 }

integration/src/main/resources/mapper/IntegrationLogMapper.xml

@@ -462,5 +462,26 @@
         </foreach>)
     </delete>
     <!-- BaseMapper标准查询/修改/删除 -->
-
+    <select id="findIntegrationLog" resultMap="BaseResultMap">
+        SELECT <include refid="Base_Column_List"></include>
+        FROM Z_INTEGRATION_LOG
+        <where>
+            SITE = #{integration.site}
+            <if test="integration.integrationType != null and integration.integrationType != ''">
+                AND INTEGRATION_TYPE = #{integration.integrationType}
+            </if>
+            <if test="integration.integrationWay != null and integration.integrationWay != ''">
+                AND INTEGRATION_WAY = #{integration.integrationWay}
+            </if>
+            <if test="integration.status != null and integration.status != ''">
+                AND STATUS = #{integration.status}
+            </if>
+            <if test="integration.startDateTime != null">
+                AND REQUEST_DATE_TIME &gt;= #{integration.startDateTime}
+            </if>
+            <if test="integration.endDateTime != null">
+                AND REQUEST_DATE_TIME &lt;= #{integration.endDateTime}
+            </if>
+        </where>
+    </select>
 </mapper>