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

# Conflicts:
#	src/main/java/com/hr/repository/domain/IpOrderPO.java

.idea/jpa-buddy.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JpaBuddyIdeaProjectConfig">
+    <option name="renamerInitialized" value="true" />
+  </component>
+</project>

pom.xml

@@ -111,19 +111,21 @@
             <version>2.0.57</version>
         </dependency>
 
+
         <dependency>
             <groupId>com.basedevelop</groupId>
             <artifactId>basedevelop</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
 
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
 
 
+
+
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>
             <artifactId>mybatis-spring-boot-starter</artifactId>
@@ -398,6 +400,109 @@
     </build>
 
 
+    <profiles>
+        <profile>
+            <id>deploy</id>
+
+            <build>
+                <finalName>${project.artifactId}</finalName>
+                <plugins>
+                    <plugin>
+                        <groupId>org.springframework.boot</groupId>
+                        <artifactId>spring-boot-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>repackage</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>dev</id>
+            <build>
+                <finalName>${project.artifactId}-dev</finalName>
+                <plugins>
+                    <plugin>
+                        <groupId>org.springframework.boot</groupId>
+                        <artifactId>spring-boot-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>repackage</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <version>3.8.1</version> <!-- 使用最新版本 -->
+                        <configuration>
+                            <source>21</source> <!-- 设置源代码的 JDK 版本 -->
+                            <target>21</target> <!-- 设置目标字节码的 JDK 版本 -->
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>test</id>
+            <build>
+                <finalName>${project.artifactId}-test</finalName>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-deploy-plugin</artifactId>
+                        <version>3.1.2</version>
+                        <configuration>
+                            <skip>false</skip>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.springframework.boot</groupId>
+                        <artifactId>spring-boot-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>repackage</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>prod</id>
+            <build>
+                <finalName>${project.artifactId}-prod</finalName>
+                <plugins>
+                    <plugin>
+                        <groupId>org.springframework.boot</groupId>
+                        <artifactId>spring-boot-maven-plugin</artifactId>
+                        <version>3.2.12</version>
+                        <configuration>
+                            <mainClass>com.hr.InterfacePlatformApplication</mainClass>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-deploy-plugin</artifactId>
+                        <version>3.1.2</version>
+                        <configuration>
+                            <skip>false</skip>
+                        </configuration>
+                    </plugin>
+
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
 
     <distributionManagement>
         <repository>

src/main/java/com/hr/InterfacePlatformApplication.java

@@ -1,7 +1,5 @@
 package com.hr;
 
-
-import com.yy.basedevelop.BasedevelopBoot;
 import lombok.extern.slf4j.Slf4j;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;

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

@@ -33,8 +33,8 @@ public class IpAccountController{
      * @return 查询结果
      */
     @Operation(summary = "分页查询")
-    @GetMapping
-    public BasePageResult<IpAccountVO> paginQuery(@RequestBody IpAccountParam ipAccountParam){
+    @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());
     }
@@ -46,7 +46,7 @@ public class IpAccountController{
      * @return 实例对象
      */
     @Operation(summary = "新增/更新数据")
-    @PostMapping
+    @PostMapping("/saveOrUpdate")
     public BaseReturnDto<IpAccountVO> saveOrUpdate(@RequestBody IpAccountParam accountParam){
         LoginUser user= TokenUtil.getUser();
         ipAccountService.saveOrUpdate(accountParam,user.getUsername(),user.getUserid());
@@ -60,8 +60,8 @@ public class IpAccountController{
      * @return 是否成功
      */
     @Operation(summary = "通过主键删除数据")
-    @DeleteMapping
-    public BaseReturnDto<Boolean> deleteById(Long id){
+    @DeleteMapping("/delete/{id}")
+    public BaseReturnDto<Boolean> deleteById(@PathVariable Long id){
         LoginUser user = TokenUtil.getUser();
         return BaseReturnDto.success(ipAccountService.deleteById(id,user));
     }

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

@@ -1,20 +1,19 @@
 package com.hr.controller;
 
 import com.hr.param.InterfaceCalledQueryParam;
-import com.hr.param.IpInterfaceParam;
-import com.hr.repository.domain.IpInterfacePO;
 import com.hr.repository.service.IpOrderService;
 import com.hr.vo.CallbackHistoryVO;
 import com.hr.vo.InterfaceCalledDetail;
 import com.hr.vo.IpInterfaceCallVO;
-import com.hr.vo.IpInterfaceVO;
 import com.yy.basedevelop.common.data.BasePageResult;
 import com.yy.basedevelop.common.data.BaseReturnDto;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -29,20 +28,17 @@ public class IpInterfaceCallbackController {
 
     /**
      * 分页查询
-     *
      * @param ipInterfaceCalledQueryParam 筛选条件
      * @return 查询结果
      */
     @Operation(summary = "分页查询接口调用记录")
-    @PostMapping("/list")
-    public BasePageResult<IpInterfaceCallVO> queryList(@RequestBody InterfaceCalledQueryParam ipInterfaceCalledQueryParam){
-        System.out.println();
+    @GetMapping("/list")
+    public BasePageResult<IpInterfaceCallVO> queryList(InterfaceCalledQueryParam ipInterfaceCalledQueryParam){
         return ipOrderService.queryList(ipInterfaceCalledQueryParam);
     }
 
     /**
      * 查询接口的调用详情
-     *
      * @param id 筛选条件
      * @return 查询结果
      */
@@ -60,7 +56,7 @@ public class IpInterfaceCallbackController {
      * @return 查询结果
      */
     @Operation(summary = "查询接口回调记录")
-    @PostMapping("/callback/history/{id}")
+    @GetMapping("/callback/history/{id}")
     public BaseReturnDto<List<CallbackHistoryVO>> queryList(@PathVariable long id){
         List<CallbackHistoryVO> list = ipOrderService.callbackHistory(id);
         return BaseReturnDto.success(list);

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

@@ -41,8 +41,8 @@ public class IpInterfaceController {
      * @return 查询结果
      */
     @Operation(summary = "分页查询")
-    @GetMapping
-    public BasePageResult<IpInterfaceVO> paginQuery(@RequestBody IpInterfaceParam ipInterfaceParam){
+    @GetMapping("/list")
+    public BasePageResult<IpInterfaceVO> paginQuery(IpInterfaceParam ipInterfaceParam){
         Page<IpInterfaceVO> ipAccountPOS = ipInterfaceService.paginQuery(ipInterfaceParam, ipInterfaceParam.getPageNum(), ipInterfaceParam.getPageSize());
         return BasePageResult.success(ipAccountPOS.getContent(), ipAccountPOS.getTotalElements(), ipInterfaceParam.getPageNum(), ipInterfaceParam.getPageSize());
     }
@@ -54,7 +54,7 @@ public class IpInterfaceController {
      * @return 实例对象
      */
     @Operation(summary = "新增/更新数据")
-    @PostMapping
+    @PostMapping("/saveOrUpdate")
     public BaseReturnDto<IpAccountVO> saveOrUpdate(@RequestBody IpInterfaceParam ipInterfaceParam){
         LoginUser user= TokenUtil.getUser();
         ipInterfaceService.saveOrUpdate(ipInterfaceParam,user.getUsername(),user.getUserid());
@@ -68,8 +68,8 @@ public class IpInterfaceController {
      * @return 是否成功
      */
     @Operation(summary = "通过主键删除数据")
-    @DeleteMapping
-    public BaseReturnDto<Boolean> deleteById(Long id){
+    @DeleteMapping("/delete/{id}")
+    public BaseReturnDto<Boolean> deleteById(@PathVariable Long id){
         return BaseReturnDto.success(ipInterfaceService.deleteById(id));
     }
 
@@ -114,8 +114,8 @@ public class IpInterfaceController {
     @PostMapping("/token/generate")
     public BaseReturnDto<SecretVO> generateToken(){
         SecretVO vo = new SecretVO();
-        String secret = RandomStringUtils.random(256, "0123456789abcdef");
-        String token = RandomStringUtils.random(64, "0123456789abcdef");
+        String secret = RandomStringUtils.random(64, "0123456789abcdef");
+        String token = RandomStringUtils.random(32, "0123456789abcdef");
         vo.setToken(token);
         vo.setSecret(secret);
         return BaseReturnDto.success(vo);
@@ -137,9 +137,20 @@ public class IpInterfaceController {
      * 查询账号下关联的接口列表
      */
     @Operation(summary = "查询账号下关联的接口列表")
-    @DeleteMapping("/account/ref/list")
+    @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());
     }
+
+    /**
+     * 账号关联接口修改接口状态
+     * @param switchStatusParam 主键
+     * @return 是否成功
+     */
+    @Operation(summary = "修改状态")
+    @PostMapping("/account/interface/ref/switchStatus")
+    public BaseReturnDto<Boolean> accountInterfaceRefSwitch(@RequestBody SwitchStatusParam switchStatusParam){
+        return BaseReturnDto.success(ipTokenInterfaceService.switchStatus(switchStatusParam));
+    }
 }

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

@@ -0,0 +1,51 @@
+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;
+
+@Schema(description = "账户表")
+@Data
+public class IpAccountDto {
+
+    /** 主键 */
+    @Schema(description = "主键")
+	private Long id ;
+
+    /** 账户编号 */
+    @Schema(description = "账户编号")
+	private String accNo ;
+
+    /** 备注 */
+    @Schema(description = "备注")
+	private String remark ;
+
+    /** 状态,normal 有效，disable 禁用，delete 删除 */
+    @Schema(description = "状态;normal 有效，disable 禁用，delete 删除")
+	private String status ;
+
+    /** 创建时间 */
+    @Schema(description = "创建时间")
+	private LocalDateTime addTime ;
+
+    /** 更新时间 */
+    @Schema(description = "更新时间")
+	private LocalDateTime updateTime ;
+
+    /** 创建人id */
+    private Long addUserId ;
+
+    /** 更新人id */
+    private Long updateUserId ;
+
+    /** 创建人姓名 */
+    @Schema(description = "创建人姓名")
+	private String addUserName ;
+
+    /** 更新人姓名 */
+    @Schema(description = "更新人姓名")
+	private String updateUserName ;
+
+}

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

@@ -0,0 +1,63 @@
+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;
+
+@Schema(description = "接口表")
+@Data
+public class IpInterfaceDto {
+
+    /** 主键,; */
+    @Schema(description = "主键")
+	private Long id ;
+
+    /** 接口名称,名称唯一,; */
+    @Schema(description = "接口名称;名称唯一")
+	private String interfaceName ;
+
+    /** 接口编号,标号唯一,; */
+    @Schema(description = "接口编号")
+	private String interfaceNo ;
+
+    /** 接口厂商,; */
+    @Schema(description = "接口厂商")
+	private String manufacturer ;
+
+    /** 备注,; */
+    @Schema(description = "备注")
+	private String remark ;
+
+    /** 状态,normal 有效，disable 禁用，delete 删除,; */
+    @Schema(description = "状态;normal 有效，disable 禁用，delete 删除")
+	private String status ;
+
+    /** 接口配置,JSON格式的配置文件，存放接口参数,; */
+    @Schema(description = "接口配置;JSON格式的配置文件，存放接口参数")
+	private String interfaceConfig ;
+
+    /** 创建时间,; */
+    @Schema(description = "创建时间")
+	private LocalDateTime addTime ;
+
+    /** 更新时间,; */
+    @Schema(description = "更新时间")
+	private LocalDateTime updateTime ;
+
+    /** 创建人id,; */
+    private Long addUserId ;
+
+    /** 更新人id,; */
+    private Long updateUserId ;
+
+    /** 创建人姓名,; */
+    @Schema(description = "创建人姓名")
+	private String addUserName ;
+
+    /** 更新人姓名,; */
+    @Schema(description = "更新人姓名")
+	private String updateUserName ;
+
+}

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

@@ -72,7 +72,6 @@ public class AiwenIpService implements BizHandler<AiwenParam,AiwenParseIpInfoVO>
     @Override
     public AiwenParseIpInfoVO handle(AiwenParam aiwenIpParam, IpInterfacePO ipInterfacePO, ApiLogDto logDto) {
         {
-            logDto.setBusinessNo("aabbccddee");
             String interfaceConfig = ipInterfacePO.getInterfaceConfig();
             AiwenDto aiwenDto = JSON.parseObject(interfaceConfig, AiwenDto.class);
             log.info("埃文解析的ip地址: {}", aiwenIpParam.getIp());

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

@@ -76,6 +76,7 @@ public class BizHandlerFactory {
                 ipOrderPO.setStatus("fail");
                 ipLogPO.setStatus("fail");
             }
+            ipOrderPO.setInterfaceId(ipInterfacePO.getId());
             ipOrderPO.setUpdateTime(LocalDateTime.now());
             ipOrderPO.setBusinessNo(logDto.getBusinessNo());
             ipLogPO.setUrl(logDto.getUrl());
@@ -118,10 +119,10 @@ public class BizHandlerFactory {
     private void wrapCallBackOrder(IpOrderPO ipOrder, CallbackResponseVO callback, LocalDateTime callDateTime, JSONObject json) {
         IpLogPO ipLog = new IpLogPO();
         IpOrderPO ipOrderPO = new IpOrderPO();
-
         ipOrderPO.setId(SnowflakeIdWorker.nextId());
         ipOrderPO.setInterfaceName(ipOrder.getInterfaceName());
         ipOrderPO.setAccNo(ipOrder.getAccNo());
+        ipOrderPO.setInterfaceId(ipOrder.getInterfaceId());
         ipOrderPO.setRefId(ipOrder.getId());
         ipOrderPO.setCallbackUrl(ipOrder.getCallbackUrl());
         ipOrderPO.setAddTime(callDateTime);

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

@@ -6,4 +6,10 @@ import lombok.Data;
 public class AccountInterfaceParam extends PageParam{
 
     private Long id;
+
+    private String accNo;
+
+    private String status;
+
+    private Long aid;
 }

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

@@ -7,8 +7,8 @@ import lombok.Data;
 public class PageParam {
 
     @Schema(description = "当前页码")
-    private Integer pageNum;
+    private Integer pageNum = 1;
     @Schema(description = "每页展示条数")
-    private Integer pageSize;
+    private Integer pageSize = 10;
 
 }

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

@@ -23,6 +23,10 @@ public class IpOrderPO {
     @Schema(description = "主键")
 	private Long id;
 
+    @Column(name = "iid")
+    @Schema(description = "接口id")
+    private Long interfaceId;
+
     /**
      * 调用编号（业务编号）,唯一，格式为年月日时分秒毫秒加6位随机数20250918010256001000001,;
      */
@@ -148,4 +152,5 @@ public class IpOrderPO {
     @Column(name = "order_status", length = 255)
     private String orderStatus;
 
+
 }

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

@@ -12,4 +12,5 @@ import java.util.List;
  */
 public interface IpTokenInterfaceRepository extends JpaRepository<IpTokenInterfacePO,Long> {
 
+    IpTokenInterfacePO findByAidAndIid(Long aid, Long iid);
 }

src/main/java/com/hr/repository/service/impl/IpOrderServiceImpl.java

@@ -1,14 +1,14 @@
 package com.hr.repository.service.impl;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.hr.param.InterfaceCalledQueryParam;
-import com.hr.repository.domain.IpLogPO;
-import com.hr.repository.domain.IpOrderPO;
-import com.hr.repository.jpa.IpLogRepository;
-import com.hr.repository.jpa.IpOrderRepository;
+import com.hr.repository.domain.*;
+import com.hr.repository.jpa.*;
 import com.hr.repository.service.IpOrderService;
 import com.hr.vo.*;
 import com.yy.basedevelop.common.data.BasePageResult;
+import com.yy.basedevelop.common.util.ToString;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.*;
@@ -28,6 +28,14 @@ public class IpOrderServiceImpl implements IpOrderService {
     private IpOrderRepository ipOrderRepository;
     @Autowired
     private IpLogRepository ipLogRepository;
+    @Autowired
+    private IpInterfaceRepository ipInterfaceRepository;
+    @Autowired
+    private IpTokenInterfaceRepository ipTokenInterfaceRepository;
+    @Autowired
+    private IpAccountRepository ipAccountRepository;
+    @Autowired
+    private IpTokenRepository ipTokenRepository;
 
     /** 
      * 通过ID查询单条数据 
@@ -85,13 +93,24 @@ public class IpOrderServiceImpl implements IpOrderService {
     @Override
     public InterfaceCalledDetail interfaceDetail(Long id) {
         IpOrderPO ipOrderPO = ipOrderRepository.findById(id).get();
+        ipOrderPO.getAccNo();
+        IpAccountPO accountPO = ipAccountRepository.findByAccNo(ipOrderPO.getAccNo());
         IpLogPO ipLog = ipLogRepository.findByOid(ipOrderPO.getId());
+        IpInterfacePO ipInterfacePO = ipInterfaceRepository.findById(ipOrderPO.getInterfaceId()).get();
+        IpTokenInterfacePO ipTokenInterfacePO = ipTokenInterfaceRepository.findByAidAndIid(accountPO.getId(), ipInterfacePO.getId());
+        Long tid = ipTokenInterfacePO.getTid();
+        IpTokenPO ipTokenPO = ipTokenRepository.findById(tid).get();
         InterfaceCalledDetail vo = new InterfaceCalledDetail();
         vo.setId(ipOrderPO.getId());
         vo.setAccountNo(ipOrderPO.getAccNo());
         vo.setInterfaceName(ipOrderPO.getInterfaceName());
         vo.setRequestParam(ipLog.getRequestParam());
         vo.setResponseParam(ipLog.getResponseResult());
+        JSONObject configParamJSON = new JSONObject();
+        configParamJSON.put("token", ipTokenPO.getToken());
+        configParamJSON.put("secret", ipTokenPO.getSecret());
+        vo.setConfigParam(configParamJSON.toJSONString());
+        vo.setInterfaceParam(ipInterfacePO.getInterfaceConfig());
         return vo;
     }
 

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

@@ -3,6 +3,7 @@ package com.hr.service;
 import com.hr.dto.AggregateQueryDTO;
 import com.hr.param.AccountInterfaceParam;
 import com.hr.param.InterfaceConfigParam;
+import com.hr.param.SwitchStatusParam;
 import com.hr.repository.domain.IpTokenInterfacePO;
 import com.hr.vo.AccountInterfaceVO;
 import com.hr.vo.IpTokenInterfaceVO;
@@ -62,4 +63,7 @@ public interface IpTokenInterfaceService{
     AggregateQueryDTO queryConfigByInterfaceCodeAndAccountNo(Long  accoutId, Long interfaceId);
 
     Page<AccountInterfaceVO> accountInterfaceList(AccountInterfaceParam pageParam);
+
+    Boolean switchStatus(SwitchStatusParam switchStatusParam);
+
 }

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

@@ -59,14 +59,19 @@ public class IpAccountServiceImpl implements IpAccountService {
     public Page<IpAccountVO> paginQuery(IpAccountParam ipAccountParam, Integer current, Integer size) {
         IpAccountPO ipAccountPO = new IpAccountPO();
         BeanUtils.copyProperties(ipAccountParam, ipAccountPO);
-        Pageable pageAble = PageRequest.of(current, size);
+        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() + "%"));
             }
-            predicates.add(cb.notEqual(root.get("status"), "delete"));
+            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]));
         };
 
@@ -143,15 +148,19 @@ public class IpAccountServiceImpl implements IpAccountService {
             if(ipAccountPO != null){
                 throw new RuntimeException("账户编号已存在");
             }
+            ipAccountPO = new IpAccountPO();
+            ipAccountPO.setAccNo(accountParam.getAccNo());
+            ipAccountPO.setStatus("normal");
+        }else{
+            ipAccountPO = ipAccountRepository.findById(accountParam.getId()).get();
         }
-        ipAccountPO = new IpAccountPO();
-        BeanUtils.copyProperties(accountParam, ipAccountPO);
         if(accountParam.getId() == null){
             ipAccountPO.setId(SnowflakeIdWorker.nextId());
             ipAccountPO.setAddTime(LocalDateTime.now());
             ipAccountPO.setAddUserId(userId);
             ipAccountPO.setAddUserName(userName);
         }
+        ipAccountPO.setRemark(accountParam.getRemark());
         ipAccountPO.setUpdateTime(LocalDateTime.now());
         ipAccountPO.setUpdateUserId(userId);
         ipAccountPO.setUpdateUserName(userName);
@@ -167,8 +176,8 @@ public class IpAccountServiceImpl implements IpAccountService {
      * @return 是否成功
      */
     public boolean deleteById(Long id, LoginUser user){
-        ipAccountRepository.deleteById(id);
         IpAccountPO ipAccountPO = ipAccountRepository.findById(id).get();
+        ipAccountPO.setStatus("delete");
         ipAccountPO.setUpdateTime(LocalDateTime.now());
         ipAccountPO.setUpdateUserId(user.getUserid());
         ipAccountPO.setUpdateUserName(user.getUsername());

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

@@ -15,6 +15,7 @@ import com.hr.vo.NameValueVO;
 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;
@@ -65,7 +66,7 @@ public class IpInterfaceServiceImpl implements IpInterfaceService {
          ExampleMatcher matcher = ExampleMatcher.matchingAll()
                  .withIgnoreNullValues()                              // 忽略 null 字段
                  .withIgnoreCase();
-         Pageable pageAble = PageRequest.of(current, size);
+         Pageable pageAble = PageRequest.of(current - 1 , size);
          Example<IpInterfacePO> example = Example.of(ipInterfacePO, matcher);
          Page<IpInterfacePO> page = ipInterfaceRepository.findAll(example, pageAble);
          List<IpInterfaceVO> resultList = new ArrayList<>();
@@ -92,7 +93,6 @@ public class IpInterfaceServiceImpl implements IpInterfaceService {
     
     /** 
      * 更新数据
-     *
      * @param IpInterfacePO 实例对象
      * @return 实例对象
      */
@@ -155,11 +155,11 @@ public class IpInterfaceServiceImpl implements IpInterfaceService {
             if(ipInterfacePO != null){
                 throw new RuntimeException("接口名称已存在");
             }
-
             ipInterfacePO = ipInterfaceRepository.findByInterfaceNo(ipInterfaceParam.getInterfaceNo());
             if(ipInterfacePO != null){
                 throw new RuntimeException("接口编号已存在");
             }
+            ipInterfacePO = new IpInterfacePO();
         }else{
             ipInterfacePO = ipInterfaceRepository.findByInterfaceName(ipInterfaceParam.getInterfaceName());
             if(ipInterfaceParam != null && ipInterfacePO.getInterfaceName().equals(ipInterfaceParam.getInterfaceName()) && !ipInterfacePO.getId().equals(ipInterfaceParam.getId())){
@@ -170,8 +170,8 @@ public class IpInterfaceServiceImpl implements IpInterfaceService {
                 throw new RuntimeException("接口编号已存在");
             }
         }
-        ipInterfacePO = new IpInterfacePO();
-        BeanUtils.copyProperties(ipInterfaceParam, ipInterfacePO);
+
+        com.yy.basedevelop.common.BeanUtils.copyPropertiesIgnoreNullAndEmptyStr(ipInterfaceParam, ipInterfacePO);
         if(ipInterfaceParam.getId() == null){
             ipInterfacePO.setId(SnowflakeIdWorker.nextId());
             ipInterfacePO.setAddTime(LocalDateTime.now());

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

@@ -1,17 +1,21 @@
 package com.hr.service.impl;
 
+import com.fasterxml.jackson.module.paramnames.ParameterNamesModule;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import com.hr.dto.AggregateQueryDTO;
 import com.hr.param.AccountInterfaceParam;
 import com.hr.param.InterfaceConfigParam;
+import com.hr.param.SwitchStatusParam;
 import com.hr.repository.domain.IpAccountPO;
 import com.hr.repository.domain.IpInterfacePO;
 import com.hr.repository.domain.IpTokenInterfacePO;
 import com.hr.repository.domain.IpTokenPO;
+import com.hr.repository.jpa.IpAccountRepository;
 import com.hr.repository.jpa.IpInterfaceRepository;
 import com.hr.repository.jpa.IpTokenInterfaceRepository;
 import com.hr.repository.jpa.IpTokenRepository;
+import com.hr.service.IpAccountService;
 import com.hr.service.IpTokenInterfaceService;
 import com.hr.util.SnowflakeIdWorker;
 import com.hr.vo.AccountInterfaceVO;
@@ -19,6 +23,7 @@ import com.hr.vo.IpAccountVO;
 import com.hr.vo.IpTokenInterfaceVO;
 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.*;
@@ -47,6 +52,12 @@ public class IpTokenInterfaceServiceImpl implements IpTokenInterfaceService {
     private static final Cache<String, AggregateQueryDTO> QUERY_CACHE = CacheBuilder.newBuilder()
             .expireAfterWrite(100, TimeUnit.SECONDS)
             .build();
+    @Autowired
+    private IpAccountService ipAccountService;
+    @Autowired
+    private IpAccountRepository ipAccountRepository;
+    @Autowired
+    private ParameterNamesModule parameterNamesModule;
 
     /** 
      * 通过ID查询单条数据 
@@ -96,16 +107,36 @@ public class IpTokenInterfaceServiceImpl implements IpTokenInterfaceService {
          return result;
      }
 
+    @Override
+    public Boolean switchStatus(SwitchStatusParam switchStatusParam) {
+        Optional<IpTokenInterfacePO> optional = ipTokenInterfaceRepository.findById(switchStatusParam.getId());
+        if(!optional.isPresent()){
+            throw new RuntimeException("记录不存在");
+        }
+        IpTokenInterfacePO ipTokenInterfacePO = optional.get();
+
+        ipTokenInterfacePO.setStatus(switchStatusParam.getStatus());
+        ipTokenInterfaceRepository.save(ipTokenInterfacePO);
+        return true;
+    }
+
     @Override
     public Page<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("normal");
-        Pageable pageAble = PageRequest.of(pageParam.getPageNum(), pageParam.getPageSize());
+        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();
@@ -128,7 +159,6 @@ public class IpTokenInterfaceServiceImpl implements IpTokenInterfaceService {
             }
         }
 
-
         if(!interfaceIdList.isEmpty()){
             Specification<IpInterfacePO> spec = (root, query, cb) -> {
                 return root.get("id").in(interfaceIdList);
@@ -143,11 +173,15 @@ public class IpTokenInterfaceServiceImpl implements IpTokenInterfaceService {
             BeanUtils.copyProperties(item, vo);
             IpTokenPO ipTokenPO = tokenMap.get(item.getTid());
             vo.setSecret(ipTokenPO.getSecret());
+            vo.setToken(ipTokenPO.getToken());
             vo.setRemark(ipTokenPO.getRemark());
             IpInterfacePO ipInterfacePO = interfaceMap.get(item.getIid());
             vo.setInterfaceCode(ipInterfacePO.getInterfaceNo());
             vo.setInterfaceName(ipInterfacePO.getInterfaceName());
+            vo.setInterfaceId(ipInterfacePO.getId());
             vo.setManufacturer(ipInterfacePO.getManufacturer());
+            vo.setCallback(item.getIsCallback());
+            vo.setCallbackUrl(item.getCallbackUrl());
             return vo;
         }).toList();
         Page<AccountInterfaceVO> resultPage = new PageImpl(resultList);
@@ -242,6 +276,7 @@ public class IpTokenInterfaceServiceImpl implements IpTokenInterfaceService {
             ipTokenPO.setId(SnowflakeIdWorker.nextId());
             ipTokenInterfacePO.setTid(ipTokenPO.getId());
         }
+        ipTokenPO.setRemark(param.getRemark());
         ipTokenPO.setToken(token);
         ipTokenPO.setSecret(param.getSecret());
         ipTokenPO.setUpdateTime(now);
@@ -249,6 +284,7 @@ public class IpTokenInterfaceServiceImpl implements IpTokenInterfaceService {
         ipTokenPO.setUpdateUserName(user.getUsername());
         ipTokenPO.setUpdateUserId(user.getUserid());
         ipTokenRepository.save(ipTokenPO);
+        ipTokenInterfacePO.setIid(param.getInterfaceId());
         ipTokenInterfacePO.setUpdateTime(now);
         ipTokenInterfacePO.setUpdateUserName(user.getUsername());
         ipTokenInterfacePO.setUpdateUserId(user.getUserid());

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

@@ -13,6 +13,12 @@ public class AccountInterfaceVO implements Serializable {
     @Schema(description = "id")
     private Long id;
 
+    @Schema(description = "账号NO")
+    private String accNo;
+
+    @Schema(description = "接口ID")
+    private Long interfaceId;
+
     @Schema(description = "接口名称")
     private String interfaceName;
 
@@ -38,6 +44,9 @@ public class AccountInterfaceVO implements Serializable {
     @Schema(description = "secret")
     private String secret;
 
+    @Schema(description = "token")
+    private String token;
+
     @Schema(description = "创建人")
     private String addUserName;
 

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

@@ -1,5 +1,6 @@
 package com.hr.vo;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 /**
@@ -10,22 +11,22 @@ import lombok.Data;
  */
 @Data
 public class AiwenParseIpInfoVO {
-    /** ip地址 */
+    @Schema(description = "ip地址")
     private String ip;
-    /** 国家 */
+    @Schema(description = "国家")
     private String country;
-    /** 省份 */
+    @Schema(description = "省份")
     private String province;
-    /** 城市 */
+    @Schema(description = "城市")
     private String city;
-    /** 运营商 */
+    @Schema(description = "运营商")
     private String sub;
-    /** 其他信息, 例子: 中国|0|重庆|重庆市|电信 */
+    @Schema(description = "其他信息, 例子: 中国|0|重庆|重庆市|电信")
     private String info;
-    /** 纬度信息 */
+    @Schema(description = "纬度信息")
     private String lat;
-    /** 经度信息 */
+    @Schema(description = "经度信息")
     private String lng;
-    /** 城市code, 接口未返回, 为预留字段 */
+    @Schema(description = "城市code, 接口未返回, 为预留字段")
     private String cityCode;
 }

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

@@ -16,4 +16,8 @@ public class InterfaceCalledDetail implements Serializable {
     private String requestParam;
 
     private String responseParam;
+
+    private String interfaceParam;
+
+    private String configParam;
 }

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

@@ -1,6 +1,7 @@
 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;
@@ -16,26 +17,26 @@ import java.util.Date;
  */
 @Data
 public class IpAccountVO implements Serializable,Cloneable{
-    /** 主键,; */
+    @Schema(description = "主键")
     private Long id ;
-    /** 账户编号,; */
+    @Schema(description = "账户编号")
     private String accNo ;
-    /** 备注,; */
+    @Schema(description = "备注")
     private String remark ;
-    /** 状态,normal 有效，disable 禁用，delete 删除,; */
+    @Schema(description = "状态,normal 有效，disable 禁用，delete 删除")
     private String status ;
-    /** 创建时间,; */
+    @Schema(description = "创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime addTime ;
-    /** 更新时间,; */
+    @Schema(description = "更新时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime updateTime ;
-    /** 创建人id,; */
+    @Schema(description = "创建人id")
     private Long addUserId ;
-    /** 更新人id,; */
+    @Schema(description = "更新人id")
     private Long updateUserId ;
-    /** 创建人姓名,; */
+    @Schema(description = "创建人姓名")
     private String addUserName ;
-    /** 更新人姓名,; */
+    @Schema(description = "更新人姓名")
     private String updateUserName ;
 }

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

@@ -1,6 +1,7 @@
 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;
@@ -14,32 +15,32 @@ import java.time.LocalDateTime;
 @Data
 public class IpInterfaceVO implements Serializable,Cloneable{
 
-    /** 主键,; */
+    @Schema(description = "主键")
     private Long id ;
-    /** 接口名称,名称唯一,; */
+    @Schema(description = "接口名称,名称唯一")
     private String interfaceName ;
     private String interfaceNo;
-    /** 接口厂商,; */
+    @Schema(description = "接口厂商")
     private String manufacturer ;
-    /** 备注,; */
+    @Schema(description = "备注")
     private String remark ;
-    /** 状态,normal 有效，disable 禁用，delete 删除,; */
+    @Schema(description = "状态,normal 有效，disable 禁用，delete 删除")
     private String status ;
-    /** 接口配置,JSON格式的配置文件，存放接口参数,; */
+    @Schema(description = "接口配置,JSON格式的配置文件，存放接口参数")
     private String interfaceConfig ;
-    /** 创建时间,; */
+    @Schema(description = "创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime addTime ;
-    /** 更新时间,; */
+    @Schema(description = "更新时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime updateTime ;
-    /** 创建人id,; */
+    @Schema(description = "创建人id")
     private Long addUserId ;
-    /** 更新人id,; */
+    @Schema(description = "更新人id")
     private Long updateUserId ;
-    /** 创建人姓名,; */
+    @Schema(description = "创建人姓名")
     private String addUserName ;
-    /** 更新人姓名,; */
+    @Schema(description = "更新人姓名")
     private String updateUserName ;
 
 }

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

@@ -1,5 +1,6 @@
 package com.hr.vo;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import lombok.Data;
@@ -15,37 +16,37 @@ import java.time.LocalDateTime;
 @Data
 public class IpLogVO implements Serializable,Cloneable{
 
-    /** 主键,; */
+    @Schema(description = "主键")
     private Long id ;
-    /** 调用记录表主键,; */
+    @Schema(description = "调用记录表主键")
     private String oid ;
-    /** 调用编号（业务编号）,唯一，格式为年月日时分秒毫秒加6位随机数 20250918010256001000001,; */
+    @Schema(description = "调用编号（业务编号）,唯一，格式为年月日时分秒毫秒加6位随机数 20250918010256001000001")
     private String orderNo ;
-    /** 执行类型,request请求，callback回调,; */
+    @Schema(description = "执行类型,request请求，callback回调")
     private String executeType ;
-    /** 请求地址/回调地址,如果是请求类型则记录请求地址。若是回调类型则记录回调地址。,; */
+    @Schema(description = "请求地址/回调地址,如果是请求类型则记录请求地址。若是回调类型则记录回调地址。")
     private String url ;
-    /** 请求状态,handle处理中，success成功，fail失败,; */
+    @Schema(description = "请求状态,handle处理中，success成功，fail失败")
     private String status ;
-    /** 请求参数,临时存储json格式，通过定时任务上传到OSS后更换为oss存储url,; */
+    @Schema(description = "请求参数,临时存储json格式，通过定时任务上传到OSS后更换为oss存储url")
     private String requestParam ;
-    /** 响应结果,临时存储json格式，通过定时任务上传到OSS后更换为oss存储url,; */
+    @Schema(description = "响应结果,临时存储json格式，通过定时任务上传到OSS后更换为oss存储url")
     private String responseResult ;
-    /** 响应状态码,; */
+    @Schema(description = "响应状态码")
     private String httpStatus ;
-    /** 异常信息,存储调用时的各种程序异常信息,; */
+    @Schema(description = "异常信息,存储调用时的各种程序异常信息")
     private String msg ;
-    /** 创建时间,; */
+    @Schema(description = "创建时间")
     private LocalDateTime addTime ;
-    /** 更新时间,; */
+    @Schema(description = "更新时间")
     private LocalDateTime updateTime ;
-    /** 创建人id,; */
+    @Schema(description = "创建人id")
     private String addUserId ;
-    /** 更新人id,; */
+    @Schema(description = "更新人id")
     private String updateUserId ;
-    /** 创建人姓名,; */
+    @Schema(description = "创建人姓名")
     private String addUserName ;
-    /** 更新人姓名,; */
+    @Schema(description = "更新人姓名")
     private String updateUserName ;
     
 }

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

@@ -1,5 +1,6 @@
 package com.hr.vo;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import lombok.Data;
@@ -8,76 +9,43 @@ import java.io.Serializable;
 import java.time.LocalDateTime;
 
 /**
- * 调用记录表;IpOrder数据表的PO对象
- *
- * @author : longhoo
- * @date : 2025-10-10
+ * * 调用记录表;IpOrder数据表的PO对象
+ * *
  */
 @Data
 public class IpOrderVO implements Serializable, Cloneable {
 
-    /**
-     * 主键,;
-     */
+
+    @Schema(description = "主键")
     private Long id;
-    /**
-     * 调用编号（业务编号）,唯一，格式为年月日时分秒毫秒加6位随机数20250918010256001000001,;
-     */
+    @Schema(description = "调用编号（业务编号）,唯一，格式为年月日时分秒毫秒加6位随机数20250918010256001000001")
     private String orderNo;
-    /**
-     * 接口名称,;
-     */
+    @Schema(description = "接口名称")
     private String interfaceName;
-    /**
-     * 账户编号,;
-     */
+    @Schema(description = "账户编号")
     private String accNo;
-    /**
-     * token值,;
-     */
+    @Schema(description = "token值")
     private String token;
-    /**
-     * 回调地址,;
-     */
+    @Schema(description = "回调地址")
     private String callbackUrl;
-    /**
-     * 是否支持回调,yes支持，no不支持,;
-     */
+    @Schema(description = "是否支持回调,yes支持，no不支持")
     private String isCallback;
-    /**
-     * 回调次数,尝试回调的次数，超过次数则不再回调,;
-     */
+    @Schema(description = "回调次数,尝试回调的次数，超过次数则不再回调")
     private int callbackNum;
-    /**
-     * 调用状态,handle处理中，success成功，fail失败,;
-     */
+    @Schema(description = "调用状态,handle处理中，success成功，fail失败")
     private String orderStatus;
-    /**
-     * 回调状态,handle处理中，success成功，fail失败,;
-     */
+    @Schema(description = "回调状态,handle处理中，success成功，fail失败")
     private String callbackStatus;
-    /**
-     * 创建时间,;
-     */
+    @Schema(description = "创建时间")
     private LocalDateTime addTime;
-    /**
-     * 更新时间,;
-     */
+    @Schema(description = "更新时间")
     private LocalDateTime updateTime;
-    /**
-     * 创建人id,;
-     */
+    @Schema(description = "创建人id")
     private String addUserId;
-    /**
-     * 更新人id,;
-     */
+    @Schema(description = "更新人id")
     private String updateUserId;
-    /**
-     * 创建人姓名,;
-     */
+    @Schema(description = "创建人姓名")
     private String addUserName;
-    /**
-     * 更新人姓名,;
-     */
+    @Schema(description = "更新人姓名")
     private String updateUserName;
 }

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

@@ -1,5 +1,6 @@
 package com.hr.vo;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -13,28 +14,28 @@ import java.time.LocalDateTime;
  
 @Data
 public class IpTokenInterfaceVO implements Serializable,Cloneable{
-    /** 主键,; */
+    @Schema(description = "主键")
     private Long id ;
-    /** token表主键,; */
+    @Schema(description = "token表主键")
     private String tid ;
-    /** 接口表主键,; */
+    @Schema(description = "接口表主键")
     private String iid ;
-    /** 是否支持回调,yes支持，no不支持,; */
+    @Schema(description = "是否支持回调,yes支持，no不支持")
     private String isCallback ;
-    /** 回调地址(回调url),回调的url，只有在支持回调时才有,; */
+    @Schema(description = "回调地址(回调url),回调的url，只有在支持回调时才有")
     private String callbackUrl ;
-    /** 回调次数,尝试回调的次数，超过次数则不再回调,; */
+    @Schema(description = "回调次数,尝试回调的次数，超过次数则不再回调")
     private int callbackNum ;
-    /** 创建时间,; */
+    @Schema(description = "创建时间")
     private LocalDateTime addTime ;
-    /** 更新时间,; */
+    @Schema(description = "更新时间")
     private LocalDateTime updateTime ;
-    /** 创建人id,; */
+    @Schema(description = "创建人id")
     private String addUserId ;
-    /** 更新人id,; */
+    @Schema(description = "更新人id")
     private String updateUserId ;
-    /** 创建人姓名,; */
+    @Schema(description = "创建人姓名")
     private String addUserName ;
-    /** 更新人姓名,; */
+    @Schema(description = "更新人姓名")
     private String updateUserName ;
 }

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

@@ -1,5 +1,6 @@
 package com.hr.vo;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -13,28 +14,28 @@ import java.time.LocalDateTime;
  
 @Data
 public class IpTokenVO implements Serializable,Cloneable{
-    /** 主键,; */
+    @Schema(description = "主键")
     private Long id ;
-    /** 账户表主键,; */
+    @Schema(description = "账户表主键")
     private Long aid ;
-    /** token值,; */
+    @Schema(description = "token值")
     private String token ;
-    /** 密钥值,; */
+    @Schema(description = "密钥值")
     private String secret ;
-    /** 备注,; */
+    @Schema(description = "备注")
     private String remark ;
-    /** 状态,normal 有效，disable 禁用，delete 删除,; */
+    @Schema(description = "状态,normal 有效，disable 禁用，delete 删除")
     private String tokenStatus ;
-    /** 创建时间,; */
+    @Schema(description = "创建时间")
     private LocalDateTime addTime ;
-    /** 更新时间,; */
+    @Schema(description = "更新时间")
     private LocalDateTime updateTime ;
-    /** 创建人id,; */
+    @Schema(description = "创建人id")
     private String addUserId ;
-    /** 更新人id,; */
+    @Schema(description = "更新人id")
     private String updateUserId ;
-    /** 创建人姓名,; */
+    @Schema(description = "创建人姓名")
     private String addUserName ;
-    /** 更新人姓名,; */
+    @Schema(description = "更新人姓名")
     private String updateUserName ;
 }

src/main/resources/mapper/IpLogMapper.xml

@@ -16,6 +16,6 @@
             log.add_time
         from ip_log log
         left join ip_order ord on ord.id = log.oid
-        where 1 =1 and ref_id = 0 and  log.id =:id and ord.acc_no = :accountNo and  ord.interface_name like '%'||:interfaceName||'%'
+        where 1 =1 and ref_id = 0 and  ord.id =:id and ord.acc_no = :accountNo and  ord.interface_name like '%'||:interfaceName||'%'
     </select>
 </mapper>