feat(infrared): 添加公司关联红外电表功能并优化数据处理- 新增 CompanyElectric 相关实体、Mapper、Service 及 Controller

- 实现公司关联红外电表的 CRUD 功能
-优化红外电表数据处理，增加分页查询、批量删除等功能- 修复 MessageHandler 中的内存泄漏问题
- 优化 SmartEmploymentController 中的返回结果

electricity-service/src/main/java/com/zksy/electricity/utils/MessageHandler.java

@@ -8,6 +8,7 @@ import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.util.ReferenceCountUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -55,6 +56,9 @@ public class MessageHandler extends ChannelInboundHandlerAdapter {
 		} catch (InvalidMessageException e) {
 			logger.error("数据校验失败: {}", e.getMessage());
 			ctx.writeAndFlush(Unpooled.copiedBuffer("数据校验失败".getBytes()));
+		}finally {
+			// 关键修复：释放ByteBuf资源，防止内存泄漏
+			ReferenceCountUtil.release(msg);
 		}
 	}
 	// 校验消息的方法

environment-hj212-service/src/main/java/com/zksy/environmentHJ212/config/ServerHandler.java

@@ -5,6 +5,7 @@ import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.util.ReferenceCountUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -19,6 +20,7 @@ public class ServerHandler extends ChannelInboundHandlerAdapter {
 
     @Autowired
     private MonitorDatasynch monitorDatasynch;
+
     @PostConstruct
     public void init() {
         log.info("init()方法");
@@ -33,16 +35,7 @@ public class ServerHandler extends ChannelInboundHandlerAdapter {
     public void channelActive(ChannelHandlerContext ctx) throws Exception {
         log.info("客户端与服务端连接开始...");
         NettyConfig.group.add(ctx.channel());
-        /**
-         * 往客户端发送消息
-         */
-        /*String helo = "QN=20250530141057223;ST=32;CN=2031;PW=123456;MN=0152316A279055;Flag=5;CP=&&BeginTime=20250529000000;EndTime=20250530000000&&";
-        ByteBuf byteBuf = Unpooled.wrappedBuffer(helo.getBytes());
-        ctx.channel().writeAndFlush(byteBuf);
-        System.out.println("首次连接完成!"+byteBuf);
-        String helo2 = "QN=20250530141057223;ST=32;CN=2031;PW=123456;MN=1234567901234;Flag=5;CP=&&BeginTime=20250529000000;EndTime=20250530000000&&";
-        ByteBuf byteBuf3 = Unpooled.wrappedBuffer(helo2.getBytes());
-        ctx.channel().writeAndFlush(byteBuf3);*/
+        // 往客户端发送消息的代码（注释部分）若启用，也需注意ByteBuf释放
     }
 
     /**
@@ -68,12 +61,12 @@ public class ServerHandler extends ChannelInboundHandlerAdapter {
      */
     @Override
     public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
-        cause.printStackTrace();
+        log.error("发生异常", cause);
         ctx.close();
     }
 
     /**
-     * 服务端处理客户端websocket请求的核心方法，这里接收了客户端发来的信息
+     * 服务端处理客户端请求的核心方法
      */
     @Override
     public void channelRead(ChannelHandlerContext channelHandlerContext, Object info) throws Exception {
@@ -82,13 +75,14 @@ public class ServerHandler extends ChannelInboundHandlerAdapter {
             byte[] req = new byte[buf.readableBytes()];
             buf.readBytes(req);
             String msg = new String(req);
-            System.out.println(msg+"==============");
-            log.info("==========数据已接收,接收时间：==========" + LocalDateTime.now());
-            String pushMonitorDataStr = serverHandler.monitorDatasynch.pushMonitorData(channelHandlerContext,msg);
+            log.info("接收数据: {}, 时间: {}", msg, LocalDateTime.now());
+
+            // 调用业务方法处理数据
+            String pushMonitorDataStr = serverHandler.monitorDatasynch.pushMonitorData(channelHandlerContext, msg);
         } catch (Exception e) {
-            log.info("==========数据错误==========");
-            e.printStackTrace();
+            log.error("数据处理错误", e);
         } finally {
+            ReferenceCountUtil.release(info);
             channelHandlerContext.flush();
         }
     }

infrared-reading-meter-service/src/main/java/com/zksy/infrared/controller/CompanyElectricController.java

@@ -0,0 +1,61 @@
+package com.zksy.infrared.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zksy.common.core.domain.Result;
+import com.zksy.common.utils.SearchUtil;
+import com.zksy.infrared.domain.CompanyElectric;
+import com.zksy.infrared.service.CompanyElectricService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+
+/**
+ * @author Administrator
+ * @version 1.0
+ * @project dh-server-micro
+ * @description 公司关联红外电表控制层
+ * @date 2025/9/15 16:56:35
+ */
+@RestController
+@RequestMapping("/companyElectric")
+@Api(tags = "公司关联红外电表",description = "公司关联红外电表desc")
+public class CompanyElectricController {
+
+    @Autowired
+    private CompanyElectricService service;
+
+    @GetMapping("/findByPage")
+    @ApiOperation(value = "分页查询")
+    public Result findByPage(long pageNum, long pageSize, String conditionJson) throws Exception {
+        Page<CompanyElectric> page = service.page(new Page<>(pageNum, pageSize), SearchUtil.parseWhereSql(conditionJson));
+        return Result.ok(page);
+    }
+    @GetMapping("/getAll")
+    @ApiOperation(value = "查询所有")
+    public Result getAll(String conditionJson) throws Exception {
+        return Result.ok(service.list(SearchUtil.parseWhereSql(conditionJson)));
+    }
+    @GetMapping("/getById/{id}")
+    @ApiOperation(value = "根据id查询")
+    public Result getById(@PathVariable String id) throws Exception {
+        return Result.ok(service.getById(id));
+    }
+    @PostMapping("/save")
+    @ApiOperation(value = "保存")
+    public Result save(@RequestBody CompanyElectric entity) throws Exception {
+        return Result.ok(service.save(entity));
+    }
+    @PostMapping("/update")
+    @ApiOperation(value = "更新")
+    public Result update(@RequestBody CompanyElectric entity) throws Exception {
+        return Result.ok(service.updateById(entity));
+    }
+    @PostMapping("/deleteBatch")
+    @ApiOperation(value = "批量删除")
+    public Result deleteBatch(@RequestBody String[] ids) throws Exception {
+        return Result.ok(service.removeByIds(Arrays.asList(ids)));
+    }
+}

infrared-reading-meter-service/src/main/java/com/zksy/infrared/controller/InfraredReadingMeterController.java

@@ -9,6 +9,7 @@ import com.zksy.infrared.domain.vo.MeterMonthDataVo;
 import com.zksy.infrared.domain.vo.MeterQuarterDataVo;
 import com.zksy.infrared.domain.vo.MeterYearDataVo;
 import com.zksy.infrared.service.InfraredReadingMeterService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -16,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author Administrator
@@ -24,6 +26,7 @@ import java.util.List;
  * @description 红外读电表
  * @date 2025/2/10 15:00:46
  */
+@Api(tags = "红外电表信息",description = "红外电表信息desc")
 @RequestMapping("/infraredReadingMeter")
 @RestController
 public class InfraredReadingMeterController {
@@ -84,4 +87,10 @@ public class InfraredReadingMeterController {
         MeterMonthDataVo vo=service.selectByCurrentYearselectByCurrentYearAndCurrentMonthWithDayData();
         return Result.ok(vo);
     }
+
+    @GetMapping("/dailyAndTotalMap")
+    @ApiOperation(value = "电表分组查询")
+    public List<Map<String, Object>> getDailyAndTotalElectricityAsMap() {
+        return service.getDailyAndTotalElectricityAsMap();
+    }
 }

infrared-reading-meter-service/src/main/java/com/zksy/infrared/domain/CompanyElectric.java

@@ -0,0 +1,41 @@
+package com.zksy.infrared.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 公司关联红外电表
+ * @TableName company_electric
+ */
+@TableName(value ="company_electric")
+@Data
+public class CompanyElectric implements Serializable {
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 公司名称
+     */
+    private String companyName;
+
+    /**
+     * 电表号
+     */
+    private String electricNumber;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

infrared-reading-meter-service/src/main/java/com/zksy/infrared/mapper/CompanyElectricMapper.java

@@ -0,0 +1,18 @@
+package com.zksy.infrared.mapper;
+
+import com.zksy.infrared.domain.CompanyElectric;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author Administrator
+* @description 针对表【company_electric(公司关联红外电表)】的数据库操作Mapper
+* @createDate 2025-09-15 16:53:51
+* @Entity com.zksy.infrared.domain.CompanyElectric
+*/
+public interface CompanyElectricMapper extends BaseMapper<CompanyElectric> {
+
+}
+
+
+
+

infrared-reading-meter-service/src/main/java/com/zksy/infrared/service/CompanyElectricService.java

@@ -0,0 +1,13 @@
+package com.zksy.infrared.service;
+
+import com.zksy.infrared.domain.CompanyElectric;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author Administrator
+* @description 针对表【company_electric(公司关联红外电表)】的数据库操作Service
+* @createDate 2025-09-15 16:53:51
+*/
+public interface CompanyElectricService extends IService<CompanyElectric> {
+
+}

infrared-reading-meter-service/src/main/java/com/zksy/infrared/service/InfraredReadingMeterService.java

@@ -8,6 +8,7 @@ import com.zksy.infrared.domain.vo.MeterQuarterDataVo;
 import com.zksy.infrared.domain.vo.MeterYearDataVo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
 * @author Administrator
@@ -27,4 +28,11 @@ public interface InfraredReadingMeterService extends IService<InfraredReadingMet
     MeterMonthDataVo selectByCurrentYearselectByCurrentYearAndCurrentMonthWithDayData();
 
     MeterQuarterDataVo selectByCurrentQuarterData();
+
+    /**
+     * 查询所有电表的「当日用电量」和「当前总用电量」，返回List<Map>
+     * 排除电表号和耗电量为空的情况
+     * @return 封装结果的Map列表
+     */
+    List<Map<String, Object>> getDailyAndTotalElectricityAsMap();
 }

infrared-reading-meter-service/src/main/java/com/zksy/infrared/service/impl/CompanyElectricServiceImpl.java

@@ -0,0 +1,22 @@
+package com.zksy.infrared.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.infrared.domain.CompanyElectric;
+import com.zksy.infrared.service.CompanyElectricService;
+import com.zksy.infrared.mapper.CompanyElectricMapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author Administrator
+* @description 针对表【company_electric(公司关联红外电表)】的数据库操作Service实现
+* @createDate 2025-09-15 16:53:51
+*/
+@Service
+public class CompanyElectricServiceImpl extends ServiceImpl<CompanyElectricMapper, CompanyElectric>
+    implements CompanyElectricService{
+
+}
+
+
+
+

infrared-reading-meter-service/src/main/java/com/zksy/infrared/service/impl/InfraredReadingMeterServiceImpl.java

@@ -3,13 +3,16 @@ package com.zksy.infrared.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zksy.common.exception.CommonException;
+import com.zksy.infrared.domain.CompanyElectric;
 import com.zksy.infrared.domain.InfraredReadingMeter;
 import com.zksy.infrared.domain.vo.MeterDayDataVo;
 import com.zksy.infrared.domain.vo.MeterMonthDataVo;
 import com.zksy.infrared.domain.vo.MeterQuarterDataVo;
 import com.zksy.infrared.domain.vo.MeterYearDataVo;
+import com.zksy.infrared.service.CompanyElectricService;
 import com.zksy.infrared.service.InfraredReadingMeterService;
 import com.zksy.infrared.mapper.InfraredReadingMeterMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -33,6 +36,8 @@ public class InfraredReadingMeterServiceImpl extends ServiceImpl<InfraredReading
     private static final List<BigDecimal> DEFAULT_DAY_LIST = Collections.nCopies(31, BigDecimal.ZERO);
     // 工具方法：生成默认季数据列表
     private static final List<BigDecimal> DEFAULT_QUARTER_LIST = Collections.nCopies(3, new BigDecimal("0.00"));
+    @Autowired
+    private CompanyElectricService companyElectricService;
 
     @Override
     public MeterYearDataVo selectByYear(Integer year, String meterNumber) {
@@ -400,4 +405,90 @@ public class InfraredReadingMeterServiceImpl extends ServiceImpl<InfraredReading
 
         return new MeterQuarterDataVo(totalQuarterElectricity,monthDataList);
     }
+    @Override
+    public List<Map<String, Object>> getDailyAndTotalElectricityAsMap() {
+        // 确定当日时间范围
+        LocalDate today = LocalDate.now();
+        Date startOfDay = Date.from(today.atStartOfDay(ZoneId.systemDefault()).toInstant());
+        Date endOfDay = Date.from(today.plusDays(1).atStartOfDay(ZoneId.systemDefault()).toInstant());
+
+        // 获取所有有效的电表号（非空且有总电量记录）
+        LambdaQueryWrapper<InfraredReadingMeter> allMeterQuery = new LambdaQueryWrapper<>();
+        allMeterQuery.isNotNull(InfraredReadingMeter::getElectricNumber)
+                .isNotNull(InfraredReadingMeter::getElectricEnergy)
+                .groupBy(InfraredReadingMeter::getElectricNumber); // 去重获取所有电表号
+        List<String> allValidMeterNumbers = list(allMeterQuery).stream()
+                .map(InfraredReadingMeter::getElectricNumber)
+                .filter(Objects::nonNull)
+                .filter(num -> !num.trim().isEmpty())
+                .collect(Collectors.toList());
+
+        // 查询当日所有有效记录（用于计算当日用电量）
+        LambdaQueryWrapper<InfraredReadingMeter> todayQuery = new LambdaQueryWrapper<>();
+        todayQuery.between(InfraredReadingMeter::getCreateTime, startOfDay, endOfDay)
+                .isNotNull(InfraredReadingMeter::getElectricNumber)
+                .isNotNull(InfraredReadingMeter::getElectricEnergy)
+                .orderByAsc(InfraredReadingMeter::getCreateTime);
+        List<InfraredReadingMeter> todayRecords = list(todayQuery);
+
+        // 按电表号分组存储当日记录
+        Map<String, List<InfraredReadingMeter>> todayRecordsByMeter = todayRecords.stream()
+                .collect(Collectors.groupingBy(InfraredReadingMeter::getElectricNumber));
+
+        // 查询所有电表的最新总电量记录
+        LambdaQueryWrapper<InfraredReadingMeter> latestQuery = new LambdaQueryWrapper<>();
+        latestQuery.isNotNull(InfraredReadingMeter::getElectricNumber)
+                .isNotNull(InfraredReadingMeter::getElectricEnergy);
+        List<InfraredReadingMeter> allRecords = list(latestQuery);
+
+        // 按电表号分组，取最新记录（创建时间最晚）
+        Map<String, InfraredReadingMeter> latestRecordsByMeter = allRecords.stream()
+                .collect(Collectors.groupingBy(InfraredReadingMeter::getElectricNumber,
+                        Collectors.collectingAndThen(
+                                Collectors.maxBy(Comparator.comparing(InfraredReadingMeter::getCreateTime)),
+                                Optional::get)));
+
+        // 组装结果（保留两位小数）
+        List<Map<String, Object>> result = new ArrayList<>();
+        for (String electricNumber : allValidMeterNumbers) {
+            Map<String, Object> meterMap = new HashMap<>(4);
+            meterMap.put("electricNumber", electricNumber);
+
+            LambdaQueryWrapper<CompanyElectric> companyElectricQuery = new LambdaQueryWrapper<>();
+            companyElectricQuery.eq(CompanyElectric::getElectricNumber, electricNumber);
+            CompanyElectric companyElectric = companyElectricService.getOne(companyElectricQuery);
+            meterMap.put("companyName", companyElectric == null ? "" : companyElectric.getCompanyName());
+
+            // 获取该电表的最新总电量（保留两位小数）
+            InfraredReadingMeter latestRecord = latestRecordsByMeter.get(electricNumber);
+            if (latestRecord == null || latestRecord.getElectricEnergy() == null) {
+                continue; // 排除总电量为空的电表
+            }
+            BigDecimal totalElectricity = BigDecimal.valueOf(latestRecord.getElectricEnergy())
+                    .setScale(2, RoundingMode.HALF_UP); // 四舍五入保留两位小数
+            meterMap.put("totalElectricity", totalElectricity);
+
+            // 计算当日用电量（无数据则为0，保留两位小数）
+            List<InfraredReadingMeter> todayMeterRecords = todayRecordsByMeter.getOrDefault(electricNumber, Collections.emptyList());
+            BigDecimal dailyElectricity;
+            if (todayMeterRecords.size() >= 2) {
+                InfraredReadingMeter first = todayMeterRecords.get(0);
+                InfraredReadingMeter last = todayMeterRecords.get(todayMeterRecords.size() - 1);
+                if (first.getElectricEnergy() != null && last.getElectricEnergy() != null) {
+                    double diff = last.getElectricEnergy() - first.getElectricEnergy();
+                    dailyElectricity = BigDecimal.valueOf(diff)
+                            .setScale(2, RoundingMode.HALF_UP);
+                } else {
+                    dailyElectricity = BigDecimal.ZERO.setScale(2); // 数据异常时设为0.00
+                }
+            } else {
+                dailyElectricity = BigDecimal.ZERO.setScale(2); // 当日无数据或记录不足，设为0.00
+            }
+            meterMap.put("dailyElectricity", dailyElectricity);
+
+            result.add(meterMap);
+        }
+
+        return result;
+    }
 }

infrared-reading-meter-service/src/main/resources/mapper/CompanyElectricMapper.xml

@@ -0,0 +1,18 @@
+<?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.zksy.infrared.mapper.CompanyElectricMapper">
+
+    <resultMap id="BaseResultMap" type="com.zksy.infrared.domain.CompanyElectric">
+            <id property="id" column="id" jdbcType="BIGINT"/>
+            <result property="companyName" column="company_name" jdbcType="VARCHAR"/>
+            <result property="electricNumber" column="electric_number" jdbcType="VARCHAR"/>
+            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,company_name,electric_number,
+        create_time
+    </sql>
+</mapper>

park-overview-service/pom.xml

@@ -7,7 +7,7 @@
         <artifactId>dh-server-micro</artifactId>
         <version>1.0.0</version>
     </parent>
-    <artifactId>park-service</artifactId>
+    <artifactId>park-overview-service</artifactId>
 
     <groupId>com.zksy.park</groupId>
     <properties>

park-overview-service/src/main/java/com/zksy/park/controller/SmartEmploymentController.java

@@ -40,8 +40,8 @@ public class SmartEmploymentController {
 
     @GetMapping("/findByPage")
     @ApiOperation(value = "智慧用工信息分页")
-    public Page findByPage(long pageNum, long pageSize, String conditionJson) throws Exception {
-        return service.page(new Page<>(pageNum, pageSize), SearchUtil.parseWhereSql(conditionJson));
+    public Result findByPage(long pageNum, long pageSize, String conditionJson) throws Exception {
+        return Result.ok(service.page(new Page<>(pageNum, pageSize), SearchUtil.parseWhereSql(conditionJson)));
     }
 
     @GetMapping("/getList")
@@ -56,7 +56,7 @@ public class SmartEmploymentController {
     public Result<Object> save(@RequestBody SmartEmployment entity) {
         entity.setCreateTime(new DateTime().toLocalDateTime());
         entity.setUpdateTime(new DateTime().toLocalDateTime());
-        return Result.ok(service.save(entity));
+        return Result.ok(service.save(entity),"新增成功");
     }
 
     @PostMapping("/saveBatch")
@@ -67,7 +67,7 @@ public class SmartEmploymentController {
             q.setUpdateTime(new DateTime().toLocalDateTime());
             q.setCreateTime(new DateTime().toLocalDateTime());
         });
-        return Result.ok(service.saveBatch(entityList));
+        return Result.ok(service.saveBatch(entityList),"新增成功");
     }
 
     @PutMapping("/updateById")
@@ -75,21 +75,21 @@ public class SmartEmploymentController {
     @Log(title = "修改智慧用工信息", businessType = BusinessType.UPDATE)
     public Result<Object> updateById(@RequestBody SmartEmployment entity) {
         entity.setUpdateTime(new DateTime().toLocalDateTime());
-        return Result.ok(service.updateById(entity));
+        return Result.ok(service.updateById(entity),"修改成功");
     }
 
     @DeleteMapping("/deleteById")
     @ApiOperation(value = "智慧用工信息删除")
     @Log(title = "删除智慧用工信息", businessType = BusinessType.DELETE)
     public Result<Object> deleteById(String id) {
-        return Result.ok(service.removeById(id));
+        return Result.ok(service.removeById(id),"删除成功");
     }
 
     @DeleteMapping("/deleteBatchById")
     @ApiOperation(value = "智慧用工信息批量删除")
     @Log(title = "智慧用工信息批量删除", businessType = BusinessType.DELETE)
     public Result<Object> deleteBatchById(@RequestParam List<String> ids) {
-        return Result.ok(service.removeByIds(ids));
+        return Result.ok(service.removeByIds(ids),"删除成功");
     }
 
     @GetMapping("/exportExcel")

visualization-service/src/main/java/com/zksy/visualization/domain/response/RealTimeDataResponse.java

@@ -1,8 +1,6 @@
 package com.zksy.visualization.domain.response;
 
-import io.minio.messages.Item;
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.models.auth.In;
 import lombok.Data;
 
 import java.util.List;

zksy-common/src/main/java/com/zksy/common/core/domain/Result.java

@@ -20,6 +20,10 @@ public class Result<T> {
     public static <T> Result<T> ok(T data) {
         return new Result<>(200, "OK", data);
     }
+
+    public static <T> Result<T> ok(T data,String msg) {
+        return new Result<>(200, msg, data);
+    }
     /**
      * 返回错误消息
      *