From acee3ec648c98a29c67efaa6eee416887f588185 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期一, 24 三月 2025 14:32:36 +0800
Subject: [PATCH] 电池和电源信息管理

---
 src/main/java/com/whyc/service/PowerInfService.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/whyc/service/PowerInfService.java b/src/main/java/com/whyc/service/PowerInfService.java
index ee17d7b..4ea3cf6 100644
--- a/src/main/java/com/whyc/service/PowerInfService.java
+++ b/src/main/java/com/whyc/service/PowerInfService.java
@@ -1,6 +1,7 @@
 package com.whyc.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.whyc.dto.Response;
@@ -11,6 +12,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -82,6 +84,7 @@
     }
 
     public Response add(PowerInf powerInf) {
+        powerInf.setCreateTime(new Date());
         //瀵筽owerInf鐨� devType杩涜鍒ゆ柇
         //濡傛灉devType=3,battGroupId涓�0
         //濡傛灉devType!=3,battGroupId涓烘暟鎹簱涓渶澶у��+1
@@ -90,6 +93,10 @@
             powerInf.setBattGroupId(0);
         }else{
             powerInf.setBattGroupId(mapper.selectMaxBattGroupId()+1);
+        }
+        //濡傛灉娌℃寚瀹歝hannelCount,榛樿涓�1
+        if(powerInf.getChannelCount() == null){
+            powerInf.setChannelCount(1);
         }
         mapper.insert(powerInf);
         return new Response().setII(1,"鏂板瀹屾垚");
@@ -101,6 +108,7 @@
     }
 
     public Response update(PowerInf powerInf) {
+        powerInf.setUpdateTime(new Date());
         mapper.updateById(powerInf);
         return new Response().setII(1,"淇敼瀹屾垚");
     }
@@ -108,7 +116,9 @@
     public Response getPage(int pageNum, int pageSize) {
         PageHelper helper = new PageHelper();
         helper.startPage(pageNum,pageSize);
-        List<PowerInf> powerInfs = mapper.selectList(null);
+        QueryWrapper<PowerInf> queryWrapper = Wrappers.query();
+        queryWrapper.orderByAsc("power_id");
+        List<PowerInf> powerInfs = mapper.selectList(queryWrapper);
         PageInfo<PowerInf> pageInfo = new PageInfo<>(powerInfs);
         return new Response().set(1,pageInfo);
 

--
Gitblit v1.9.1