From 0e96e64e353192138d770c2aef62a3175c8aa648 Mon Sep 17 00:00:00 2001
From: tjx <t2856754968@163.com>
Date: 星期四, 04 十二月 2025 16:05:46 +0800
Subject: [PATCH] 11

---
 src/main/java/com/gs/dingtalk/entity/MesAdDataExc.java                  |  135 +++++++++++++++++++++++++++
 src/main/java/com/gs/dingtalk/service/impl/SendDingtalkServiceImpl.java |    6 
 src/main/java/com/gs/dingtalk/service/impl/MesAdDataExcServiceImpl.java |   22 ++++
 src/main/java/com/gs/dingtalk/entity/SendMessage.java                   |   15 +++
 src/main/java/com/gs/dingtalk/service/impl/SendMessageServiceImpl.java  |   22 ++++
 src/main/java/com/gs/dingtalk/service/MesAdDataExcService.java          |   13 ++
 src/main/java/com/gs/dingtalk/mapper/MesAdDataExcMapper.java            |   18 +++
 src/main/resources/application.yml                                      |    2 
 src/main/resources/mapper/MesAdDataExcMapper.xml                        |   40 ++++++++
 src/main/java/com/gs/dingtalk/service/SendMessageService.java           |    4 
 10 files changed, 271 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/gs/dingtalk/entity/MesAdDataExc.java b/src/main/java/com/gs/dingtalk/entity/MesAdDataExc.java
new file mode 100644
index 0000000..2b27435
--- /dev/null
+++ b/src/main/java/com/gs/dingtalk/entity/MesAdDataExc.java
@@ -0,0 +1,135 @@
+package com.gs.dingtalk.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 
+ * @TableName MES_AD_DATA_EXC
+ */
+@TableName(value ="MES_AD_DATA_EXC")
+@Data
+public class MesAdDataExc implements Serializable {
+    /**
+     * 
+     */
+    @TableId
+    private Long id;
+
+    /**
+     * 
+     */
+    private String scallno;
+
+    /**
+     * 
+     */
+    private String snedvalues;
+
+    /**
+     * 
+     */
+    private String errCode;
+
+    /**
+     * 
+     */
+    private String lineNo;
+
+    /**
+     * 
+     */
+    private String procNo;
+
+    /**
+     * 
+     */
+    private String procLine;
+
+    /**
+     * 
+     */
+    private Date recDate;
+
+    /**
+     * 
+     */
+    private String createBy;
+
+    /**
+     * 
+     */
+    private Date createDate;
+
+    /**
+     * 
+     */
+    private String lastupdateBy;
+
+    /**
+     * 
+     */
+    private Date lastupdateDate;
+
+    /**
+     * 
+     */
+    private String memo;
+
+    /**
+     * 
+     */
+    private String fstatus;
+
+    /**
+     * 
+     */
+    private String excBy;
+
+    /**
+     * 
+     */
+    private Date excDate;
+
+    /**
+     * 
+     */
+    private String errMemo;
+
+    /**
+     * 
+     */
+    private String recBy;
+
+    /**
+     * 
+     */
+    private String errExc;
+
+    /**
+     * 
+     */
+    private Long mid;
+
+    /**
+     * 5鍒嗛挓
+     */
+    private Integer fiveMinute;
+
+    /**
+     * 15鍒嗛挓
+     */
+    private Integer fifteenMinute;
+
+    /**
+     * 30鍒嗛挓
+     */
+    private Integer thirtyMinute;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
diff --git a/src/main/java/com/gs/dingtalk/entity/SendMessage.java b/src/main/java/com/gs/dingtalk/entity/SendMessage.java
index 643a962..34eb727 100644
--- a/src/main/java/com/gs/dingtalk/entity/SendMessage.java
+++ b/src/main/java/com/gs/dingtalk/entity/SendMessage.java
@@ -141,4 +141,19 @@
      * (鍒嗛挓)
      */
     private Integer rem;
+
+    /**
+     *
+     */
+    private Integer fiveMinute;
+
+    /**
+     *
+     */
+    private Integer fifteenMinute;
+
+    /**
+     *
+     */
+    private Integer thirtyMinute;
 }
diff --git a/src/main/java/com/gs/dingtalk/mapper/MesAdDataExcMapper.java b/src/main/java/com/gs/dingtalk/mapper/MesAdDataExcMapper.java
new file mode 100644
index 0000000..3fb8b7d
--- /dev/null
+++ b/src/main/java/com/gs/dingtalk/mapper/MesAdDataExcMapper.java
@@ -0,0 +1,18 @@
+package com.gs.dingtalk.mapper;
+
+import com.gs.dingtalk.entity.MesAdDataExc;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author Administrator
+* @description 閽堝琛ㄣ�怣ES_AD_DATA_EXC銆戠殑鏁版嵁搴撴搷浣淢apper
+* @createDate 2025-12-04 15:44:14
+* @Entity com.gs.dingtalk.entity.MesAdDataExc
+*/
+public interface MesAdDataExcMapper extends BaseMapper<MesAdDataExc> {
+
+}
+
+
+
+
diff --git a/src/main/java/com/gs/dingtalk/service/MesAdDataExcService.java b/src/main/java/com/gs/dingtalk/service/MesAdDataExcService.java
new file mode 100644
index 0000000..dece783
--- /dev/null
+++ b/src/main/java/com/gs/dingtalk/service/MesAdDataExcService.java
@@ -0,0 +1,13 @@
+package com.gs.dingtalk.service;
+
+import com.gs.dingtalk.entity.MesAdDataExc;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author Administrator
+* @description 閽堝琛ㄣ�怣ES_AD_DATA_EXC銆戠殑鏁版嵁搴撴搷浣淪ervice
+* @createDate 2025-12-04 15:44:14
+*/
+public interface MesAdDataExcService extends IService<MesAdDataExc> {
+
+}
diff --git a/src/main/java/com/gs/dingtalk/service/SendMessageService.java b/src/main/java/com/gs/dingtalk/service/SendMessageService.java
index 999a58b..8defc94 100644
--- a/src/main/java/com/gs/dingtalk/service/SendMessageService.java
+++ b/src/main/java/com/gs/dingtalk/service/SendMessageService.java
@@ -7,5 +7,7 @@
 
 public interface SendMessageService extends IService<SendMessage> {
 
-    List<SendMessage> getSendMessageList();
+    List<SendMessage> getSendMessageList(int Minutes);
+
+    boolean setSendMessage(Long id,int Minutes);
 }
diff --git a/src/main/java/com/gs/dingtalk/service/impl/MesAdDataExcServiceImpl.java b/src/main/java/com/gs/dingtalk/service/impl/MesAdDataExcServiceImpl.java
new file mode 100644
index 0000000..d8a7971
--- /dev/null
+++ b/src/main/java/com/gs/dingtalk/service/impl/MesAdDataExcServiceImpl.java
@@ -0,0 +1,22 @@
+package com.gs.dingtalk.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gs.dingtalk.entity.MesAdDataExc;
+import com.gs.dingtalk.service.MesAdDataExcService;
+import com.gs.dingtalk.mapper.MesAdDataExcMapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author Administrator
+* @description 閽堝琛ㄣ�怣ES_AD_DATA_EXC銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
+* @createDate 2025-12-04 15:44:14
+*/
+@Service
+public class MesAdDataExcServiceImpl extends ServiceImpl<MesAdDataExcMapper, MesAdDataExc>
+    implements MesAdDataExcService{
+
+}
+
+
+
+
diff --git a/src/main/java/com/gs/dingtalk/service/impl/SendDingtalkServiceImpl.java b/src/main/java/com/gs/dingtalk/service/impl/SendDingtalkServiceImpl.java
index 0659d43..9409e5c 100644
--- a/src/main/java/com/gs/dingtalk/service/impl/SendDingtalkServiceImpl.java
+++ b/src/main/java/com/gs/dingtalk/service/impl/SendDingtalkServiceImpl.java
@@ -104,7 +104,7 @@
 
     @Override
     public void chatSendMessage() throws Exception {
-        List<SendMessage> sendMessageList = sendMessageService.getSendMessageList();
+        List<SendMessage> sendMessageList = sendMessageService.getSendMessageList(0);
 
         sendMessageList.forEach(s -> {
 
@@ -129,7 +129,7 @@
     }
 
     private void getMessage(List<SendDingtalk> list, int Minutes) {
-        List<SendMessage> sendMessageList = sendMessageService.getSendMessageList();
+        List<SendMessage> sendMessageList = sendMessageService.getSendMessageList(Minutes);
 
         sendMessageList.forEach(s -> {
 
@@ -159,6 +159,8 @@
 
             if (dingTalkMessage.getErrcode() == 0) {
                 System.out.println("鍙戦�佹垚鍔�");
+
+                sendMessageService.setSendMessage(s.getId(),Minutes);
             }
         });
     }
diff --git a/src/main/java/com/gs/dingtalk/service/impl/SendMessageServiceImpl.java b/src/main/java/com/gs/dingtalk/service/impl/SendMessageServiceImpl.java
index 3b0f198..49d1299 100644
--- a/src/main/java/com/gs/dingtalk/service/impl/SendMessageServiceImpl.java
+++ b/src/main/java/com/gs/dingtalk/service/impl/SendMessageServiceImpl.java
@@ -1,9 +1,12 @@
 package com.gs.dingtalk.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gs.dingtalk.entity.MesAdDataExc;
 import com.gs.dingtalk.entity.SendMessage;
 import com.gs.dingtalk.mapper.SendMessageMapper;
+import com.gs.dingtalk.service.MesAdDataExcService;
 import com.gs.dingtalk.service.SendMessageService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -16,11 +19,26 @@
 @Transactional(rollbackFor = Exception.class)
 public class SendMessageServiceImpl extends ServiceImpl<SendMessageMapper, SendMessage> implements SendMessageService {
 
+    private final MesAdDataExcService mesAdDataExcService;
 
     @Override
-    public List<SendMessage> getSendMessageList() {
+    public List<SendMessage> getSendMessageList(int Minutes) {
         LambdaQueryWrapper<SendMessage> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(SendMessage::getFstatus, "寰呭鐞�");
+        queryWrapper
+                .eq(SendMessage::getFstatus, "寰呭鐞�")
+                .eq(Minutes == 5,SendMessage::getFiveMinute, 0)
+                .eq(Minutes == 15,SendMessage::getFifteenMinute, 0)
+                .eq(Minutes == 30,SendMessage::getThirtyMinute, 0);
         return list(queryWrapper);
     }
+
+    @Override
+    public boolean setSendMessage(Long id, int Minutes) {
+        LambdaUpdateWrapper<MesAdDataExc> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.set(Minutes == 5, MesAdDataExc::getFiveMinute, 1)
+                .set(Minutes == 15, MesAdDataExc::getFifteenMinute, 1)
+                .set(Minutes == 30, MesAdDataExc::getThirtyMinute, 1)
+                .eq(MesAdDataExc::getId, id);
+        return mesAdDataExcService.update(wrapper);
+    }
 }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 93b2947..ef0a82f 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -5,7 +5,7 @@
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: oracle.jdbc.OracleDriver
-    url: jdbc:oracle:thin:@172.16.0.219:1521/orcl
+    url: jdbc:oracle:thin:@192.168.0.100:1521/orcl
     username: yc_dev
     password: ycdev
     druid:
diff --git a/src/main/resources/mapper/MesAdDataExcMapper.xml b/src/main/resources/mapper/MesAdDataExcMapper.xml
new file mode 100644
index 0000000..d07a109
--- /dev/null
+++ b/src/main/resources/mapper/MesAdDataExcMapper.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gs.dingtalk.mapper.MesAdDataExcMapper">
+
+    <resultMap id="BaseResultMap" type="com.gs.dingtalk.entity.MesAdDataExc">
+            <id property="id" column="ID" />
+            <result property="scallno" column="SCALLNO" />
+            <result property="snedvalues" column="SNEDVALUES" />
+            <result property="errCode" column="ERR_CODE" />
+            <result property="lineNo" column="LINE_NO" />
+            <result property="procNo" column="PROC_NO" />
+            <result property="procLine" column="PROC_LINE" />
+            <result property="recDate" column="REC_DATE" />
+            <result property="createBy" column="CREATE_BY" />
+            <result property="createDate" column="CREATE_DATE" />
+            <result property="lastupdateBy" column="LASTUPDATE_BY" />
+            <result property="lastupdateDate" column="LASTUPDATE_DATE" />
+            <result property="memo" column="MEMO" />
+            <result property="fstatus" column="FSTATUS" />
+            <result property="excBy" column="EXC_BY" />
+            <result property="excDate" column="EXC_DATE" />
+            <result property="errMemo" column="ERR_MEMO" />
+            <result property="recBy" column="REC_BY" />
+            <result property="errExc" column="ERR_EXC" />
+            <result property="mid" column="MID" />
+            <result property="fiveMinute" column="FIVE_MINUTE" />
+            <result property="fifteenMinute" column="FIFTEEN_MINUTE" />
+            <result property="thirtyMinute" column="THIRTY_MINUTE" />
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        ID,SCALLNO,SNEDVALUES,ERR_CODE,LINE_NO,PROC_NO,
+        PROC_LINE,REC_DATE,CREATE_BY,CREATE_DATE,LASTUPDATE_BY,
+        LASTUPDATE_DATE,MEMO,FSTATUS,EXC_BY,EXC_DATE,
+        ERR_MEMO,REC_BY,ERR_EXC,MID,FIVE_MINUTE,
+        FIFTEEN_MINUTE,THIRTY_MINUTE
+    </sql>
+</mapper>

--
Gitblit v1.9.3