Merge branch 'feature_longhu' of http://git.meloinfo.com/wangwei/interface_platform into feature_longhu

src/main/java/com/hr/controller/IpAccountController.java

@@ -1,5 +1,6 @@
 package com.hr.controller;
 
+import com.github.pagehelper.PageInfo;
 import com.hr.param.IpAccountParam;
 import com.hr.param.SwitchStatusParam;
 import com.hr.service.IpAccountService;
@@ -35,8 +36,8 @@ public class IpAccountController{
     @Operation(summary = "分页查询")
     @GetMapping("/list")
     public BasePageResult<IpAccountVO> paginQuery(IpAccountParam ipAccountParam){
-        Page<IpAccountVO> ipAccountPOS = ipAccountService.paginQuery(ipAccountParam, ipAccountParam.getPageNum(), ipAccountParam.getPageSize());
-        return BasePageResult.success(ipAccountPOS.getContent(), ipAccountPOS.getTotalElements(), ipAccountParam.getPageNum(), ipAccountParam.getPageSize());
+        BasePageResult<IpAccountVO> ipAccountPOS = ipAccountService.paginQuery(ipAccountParam, ipAccountParam.getPageNum(), ipAccountParam.getPageSize());
+        return ipAccountPOS;
     }
     
     /** 

src/main/java/com/hr/controller/IpInterfaceController.java

@@ -44,8 +44,8 @@ public class IpInterfaceController {
     @Operation(summary = "分页查询")
     @GetMapping("/list")
     public BasePageResult<IpInterfaceVO> paginQuery(IpInterfaceParam ipInterfaceParam){
-        PageInfo<IpInterfaceVO> ipAccountPOS = ipInterfaceService.paginQuery(ipInterfaceParam, ipInterfaceParam.getPageNum(), ipInterfaceParam.getPageSize());
-        return BasePageResult.success(ipAccountPOS.getList(), ipAccountPOS.getTotal(), ipInterfaceParam.getPageNum(), ipInterfaceParam.getPageSize());
+        BasePageResult<IpInterfaceVO> ipAccountPOS = ipInterfaceService.paginQuery(ipInterfaceParam, ipInterfaceParam.getPageNum(), ipInterfaceParam.getPageSize());
+        return ipAccountPOS;
     }
     
     /** 
@@ -140,8 +140,8 @@ public class IpInterfaceController {
     @Operation(summary = "查询账号下关联的接口列表")
     @PostMapping("/account/ref/list")
     public BasePageResult<AccountInterfaceVO> accountInterfaceList(@RequestBody AccountInterfaceParam pageParam){
-        Page<AccountInterfaceVO> result = ipTokenInterfaceService.accountInterfaceList(pageParam);
-        return BasePageResult.success(result.getContent(), result.getTotalElements(), pageParam.getPageNum(), pageParam.getPageSize());
+        BasePageResult<AccountInterfaceVO> result = ipTokenInterfaceService.accountInterfaceList(pageParam);
+        return result;
     }
 
     /**

src/main/java/com/hr/dto/IpAccountDto.java

@@ -2,7 +2,6 @@ package com.hr.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.Date;
 import lombok.Data;
 
@@ -28,11 +27,11 @@ public class IpAccountDto {
 
     /** 创建时间 */
     @Schema(description = "创建时间")
-	private LocalDateTime addTime ;
+	private Date addTime ;
 
     /** 更新时间 */
     @Schema(description = "更新时间")
-	private LocalDateTime updateTime ;
+	private Date updateTime ;
 
     /** 创建人id */
     private Long addUserId ;

src/main/java/com/hr/dto/IpInterfaceDto.java

@@ -1,11 +1,10 @@
 package com.hr.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
 import lombok.Data;
 
+import java.util.Date;
+
 @Schema(description = "接口表")
 @Data
 public class IpInterfaceDto {
@@ -40,11 +39,11 @@ public class IpInterfaceDto {
 
     /** 创建时间,; */
     @Schema(description = "创建时间")
-	private LocalDateTime addTime ;
+	private Date addTime ;
 
     /** 更新时间,; */
     @Schema(description = "更新时间")
-	private LocalDateTime updateTime ;
+	private Date updateTime ;
 
     /** 创建人id,; */
     private Long addUserId ;

src/main/java/com/hr/externelSystem/AiwenIpService.java

@@ -8,26 +8,23 @@ import com.hr.dto.ApiLogDto;
 import com.hr.param.AiwenParam;
 import com.hr.repository.domain.IpInterfacePO;
 import com.hr.repository.domain.IpOrderPO;
-import com.hr.repository.domain.IpTokenInterfacePO;
 import com.hr.service.FeishuMsgSendService;
-import com.hr.util.HttpUtils;
 import com.hr.vo.AiwenParseIpInfoVO;
 import com.hr.vo.CallbackResponseVO;
 import com.hr.vo.ServiceTypeVO;
 import com.yy.basedevelop.common.http.config.RedisService;
 import com.yy.basedevelop.common.util.HttpClientUtils;
 import com.yy.basedevelop.common.util.RedisUtil;
+import com.yy.basedevelop.common.util.ruoyi.utils.DateUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -117,11 +114,11 @@ public class AiwenIpService implements BizHandler<AiwenParam,AiwenParseIpInfoVO>
                 ValueOperations<String, Object> valueOps = redisService.redisTemplate.opsForValue();
 
 
-                LocalDateTime now = LocalDateTime.now();
+                Date now = new Date();
                 // 定义时间格式
                 DateTimeFormatter formattertime = DateTimeFormatter.ofPattern("HH:mm:ss");
                 // 格式化当前时间
-                String formattedTime = now.format(formattertime);
+                String formattedTime = DateUtils.parseDateToStr("HH:mm:ss", now);
                 String curCallIpKey=AiwenCallRedisKey+":"+curday;
                 String yestCallIpKey=AiwenCallRedisKey+":"+yesterday;
 
@@ -247,9 +244,8 @@ public class AiwenIpService implements BizHandler<AiwenParam,AiwenParseIpInfoVO>
      * @return 昨天日期字符串
      */
     public static String getYesterday() {
-        LocalDate yesterday = LocalDate.now().minusDays(1);
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
-        return yesterday.format(formatter);
+        Date date = DateUtils.addDays(new Date(),-1);
+        return DateUtils.parseDateToStr("yyyyMMdd", date);
     }
 
     /**
@@ -257,8 +253,6 @@ public class AiwenIpService implements BizHandler<AiwenParam,AiwenParseIpInfoVO>
      * @return 当前日期字符串
      */
     public static String getCurrentDate() {
-        LocalDate today = LocalDate.now();
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
-        return today.format(formatter);
+        return DateUtils.parseDateToStr("yyyyMMdd", new Date());
     }
 }

src/main/java/com/hr/externelSystem/BizHandlerFactory.java

@@ -16,11 +16,10 @@ import com.yy.basedevelop.common.util.ruoyi.exception.ServiceException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpStatus;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.List;
 
 @Component
@@ -77,11 +76,11 @@ public class BizHandlerFactory {
                 ipLogPO.setStatus("fail");
             }
             ipOrderPO.setIid(ipInterfacePO.getId());
-            ipOrderPO.setUpdateTime(LocalDateTime.now());
+            ipOrderPO.setUpdateTime(new Date());
             ipOrderPO.setBusinessNo(logDto.getBusinessNo());
             ipLogPO.setUrl(logDto.getUrl());
             ipLogPO.setRequestParam(logDto.getRequestParam());
-            ipLogPO.setUpdateTime(LocalDateTime.now());
+            ipLogPO.setUpdateTime(new Date());
             ipLogPO.setResponseResult(logDto.getResponseParam());
             ipLogPO.setHttpStatus(logDto.getHttpStatus());
             ipLogPO.setMsg(logDto.getErrorMessage());
@@ -105,18 +104,18 @@ public class BizHandlerFactory {
         ipOrderPO.setIsCallback(ipTokenInterfacePO.getIsCallback());
         ipOrderPO.setCallbackNum(ipTokenInterfacePO.getCallbackNum());
         ipOrderPO.setCallbackUrl(ipTokenInterfacePO.getCallbackUrl());
-        ipOrderPO.setAddTime(LocalDateTime.now());
+        ipOrderPO.setAddTime(new Date());
         ipOrderPO.setManufacturer(ipInterfacePO.getManufacturer());
 
 
         ipLogPO.setId(SnowflakeIdWorker.nextId());
         ipLogPO.setOid(ipOrderPO.getId());
-        ipLogPO.setAddTime(LocalDateTime.now());
+        ipLogPO.setAddTime(new Date());
         ipLogPO.setExecuteType("request");
         ipLogPO.setStatus("handle");
     }
 
-    private void wrapCallBackOrder(IpOrderPO ipOrder, CallbackResponseVO callback, LocalDateTime callDateTime, JSONObject json) {
+    private void wrapCallBackOrder(IpOrderPO ipOrder, CallbackResponseVO callback, Date callDateTime, JSONObject json) {
         IpLogPO ipLog = new IpLogPO();
         IpOrderPO ipOrderPO = new IpOrderPO();
         ipOrderPO.setId(SnowflakeIdWorker.nextId());
@@ -126,7 +125,7 @@ public class BizHandlerFactory {
         ipOrderPO.setRefId(ipOrder.getId());
         ipOrderPO.setCallbackUrl(ipOrder.getCallbackUrl());
         ipOrderPO.setAddTime(callDateTime);
-        ipOrderPO.setUpdateTime(LocalDateTime.now());
+        ipOrderPO.setUpdateTime(new Date());
         ipOrderPO.setManufacturer(ipOrder.getManufacturer());
         ipOrderPO.setStatus(callback.getStatus() ? "success" : "fail");
         ipOrderPO.setCallbackStatus(callback.getStatus() ? "success" : "fail");
@@ -137,7 +136,7 @@ public class BizHandlerFactory {
         ipLog.setRequestParam(json.toJSONString());
         ipLog.setExecuteType("callback");
         ipLog.setStatus(callback.getStatus() ? "success" : "fail");
-        ipLog.setUpdateTime(LocalDateTime.now());
+        ipLog.setUpdateTime(new Date());
         ipLog.setResponseResult(callback.getResponseParam());
         ipOrderRepository.save(ipOrderPO);
         ipLogRepository.save(ipLog);
@@ -164,7 +163,7 @@ public class BizHandlerFactory {
         Boolean callbackResult = false;
         ipOrderPO.setCallbackStatus("handle");
         for (int i = 0; i < ipOrderPO.getCallbackNum(); i++) {
-            LocalDateTime callDateTime = LocalDateTime.now();
+            Date callDateTime = new Date();
             CallbackResponseVO result = handler.doCallBack(ipOrderPO, json);
             // 记录调用记录
             wrapCallBackOrder(ipOrderPO,result,callDateTime,json);

src/main/java/com/hr/param/IpAccountParam.java

@@ -3,7 +3,10 @@ package com.hr.param;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
- /**
+import java.util.Arrays;
+import java.util.List;
+
+/**
  * 账户表;IpAccount数据表的PO对象
  * @author : longhoo
  * @date : 2025-10-10
@@ -19,5 +22,6 @@ public class IpAccountParam extends PageParam{
     private String remark ;
     @Schema(description = "状态,normal 有效，disable 禁用，delete 删除")
     private String status ;
+    private List<String> statusList = Arrays.asList("normal", "disable");
 
 }

src/main/java/com/hr/param/IpInterfaceParam.java

@@ -1,15 +1,8 @@
 package com.hr.param;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.media.SchemaProperty;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
 import lombok.Data;
-import org.hibernate.query.Page;
 
-import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
@@ -38,9 +31,9 @@ public class IpInterfaceParam extends PageParam {
     @Schema(description = "接口配置,JSON格式的配置文件，存放接口参数")
     private String interfaceConfig;
     @Schema(description = "创建时间")
-    private LocalDateTime addTime;
+    private Date addTime;
     @Schema(description = "更新时间")
-    private LocalDateTime updateTime;
+    private Date updateTime;
     @Schema(description = "创建人id")
     private Long addUserId;
     @Schema(description = "更新人id")

src/main/java/com/hr/repository/domain/IpAccountPO.java

@@ -1,12 +1,13 @@
 package com.hr.repository.domain;
 
-import jakarta.persistence.*;
-import lombok.Data;
 import io.swagger.v3.oas.annotations.media.Schema;
-import java.io.Serializable;
-import java.time.LocalDateTime;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import lombok.Data;
+
 import java.util.Date;
-import org.springframework.web.bind.annotation.ModelAttribute;
 
 
 @Schema(description = "账户表")
@@ -37,12 +38,12 @@ public class IpAccountPO {
     /** 创建时间 */
     @Column(name = "add_time")
     @Schema(description = "创建时间")
-	private LocalDateTime addTime ;
+	private Date addTime ;
 
     /** 更新时间 */
     @Column(name = "update_time")
     @Schema(description = "更新时间")
-	private LocalDateTime updateTime ;
+	private Date updateTime ;
 
     /** 创建人id */
     @Column(name = "add_user_id")

src/main/java/com/hr/repository/domain/IpInterfacePO.java

@@ -6,8 +6,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
-import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.Date;
 
 
@@ -55,12 +53,12 @@ public class IpInterfacePO {
     /** 创建时间,; */
     @Column(name="add_time")
     @Schema(description = "创建时间")
-	private LocalDateTime addTime ;
+	private Date addTime ;
 
     /** 更新时间,; */
     @Column(name="update_time")
     @Schema(description = "更新时间")
-	private LocalDateTime updateTime ;
+	private Date updateTime ;
 
     /** 创建人id,; */
     @Column(name="add_user_id")

src/main/java/com/hr/repository/domain/IpLogPO.java

@@ -6,8 +6,8 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
-import java.io.Serializable;
-import java.time.LocalDateTime;
+
+import java.util.Date;
 
 
 @Schema(description = "接口日志表")
@@ -77,12 +77,12 @@ public class IpLogPO {
     /** 创建时间,; */
     @Column(name="add_time")
     @Schema(description = "创建时间")
-	private LocalDateTime addTime ;
+	private Date addTime ;
 
     /** 更新时间,; */
     @Column(name="update_time")
     @Schema(description = "更新时间")
-	private LocalDateTime updateTime ;
+	private Date updateTime ;
 
     /** 创建人id,; */
     @Column(name="add_user_id")

src/main/java/com/hr/repository/domain/IpOrderPO.java

@@ -6,8 +6,8 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
-import java.io.Serializable;
-import java.time.LocalDateTime;
+
+import java.util.Date;
 
 
 @Schema(description = "调用记录表")
@@ -103,14 +103,14 @@ public class IpOrderPO {
      */
     @Column(name = "add_time")
     @Schema(description = "创建时间")
-	private LocalDateTime addTime;
+	private Date addTime;
 
     /**
      * 更新时间,;
      */
     @Column(name = "update_time")
     @Schema(description = "更新时间")
-	private LocalDateTime updateTime;
+	private Date updateTime;
 
     /**
      * 创建人id,;

src/main/java/com/hr/repository/domain/IpTokenInterfacePO.java

@@ -6,8 +6,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
-import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.Date;
 
 
@@ -51,12 +49,12 @@ public class IpTokenInterfacePO {
     /** 创建时间,; */
     @Column(name = "add_time")
     @Schema(description = "创建时间")
-	private LocalDateTime addTime ;
+	private Date addTime ;
 
     /** 更新时间,; */
     @Column(name = "update_time")
     @Schema(description = "更新时间")
-	private LocalDateTime updateTime ;
+	private Date updateTime ;
 
     /** 创建人id,; */
     @Column(name = "add_user_id")

src/main/java/com/hr/repository/domain/IpTokenPO.java

@@ -7,7 +7,6 @@ import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.Date;
 
 
@@ -48,12 +47,12 @@ public class IpTokenPO {
     /** 创建时间,; */
     @Column(name = "add_time")
     @Schema(description = "创建时间")
-	private LocalDateTime addTime ;
+	private Date addTime ;
 
     /** 更新时间,; */
     @Column(name = "update_time")
     @Schema(description = "更新时间")
-	private LocalDateTime updateTime ;
+	private Date updateTime ;
 
     /** 创建人id,; */
     @Column(name = "add_user_id")

src/main/java/com/hr/repository/jpa/IpAccountRepository.java

@@ -2,9 +2,13 @@ package com.hr.repository.jpa;
 
 import com.hr.param.IpAccountParam;
 import com.hr.repository.domain.IpAccountPO;
+import com.hr.vo.IpAccountVO;
+import com.yy.basedevelop.common.data.BasePageResult;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
 
@@ -19,4 +23,6 @@ public interface IpAccountRepository extends JpaRepository<IpAccountPO, Long> ,
     IpAccountPO queryById(Long aid);
 
     IpAccountPO findByAccNo(String accNo);
+
+    BasePageResult<IpAccountVO> queryList(@Param("accNo") String accNo, @Param("statusList") List<String> statusList);
 }

src/main/java/com/hr/repository/jpa/IpInterfaceRepository.java

@@ -3,6 +3,7 @@ package com.hr.repository.jpa;
 import com.hr.param.IpInterfaceParam;
 import com.hr.repository.domain.IpInterfacePO;
 import com.hr.vo.IpInterfaceVO;
+import com.yy.basedevelop.common.data.BasePageResult;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -22,5 +23,6 @@ public interface IpInterfaceRepository extends JpaRepository<IpInterfacePO,Long>
     IpInterfacePO findByInterfaceName(String interfaceName);
     IpInterfacePO findByInterfaceNo(String interfaceNo);
 
-    List<IpInterfaceVO> queryPage(IpInterfaceParam interfaceParam);
+    BasePageResult<IpInterfaceVO> queryPage(@Param("interfaceName") String interfaceName, @Param("statusList") List<String> statusList);
+
 }

src/main/java/com/hr/repository/jpa/IpTokenInterfaceRepository.java

@@ -1,6 +1,9 @@
 package com.hr.repository.jpa;
 
 import com.hr.repository.domain.IpTokenInterfacePO;
+import com.yy.basedevelop.common.data.BasePageResult;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;
@@ -13,4 +16,6 @@ import java.util.List;
 public interface IpTokenInterfaceRepository extends JpaRepository<IpTokenInterfacePO,Long> {
 
     IpTokenInterfacePO findByAidAndIid(Long aid, Long iid);
+
+    BasePageResult<IpTokenInterfacePO> queryList(@Param("aid") Long aid, @Param("statusList") List<String> statusList);
 }

src/main/java/com/hr/service/FeishuMsgSendService.java

@@ -25,8 +25,8 @@ import java.io.StringWriter;
 import java.nio.charset.StandardCharsets;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
-import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -266,11 +266,11 @@ public class FeishuMsgSendService {
             if(!profilemap.containsKey(proFile.toLowerCase())){
                 return;
             }
-            LocalDateTime now = LocalDateTime.now();
+            Date now = new Date();
             // 定义时间格式
             DateTimeFormatter formattertime = DateTimeFormatter.ofPattern("HH:mm:ss");
             // 格式化当前时间
-            String formattedTime = now.format(formattertime);
+            String formattedTime = DateUtils.parseDateToStr("HH:mm:ss", now);
             HttpClient httpclient = HttpClients.createDefault();
             String WEBHOOK_TOKEN = "https://open.feishu.cn/open-apis/bot/v2/hook/" + accessToken_ReleaseRobot;
 
@@ -307,52 +307,6 @@ public class FeishuMsgSendService {
 
 
 
-    public static void dealFeishuMsgSendStartReleaseNotify(String proFile,String name,String ipname) {
-        try {
-//            String proFile = environment.getActiveProfiles()[0];
-//            if (proFile.indexOf("prod")>=0) {
-            //对于没有包含在定义中的则不会发消息
-            if(!profilemap.containsKey(proFile.toLowerCase())){
-                return;
-            }
-            LocalDateTime now = LocalDateTime.now();
-            // 定义时间格式
-            DateTimeFormatter formattertime = DateTimeFormatter.ofPattern("HH:mm:ss");
-            // 格式化当前时间
-            String formattedTime = now.format(formattertime);
-            HttpClient httpclient = HttpClients.createDefault();
-            String WEBHOOK_TOKEN = "https://open.feishu.cn/open-apis/bot/v2/hook/" + accessToken_ReleaseRobot;
-
-            String msg = "[开始发版]["+ name +"]["+ proFile +"]"+caseParm2Name(ipname,name,proFile)+",当前时间"+formattedTime ;
-            long timestamp = System.currentTimeMillis() / 1000;
-            String sign = generateSign(accessToken_ReleaseRobotSec, timestamp);
-
-            // 构建消息体
-            Map<String, Object> content = new HashMap<>();
-            content.put("text", msg);
-
-            Map<String, Object> payload = new HashMap<>();
-            payload.put("timestamp", timestamp);
-            payload.put("sign", sign);
-            payload.put("msg_type", "text");
-            payload.put("content", content);
-
-            // 发送请求
-            HttpPost httpPost = new HttpPost(WEBHOOK_TOKEN);
-            httpPost.setHeader("Content-Type", "application/json; charset=utf-8");
-            httpPost.setEntity(new StringEntity(JSON.toJSONString(payload), StandardCharsets.UTF_8));
-
-            HttpResponse response = httpclient.execute(httpPost);
-
-            if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
-                String result = EntityUtils.toString(response.getEntity(), "utf-8");
-                log.info("【开始发版发送飞书群消息发版】消息响应结果：" + JSON.toJSONString(result));
-            }
-
-        } catch (Exception e) {
-            log.error("【开始发版发送飞书群消息发版】error：" + e.getMessage(), e);
-        }
-    }
 
     private static String caseParm2Name(String ipname,String appname,String proFile){
         StringBuffer sb = new StringBuffer();

src/main/java/com/hr/service/IpAccountService.java

@@ -1,10 +1,12 @@
 package com.hr.service;
 
 
+import com.github.pagehelper.PageInfo;
 import com.hr.param.IpAccountParam;
 import com.hr.param.SwitchStatusParam;
 import com.hr.repository.domain.IpAccountPO;
 import com.hr.vo.IpAccountVO;
+import com.yy.basedevelop.common.data.BasePageResult;
 import com.yy.basedevelop.dto.LoginUser;
 import org.springframework.data.domain.Page;
 
@@ -31,7 +33,7 @@ public interface IpAccountService{
      * @param size  每页大小
      * @return
      */
-    Page<IpAccountVO> paginQuery(IpAccountParam ipAccountParam, Integer current, Integer size);
+    BasePageResult<IpAccountVO> paginQuery(IpAccountParam ipAccountParam, Integer current, Integer size);
     /** 
      * 新增数据
      *

src/main/java/com/hr/service/IpInterfaceService.java

@@ -7,6 +7,7 @@ import com.hr.param.SwitchStatusParam;
 import com.hr.repository.domain.IpInterfacePO;
 import com.hr.vo.IpInterfaceVO;
 import com.hr.vo.NameValueVO;
+import com.yy.basedevelop.common.data.BasePageResult;
 import org.springframework.data.domain.Page;
 
 import java.util.List;
@@ -34,7 +35,7 @@ public interface IpInterfaceService{
      * @param size  每页大小
      * @return
      */
-    PageInfo<IpInterfaceVO> paginQuery(IpInterfaceParam interfaceParam, Integer current, Integer size);
+    BasePageResult<IpInterfaceVO> paginQuery(IpInterfaceParam interfaceParam, Integer current, Integer size);
     /** 
      * 新增数据
      *

src/main/java/com/hr/service/IpTokenInterfaceService.java

@@ -1,5 +1,6 @@
 package com.hr.service;
 
+import com.github.pagehelper.PageInfo;
 import com.hr.dto.AggregateQueryDTO;
 import com.hr.param.AccountInterfaceParam;
 import com.hr.param.InterfaceConfigParam;
@@ -7,6 +8,7 @@ import com.hr.param.SwitchStatusParam;
 import com.hr.repository.domain.IpTokenInterfacePO;
 import com.hr.vo.AccountInterfaceVO;
 import com.hr.vo.IpTokenInterfaceVO;
+import com.yy.basedevelop.common.data.BasePageResult;
 import com.yy.basedevelop.dto.LoginUser;
 import org.springframework.data.domain.Page;
 
@@ -62,7 +64,7 @@ public interface IpTokenInterfaceService{
 
     AggregateQueryDTO queryConfigByInterfaceCodeAndAccountNo(Long  accoutId, Long interfaceId);
 
-    Page<AccountInterfaceVO> accountInterfaceList(AccountInterfaceParam pageParam);
+    BasePageResult<AccountInterfaceVO> accountInterfaceList(AccountInterfaceParam pageParam);
 
     Boolean switchStatus(SwitchStatusParam switchStatusParam);
 

src/main/java/com/hr/service/impl/IpAccountServiceImpl.java

@@ -1,9 +1,10 @@
 package com.hr.service.impl;
 
 
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
-import com.hr.dto.AggregateQueryDTO;
 import com.hr.param.IpAccountParam;
 import com.hr.param.SwitchStatusParam;
 import com.hr.repository.domain.IpAccountPO;
@@ -11,16 +12,15 @@ import com.hr.repository.jpa.IpAccountRepository;
 import com.hr.service.IpAccountService;
 import com.hr.util.SnowflakeIdWorker;
 import com.hr.vo.IpAccountVO;
+import com.yy.basedevelop.common.data.BasePageResult;
 import com.yy.basedevelop.dto.LoginUser;
-import jakarta.persistence.criteria.Predicate;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.*;
-import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 
-import java.time.LocalDateTime;
-import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
@@ -56,36 +56,13 @@ public class IpAccountServiceImpl implements IpAccountService {
     }
 
     @Override
-    public Page<IpAccountVO> paginQuery(IpAccountParam ipAccountParam, Integer current, Integer size) {
-        IpAccountPO ipAccountPO = new IpAccountPO();
-        BeanUtils.copyProperties(ipAccountParam, ipAccountPO);
-        Pageable pageAble = PageRequest.of(current -1, size);
-        Specification<IpAccountPO> spec = (root, query, cb) -> {
-
-            List<Predicate> predicates = new ArrayList<>();
-            if (ipAccountParam.getAccNo() != null) {
-                predicates.add(cb.like(root.get("accNo"), "%" + ipAccountParam.getAccNo() + "%"));
-            }
-            if(ipAccountParam.getStatus() != null){
-                predicates.add(cb.equal(root.get("status"), ipAccountParam.getStatus()));
-            }else{
-                predicates.add(cb.notLike(root.get("status"), "delete"));
-            }
-
-            return cb.and(predicates.toArray(new Predicate[0]));
-        };
-
-        Page<IpAccountPO> page = ipAccountRepository.findAll(spec, pageAble);
-        List<IpAccountVO> resultList = new ArrayList<>();
-
-        page.getContent().forEach(item -> {
-            IpAccountVO vo = new IpAccountVO();
-            BeanUtils.copyProperties(item, vo);
-            resultList.add(vo);
-        });
-        Page<IpAccountVO> resultPage = new PageImpl(resultList);
-        BeanUtils.copyProperties(page, resultPage);
-        return resultPage;
+    public BasePageResult<IpAccountVO> paginQuery(IpAccountParam ipAccountParam, Integer current, Integer size) {
+        if (StringUtils.isNotEmpty(ipAccountParam.getStatus())) {
+            ipAccountParam.setStatusList(Arrays.asList(ipAccountParam.getStatus()));
+        }
+        PageHelper.startPage(current, size);
+        BasePageResult<IpAccountVO> resultList = ipAccountRepository.queryList(ipAccountParam.getAccNo(),ipAccountParam.getStatusList());
+        return resultList;
     }
     
     /** 
@@ -132,7 +109,7 @@ public class IpAccountServiceImpl implements IpAccountService {
             throw new RuntimeException("接口不存在");
         }
         IpAccountPO ipAccountPO = optional.get();
-        ipAccountPO.setUpdateTime(LocalDateTime.now());
+        ipAccountPO.setUpdateTime(new Date());
         ipAccountPO.setUpdateUserId(user.getUserid());
         ipAccountPO.setUpdateUserName(user.getUsername());
         ipAccountPO.setStatus(switchStatusParam.getStatus());
@@ -156,12 +133,13 @@ public class IpAccountServiceImpl implements IpAccountService {
         }
         if(accountParam.getId() == null){
             ipAccountPO.setId(SnowflakeIdWorker.nextId());
-            ipAccountPO.setAddTime(LocalDateTime.now());
+            ipAccountPO.setAddTime(new Date());
             ipAccountPO.setAddUserId(userId);
             ipAccountPO.setAddUserName(userName);
         }
+        ipAccountPO.setStatus(accountParam.getStatus());
         ipAccountPO.setRemark(accountParam.getRemark());
-        ipAccountPO.setUpdateTime(LocalDateTime.now());
+        ipAccountPO.setUpdateTime(new Date());
         ipAccountPO.setUpdateUserId(userId);
         ipAccountPO.setUpdateUserName(userName);
         ipAccountRepository.save(ipAccountPO);
@@ -178,7 +156,7 @@ public class IpAccountServiceImpl implements IpAccountService {
     public boolean deleteById(Long id, LoginUser user){
         IpAccountPO ipAccountPO = ipAccountRepository.findById(id).get();
         ipAccountPO.setStatus("delete");
-        ipAccountPO.setUpdateTime(LocalDateTime.now());
+        ipAccountPO.setUpdateTime(new Date());
         ipAccountPO.setUpdateUserId(user.getUserid());
         ipAccountPO.setUpdateUserName(user.getUsername());
         ipAccountRepository.save(ipAccountPO);

src/main/java/com/hr/service/impl/IpInterfaceServiceImpl.java

@@ -11,21 +11,15 @@ import com.hr.repository.domain.IpInterfacePO;
 import com.hr.repository.jpa.IpInterfaceRepository;
 import com.hr.service.IpInterfaceService;
 import com.hr.util.SnowflakeIdWorker;
-import com.hr.vo.IpAccountVO;
 import com.hr.vo.IpInterfaceVO;
 import com.hr.vo.NameValueVO;
+import com.yy.basedevelop.common.data.BasePageResult;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.*;
-import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
@@ -64,13 +58,13 @@ public class IpInterfaceServiceImpl implements IpInterfaceService {
     }
 
      @Override
-     public PageInfo<IpInterfaceVO> paginQuery(IpInterfaceParam interfaceParam, Integer current, Integer size) {
+     public BasePageResult<IpInterfaceVO> paginQuery(IpInterfaceParam interfaceParam, Integer current, Integer size) {
          PageHelper.startPage(interfaceParam.getPageNum(), interfaceParam.getPageSize());
          if (StringUtils.isNotEmpty(interfaceParam.getStatus())) {
              interfaceParam.setStatusList(Arrays.asList(interfaceParam.getStatus()));
          }
-         List<IpInterfaceVO> dbList = ipInterfaceRepository.queryPage(interfaceParam);
-         return PageInfo.of(dbList);
+         BasePageResult<IpInterfaceVO> dbList = ipInterfaceRepository.queryPage(interfaceParam.getInterfaceName(), interfaceParam.getStatusList());
+         return dbList;
      }
 
      /**
@@ -154,23 +148,24 @@ public class IpInterfaceServiceImpl implements IpInterfaceService {
             ipInterfacePO = new IpInterfacePO();
         }else{
             ipInterfacePO = ipInterfaceRepository.findByInterfaceName(ipInterfaceParam.getInterfaceName());
-            if(ipInterfaceParam != null && ipInterfacePO.getInterfaceName().equals(ipInterfaceParam.getInterfaceName()) && !ipInterfacePO.getId().equals(ipInterfaceParam.getId())){
+            if(ipInterfacePO != null && ipInterfacePO.getInterfaceName().equals(ipInterfaceParam.getInterfaceName()) && !ipInterfacePO.getId().equals(ipInterfaceParam.getId())){
                 throw new RuntimeException("接口名称已存在");
             }
             ipInterfacePO = ipInterfaceRepository.findByInterfaceNo(ipInterfaceParam.getInterfaceNo());
-            if(ipInterfaceParam != null && ipInterfacePO.getInterfaceNo().equals(ipInterfaceParam.getInterfaceNo()) && !ipInterfacePO.getId().equals(ipInterfaceParam.getId())){
+            if(ipInterfacePO != null && ipInterfacePO.getInterfaceNo().equals(ipInterfaceParam.getInterfaceNo()) && !ipInterfacePO.getId().equals(ipInterfaceParam.getId())){
                 throw new RuntimeException("接口编号已存在");
             }
         }
-
-        com.yy.basedevelop.common.BeanUtils.copyPropertiesIgnoreNullAndEmptyStr(ipInterfaceParam, ipInterfacePO);
         if(ipInterfaceParam.getId() == null){
             ipInterfacePO.setId(SnowflakeIdWorker.nextId());
-            ipInterfacePO.setAddTime(LocalDateTime.now());
+            ipInterfacePO.setAddTime(new Date());
             ipInterfacePO.setAddUserId(userid);
             ipInterfacePO.setAddUserName(username);
+        }else{
+            ipInterfacePO = ipInterfaceRepository.findById(ipInterfaceParam.getId()).get();
         }
-        ipInterfacePO.setUpdateTime(LocalDateTime.now());
+        com.yy.basedevelop.common.BeanUtils.copyPropertiesIgnoreNullAndEmptyStr(ipInterfaceParam, ipInterfacePO);
+        ipInterfacePO.setUpdateTime(new Date());
         ipInterfacePO.setUpdateUserId(userid);
         ipInterfacePO.setUpdateUserName(username);
         ipInterfaceRepository.save(ipInterfacePO);

src/main/java/com/hr/service/impl/IpTokenInterfaceServiceImpl.java

@@ -1,6 +1,8 @@
 package com.hr.service.impl;
 
 import com.fasterxml.jackson.module.paramnames.ParameterNamesModule;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import com.hr.dto.AggregateQueryDTO;
@@ -21,6 +23,8 @@ import com.hr.util.SnowflakeIdWorker;
 import com.hr.vo.AccountInterfaceVO;
 import com.hr.vo.IpAccountVO;
 import com.hr.vo.IpTokenInterfaceVO;
+import com.yy.basedevelop.common.data.BasePageResult;
+import com.yy.basedevelop.common.util.ruoyi.utils.DateUtils;
 import com.yy.basedevelop.dto.LoginUser;
 import jakarta.persistence.criteria.Predicate;
 import org.apache.commons.lang3.StringUtils;
@@ -30,7 +34,6 @@ import org.springframework.data.domain.*;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 
-import java.time.LocalDateTime;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -121,26 +124,19 @@ public class IpTokenInterfaceServiceImpl implements IpTokenInterfaceService {
     }
 
     @Override
-    public Page<AccountInterfaceVO> accountInterfaceList(AccountInterfaceParam pageParam) {
+    public BasePageResult<AccountInterfaceVO> accountInterfaceList(AccountInterfaceParam pageParam) {
         if(!StringUtils.isEmpty(pageParam.getAccNo())){
             IpAccountPO accountPO = ipAccountRepository.findByAccNo(pageParam.getAccNo());
             if(accountPO != null){
                 pageParam.setAid(accountPO.getId());
             }
         }
-        ExampleMatcher matcher = ExampleMatcher.matchingAll()
-                .withIgnoreNullValues()                              // 忽略 null 字段
-                .withMatcher("aid", ExampleMatcher.GenericPropertyMatchers.exact())
-                .withMatcher("status", ExampleMatcher.GenericPropertyMatchers.exact())
-                .withIgnoreCase();
-        IpTokenInterfacePO po = new IpTokenInterfacePO();
-        po.setStatus(pageParam.getStatus());
-        po.setAid(pageParam.getAid());
-        Pageable pageAble = PageRequest.of(pageParam.getPageNum() -1, pageParam.getPageSize());
-        Example<IpTokenInterfacePO> example = Example.of(po, matcher);
-        Page<IpTokenInterfacePO> result = ipTokenInterfaceRepository.findAll(example, pageAble);
-        List<IpTokenInterfacePO> content = result.getContent();
-
+        List<String> statusList = Arrays.asList("normal", "disable");
+        if(StringUtils.isNotEmpty(pageParam.getStatus())){
+            statusList = Arrays.asList(pageParam.getStatus());
+        }
+        PageHelper.startPage(pageParam.getPageNum(), pageParam.getPageSize());
+        BasePageResult<IpTokenInterfacePO> content = ipTokenInterfaceRepository.queryList(pageParam.getAid(),statusList);
         List<Long> tokenIdList = new ArrayList<>();
         List<Long> interfaceIdList = new ArrayList<>();
         for (IpTokenInterfacePO interfacePO : content) {
@@ -184,8 +180,7 @@ public class IpTokenInterfaceServiceImpl implements IpTokenInterfaceService {
             vo.setCallbackUrl(item.getCallbackUrl());
             return vo;
         }).toList();
-        Page<AccountInterfaceVO> resultPage = new PageImpl(resultList);
-        BeanUtils.copyProperties(result, resultPage);
+        BasePageResult<AccountInterfaceVO> resultPage = new BasePageResult<>(resultList,content.getTotal(),content.getPage(), content.getPageSize());
         return resultPage;
 
     }
@@ -231,13 +226,13 @@ public class IpTokenInterfaceServiceImpl implements IpTokenInterfaceService {
         IpTokenPO ipTokenPO = ipTokenRepository.findById(tid).get();
         ipTokenPO.setUpdateUserId(user.getUserid());
         ipTokenPO.setUpdateUserName(user.getUsername());
-        ipTokenPO.setUpdateTime(LocalDateTime.now());
+        ipTokenPO.setUpdateTime(new Date());
         ipTokenPO.setStatus("delete");
         ipTokenRepository.save(ipTokenPO);
 
         ipTokenInterfacePO.setUpdateUserId(user.getUserid());
         ipTokenInterfacePO.setUpdateUserName(user.getUsername());
-        ipTokenInterfacePO.setUpdateTime(LocalDateTime.now());
+        ipTokenInterfacePO.setUpdateTime(new Date());
         ipTokenInterfacePO.setStatus("delete");
         ipTokenInterfaceRepository.save(ipTokenInterfacePO);
 
@@ -247,9 +242,10 @@ public class IpTokenInterfaceServiceImpl implements IpTokenInterfaceService {
     public void interfaceConfig(InterfaceConfigParam param, LoginUser user) {
         String token = param.getToken();
         Long id = param.getId();
-        LocalDateTime now = LocalDateTime.now();
+        Date now = new Date();
         IpTokenInterfacePO ipTokenInterfacePO;
         IpTokenPO ipTokenPO;
+        // 校验唯一性
         if(id != null){
             ipTokenInterfacePO = ipTokenInterfaceRepository.findById(param.getId()).get();
             ipTokenPO = ipTokenRepository.findById(ipTokenInterfacePO.getTid()).get();
@@ -261,12 +257,17 @@ public class IpTokenInterfaceServiceImpl implements IpTokenInterfaceService {
                 throw new RuntimeException("参数异常");
             }
         }else{
+            IpTokenInterfacePO ipTokenInterfacePO1 = ipTokenInterfaceRepository.findByAidAndIid(param.getAccountId(), param.getInterfaceId());
+            if(ipTokenInterfacePO1 != null){
+                throw new RuntimeException("该账号下已存在对应接口");
+            }
+
+
             ipTokenInterfacePO = new IpTokenInterfacePO();
             ipTokenPO = new IpTokenPO();
             ipTokenInterfacePO.setAid(param.getAccountId());
             ipTokenInterfacePO.setIid(param.getInterfaceId());
             ipTokenInterfacePO.setAddTime(now);
-            ipTokenInterfacePO.setStatus("normal");
             ipTokenInterfacePO.setAddUserId(user.getUserid());
             ipTokenInterfacePO.setAddUserName(user.getUsername());
             ipTokenInterfacePO.setId(SnowflakeIdWorker.nextId());
@@ -286,6 +287,7 @@ public class IpTokenInterfaceServiceImpl implements IpTokenInterfaceService {
         ipTokenRepository.save(ipTokenPO);
         ipTokenInterfacePO.setIid(param.getInterfaceId());
         ipTokenInterfacePO.setUpdateTime(now);
+        ipTokenInterfacePO.setStatus(param.getStatus());
         ipTokenInterfacePO.setUpdateUserName(user.getUsername());
         ipTokenInterfacePO.setUpdateUserId(user.getUserid());
         ipTokenInterfacePO.setCallbackNum(param.getCallbackNum() == null ? 0 : param.getCallbackNum());

src/main/java/com/hr/vo/AccountInterfaceVO.java

@@ -5,7 +5,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 public class AccountInterfaceVO implements Serializable {
@@ -52,6 +52,6 @@ public class AccountInterfaceVO implements Serializable {
 
     @Schema(description = "创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private LocalDateTime addTime;
+    private Date addTime;
 
 }

src/main/java/com/hr/vo/IpAccountVO.java

@@ -2,12 +2,9 @@ package com.hr.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.Date;
 
  /**
@@ -27,10 +24,10 @@ public class IpAccountVO implements Serializable,Cloneable{
     private String status ;
     @Schema(description = "创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private LocalDateTime addTime ;
+    private Date addTime ;
     @Schema(description = "更新时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private LocalDateTime updateTime ;
+    private Date updateTime ;
     @Schema(description = "创建人id")
     private Long addUserId ;
     @Schema(description = "更新人id")

src/main/java/com/hr/vo/IpInterfaceVO.java

@@ -5,9 +5,9 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.util.Date;
 
- /**
+/**
  * 接口表;IpInterface数据表的PO对象
  * @author : longhoo
  * @date : 2025-10-10
@@ -30,10 +30,10 @@ public class IpInterfaceVO implements Serializable,Cloneable{
     private String interfaceConfig ;
     @Schema(description = "创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private LocalDateTime addTime ;
+    private Date addTime ;
     @Schema(description = "更新时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private LocalDateTime updateTime ;
+    private Date updateTime ;
     @Schema(description = "创建人id")
     private Long addUserId ;
     @Schema(description = "更新人id")

src/main/java/com/hr/vo/IpLogVO.java

@@ -1,12 +1,11 @@
 package com.hr.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * 接口日志表;IpLog数据表的PO对象
@@ -37,9 +36,11 @@ public class IpLogVO implements Serializable,Cloneable{
     @Schema(description = "异常信息,存储调用时的各种程序异常信息")
     private String msg ;
     @Schema(description = "创建时间")
-    private LocalDateTime addTime ;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date addTime ;
     @Schema(description = "更新时间")
-    private LocalDateTime updateTime ;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date updateTime ;
     @Schema(description = "创建人id")
     private String addUserId ;
     @Schema(description = "更新人id")

src/main/java/com/hr/vo/IpOrderVO.java

@@ -1,12 +1,13 @@
 package com.hr.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * * 调用记录表;IpOrder数据表的PO对象
@@ -37,9 +38,11 @@ public class IpOrderVO implements Serializable, Cloneable {
     @Schema(description = "回调状态,handle处理中，success成功，fail失败")
     private String callbackStatus;
     @Schema(description = "创建时间")
-    private LocalDateTime addTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date addTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @Schema(description = "更新时间")
-    private LocalDateTime updateTime;
+    private Date updateTime;
     @Schema(description = "创建人id")
     private String addUserId;
     @Schema(description = "更新人id")

src/main/java/com/hr/vo/IpTokenInterfaceVO.java

@@ -1,12 +1,13 @@
 package com.hr.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.util.Date;
 
- /**
+/**
  * token与接口关系表;IpTokenInterface数据表的VO对象
  * @author : longhoo
  * @date : 2025-10-10
@@ -27,9 +28,11 @@ public class IpTokenInterfaceVO implements Serializable,Cloneable{
     @Schema(description = "回调次数,尝试回调的次数，超过次数则不再回调")
     private int callbackNum ;
     @Schema(description = "创建时间")
-    private LocalDateTime addTime ;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date addTime ;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @Schema(description = "更新时间")
-    private LocalDateTime updateTime ;
+    private Date updateTime ;
     @Schema(description = "创建人id")
     private String addUserId ;
     @Schema(description = "更新人id")

src/main/java/com/hr/vo/IpTokenVO.java

@@ -4,9 +4,9 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.util.Date;
 
- /**
+/**
  * token表;Long数据表的VO对象
  * @author : longhoo
  * @date : 2025-10-10
@@ -27,9 +27,9 @@ public class IpTokenVO implements Serializable,Cloneable{
     @Schema(description = "状态,normal 有效，disable 禁用，delete 删除")
     private String tokenStatus ;
     @Schema(description = "创建时间")
-    private LocalDateTime addTime ;
+    private Date addTime ;
     @Schema(description = "更新时间")
-    private LocalDateTime updateTime ;
+    private Date updateTime ;
     @Schema(description = "创建人id")
     private String addUserId ;
     @Schema(description = "更新人id")

src/main/resources/mapper/IpAccountMapper.xml

@@ -0,0 +1,11 @@
+<?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.hr.repository.jpa.IpAccountRepository">
+
+
+    <select id="queryList" resultType="com.hr.vo.IpAccountVO">
+        select * from ip_account t where t.acc_no like '%'||:accNo||'%' and status in(:statusList)
+    </select>
+</mapper>

src/main/resources/mapper/IpInterfaceMapper.xml

@@ -21,7 +21,6 @@
         where 1 = 1 and ord.ref_id = :id
     </select>
     <select id="queryPage" resultType="com.hr.vo.IpInterfaceVO">
-        select * from ip_interface where 1=1 and interface_name like '%'||:interfaceName||'%'
-        and status in (:statusList)
+        select * from ip_interface where 1=1 and interface_name like '%'||:interfaceName||'%' and status in (:statusList)
     </select>
 </mapper>

src/main/resources/mapper/IpTokenInterfaceMapper.xml

@@ -0,0 +1,11 @@
+<?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.hr.repository.jpa.IpTokenInterfaceRepository">
+
+
+    <select id="queryList" resultType="com.hr.repository.domain.IpTokenInterfacePO">
+        select * from ip_token_interface where 1=1 and aid = :aid and status in(:statusList)
+    </select>
+</mapper>