充值机信息和用户充值记录的逻辑实现以及用户充值卡账单明细和用户充值卡接口修改

fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/NgRechargeMachines.java

@@ -0,0 +1,76 @@
+package com.fastbee.rechargecard.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.fastbee.common.annotation.Excel;
+import com.fastbee.common.core.domain.BaseEntity;
+
+/**
+ * 充值机信息对象 ng_recharge_machines
+ *
+ * @author kerwincui
+ * @date 2024-12-19
+ */
+@ApiModel(value = "NgRechargeMachines",description = "充值机信息 ng_recharge_machines")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class NgRechargeMachines extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 充值机id，自增主键 */
+    private Long id;
+
+    /** 位置 */
+    @Excel(name = "位置")
+    @ApiModelProperty("位置")
+    private String location;
+
+    /** 设备型号 */
+    @Excel(name = "设备型号")
+    @ApiModelProperty("设备型号")
+    private String deviceModel;
+
+    /** 序列号 */
+    @Excel(name = "序列号")
+    @ApiModelProperty("序列号")
+    private String serialNumber;
+
+    /** 区域号 */
+    @Excel(name = "区域号")
+    @ApiModelProperty("区域号")
+    private String areaCode;
+
+    /** 安装日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "安装日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("安装日期")
+    private Date installationDate;
+
+    /** 状态,0=正常，1=维护中 */
+    @Excel(name = "状态,0=正常，1=维护中")
+    @ApiModelProperty("状态,0=正常，1=维护中")
+    private Integer status;
+
+    /** 联系人 */
+    @Excel(name = "联系人")
+    @ApiModelProperty("联系人")
+    private String contactPerson;
+
+    /** 联系电话 */
+    @Excel(name = "联系电话")
+    @ApiModelProperty("联系电话")
+    private String contactPhone;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    @ApiModelProperty("备注")
+    private String remark;
+
+}

fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/NgUserRechargeRecords.java

@@ -0,0 +1,92 @@
+package com.fastbee.rechargecard.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.fastbee.common.annotation.Excel;
+import com.fastbee.common.core.domain.BaseEntity;
+
+/**
+ * 用户充值记录对象 ng_user_recharge_records
+ *
+ * @author kerwincui
+ * @date 2024-12-19
+ */
+@ApiModel(value = "NgUserRechargeRecords",description = "用户充值记录 ng_user_recharge_records")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class NgUserRechargeRecords extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键ID */
+    private Long id;
+
+    /** 用户id，与用户表连接 */
+    @Excel(name = "用户id，与用户表连接")
+    @ApiModelProperty("用户id，与用户表连接")
+    private Long userId;
+
+    /** 用户名 */
+    @Excel(name = "用户名")
+    @ApiModelProperty("用户名")
+    private String userName;
+
+    /** 充值卡号 */
+    @Excel(name = "充值卡号")
+    @ApiModelProperty("充值卡号")
+    private String cardNumber;
+
+    /** 区域号 */
+    @Excel(name = "区域号")
+    @ApiModelProperty("区域号")
+    private String areaCode;
+
+    /** 充值类型，0=充值机，1=微信，2=支付宝 */
+    @Excel(name = "充值类型，0=充值机，1=微信，2=支付宝")
+    @ApiModelProperty("充值类型，0=充值机，1=微信，2=支付宝")
+    private Integer type;
+
+    /** 充值金额 */
+    @Excel(name = "充值金额")
+    @ApiModelProperty("充值金额")
+    private BigDecimal amount;
+
+    /** 卡内余额（充值后余额） */
+    @Excel(name = "卡内余额", readConverterExp = "充=值后余额")
+    @ApiModelProperty("卡内余额")
+    private BigDecimal balance;
+
+    /** 充值时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "充值时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("充值时间")
+    private Date rechargeTime;
+
+    /** 充值编码 */
+    @Excel(name = "充值编码")
+    @ApiModelProperty("充值编码")
+    private String rechargeCode;
+
+    /** 充值状态,0=成功，1=失败 */
+    @Excel(name = "充值状态,0=成功，1=失败")
+    @ApiModelProperty("充值状态,0=成功，1=失败")
+    private Integer status;
+
+    /** 充值机id */
+    @Excel(name = "充值机id")
+    @ApiModelProperty("充值机id")
+    private Long deviceId;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    @ApiModelProperty("备注")
+    private String remark;
+
+}

fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/UserRechargeCards.java

@@ -93,4 +93,9 @@ public class UserRechargeCards extends BaseEntity
     @ApiModelProperty("终端用户id")
     private Long userId;
 
+    /** 区域码 */
+    @Excel(name = "区域码")
+    @ApiModelProperty("区域码")
+    private String areaCode;
+
 }

fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/dto/UserIrrigationRecordDto.java

@@ -8,6 +8,7 @@ import java.util.Date;
 
 public class UserIrrigationRecordDto
 {
+    public Long id;
     public String userName;
     public String deviceName;
     public String cardNumber;

fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/mapper/NgRechargeMachinesMapper.java

@@ -0,0 +1,63 @@
+package com.fastbee.rechargecard.mapper;
+
+import java.util.List;
+import com.fastbee.rechargecard.domain.NgRechargeMachines;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 充值机信息Mapper接口
+ *
+ * @author kerwincui
+ * @date 2024-12-19
+ */
+@Mapper
+public interface NgRechargeMachinesMapper
+{
+    /**
+     * 查询充值机信息
+     *
+     * @param id 充值机信息主键
+     * @return 充值机信息
+     */
+    public NgRechargeMachines selectNgRechargeMachinesById(Long id);
+
+    /**
+     * 查询充值机信息列表
+     *
+     * @param ngRechargeMachines 充值机信息
+     * @return 充值机信息集合
+     */
+    public List<NgRechargeMachines> selectNgRechargeMachinesList(NgRechargeMachines ngRechargeMachines);
+
+    /**
+     * 新增充值机信息
+     *
+     * @param ngRechargeMachines 充值机信息
+     * @return 结果
+     */
+    public int insertNgRechargeMachines(NgRechargeMachines ngRechargeMachines);
+
+    /**
+     * 修改充值机信息
+     *
+     * @param ngRechargeMachines 充值机信息
+     * @return 结果
+     */
+    public int updateNgRechargeMachines(NgRechargeMachines ngRechargeMachines);
+
+    /**
+     * 删除充值机信息
+     *
+     * @param id 充值机信息主键
+     * @return 结果
+     */
+    public int deleteNgRechargeMachinesById(Long id);
+
+    /**
+     * 批量删除充值机信息
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteNgRechargeMachinesByIds(Long[] ids);
+}

fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/mapper/NgUserRechargeRecordsMapper.java

@@ -0,0 +1,63 @@
+package com.fastbee.rechargecard.mapper;
+
+import java.util.List;
+import com.fastbee.rechargecard.domain.NgUserRechargeRecords;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 用户充值记录Mapper接口
+ *
+ * @author kerwincui
+ * @date 2024-12-19
+ */
+@Mapper
+public interface NgUserRechargeRecordsMapper
+{
+    /**
+     * 查询用户充值记录
+     *
+     * @param userId 用户id
+     * @return 用户充值记录
+     */
+    public NgUserRechargeRecords selectNgUserRechargeRecordsById(Long userId);
+
+    /**
+     * 查询用户充值记录列表
+     *
+     * @param ngUserRechargeRecords 用户充值记录
+     * @return 用户充值记录集合
+     */
+    public List<NgUserRechargeRecords> selectNgUserRechargeRecordsList(NgUserRechargeRecords ngUserRechargeRecords);
+
+    /**
+     * 新增用户充值记录
+     *
+     * @param ngUserRechargeRecords 用户充值记录
+     * @return 结果
+     */
+    public int insertNgUserRechargeRecords(NgUserRechargeRecords ngUserRechargeRecords);
+
+    /**
+     * 修改用户充值记录
+     *
+     * @param ngUserRechargeRecords 用户充值记录
+     * @return 结果
+     */
+    public int updateNgUserRechargeRecords(NgUserRechargeRecords ngUserRechargeRecords);
+
+    /**
+     * 删除用户充值记录
+     *
+     * @param id 用户充值记录主键
+     * @return 结果
+     */
+    public int deleteNgUserRechargeRecordsById(Long id);
+
+    /**
+     * 批量删除用户充值记录
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteNgUserRechargeRecordsByIds(Long[] ids);
+}

fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/INgRechargeMachinesService.java

@@ -0,0 +1,61 @@
+package com.fastbee.rechargecard.service;
+
+import java.util.List;
+import com.fastbee.rechargecard.domain.NgRechargeMachines;
+
+/**
+ * 充值机信息Service接口
+ *
+ * @author kerwincui
+ * @date 2024-12-19
+ */
+public interface INgRechargeMachinesService
+{
+    /**
+     * 查询充值机信息
+     *
+     * @param id 充值机信息主键
+     * @return 充值机信息
+     */
+    public NgRechargeMachines selectNgRechargeMachinesById(Long id);
+
+    /**
+     * 查询充值机信息列表
+     *
+     * @param ngRechargeMachines 充值机信息
+     * @return 充值机信息集合
+     */
+    public List<NgRechargeMachines> selectNgRechargeMachinesList(NgRechargeMachines ngRechargeMachines);
+
+    /**
+     * 新增充值机信息
+     *
+     * @param ngRechargeMachines 充值机信息
+     * @return 结果
+     */
+    public int insertNgRechargeMachines(NgRechargeMachines ngRechargeMachines);
+
+    /**
+     * 修改充值机信息
+     *
+     * @param ngRechargeMachines 充值机信息
+     * @return 结果
+     */
+    public int updateNgRechargeMachines(NgRechargeMachines ngRechargeMachines);
+
+    /**
+     * 批量删除充值机信息
+     *
+     * @param ids 需要删除的充值机信息主键集合
+     * @return 结果
+     */
+    public int deleteNgRechargeMachinesByIds(Long[] ids);
+
+    /**
+     * 删除充值机信息信息
+     *
+     * @param id 充值机信息主键
+     * @return 结果
+     */
+    public int deleteNgRechargeMachinesById(Long id);
+}

fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/INgUserRechargeRecordsService.java

@@ -0,0 +1,61 @@
+package com.fastbee.rechargecard.service;
+
+import java.util.List;
+import com.fastbee.rechargecard.domain.NgUserRechargeRecords;
+
+/**
+ * 用户充值记录Service接口
+ *
+ * @author kerwincui
+ * @date 2024-12-19
+ */
+public interface INgUserRechargeRecordsService
+{
+    /**
+     * 查询用户充值记录
+     *
+     * @param userId 用户id
+     * @return 用户充值记录
+     */
+    public NgUserRechargeRecords selectNgUserRechargeRecordsById(Long userId);
+
+    /**
+     * 查询用户充值记录列表
+     *
+     * @param ngUserRechargeRecords 用户充值记录
+     * @return 用户充值记录集合
+     */
+    public List<NgUserRechargeRecords> selectNgUserRechargeRecordsList(NgUserRechargeRecords ngUserRechargeRecords);
+
+    /**
+     * 新增用户充值记录
+     *
+     * @param ngUserRechargeRecords 用户充值记录
+     * @return 结果
+     */
+    public int insertNgUserRechargeRecords(NgUserRechargeRecords ngUserRechargeRecords);
+
+    /**
+     * 修改用户充值记录
+     *
+     * @param ngUserRechargeRecords 用户充值记录
+     * @return 结果
+     */
+    public int updateNgUserRechargeRecords(NgUserRechargeRecords ngUserRechargeRecords);
+
+    /**
+     * 批量删除用户充值记录
+     *
+     * @param ids 需要删除的用户充值记录主键集合
+     * @return 结果
+     */
+    public int deleteNgUserRechargeRecordsByIds(Long[] ids);
+
+    /**
+     * 删除用户充值记录信息
+     *
+     * @param id 用户充值记录主键
+     * @return 结果
+     */
+    public int deleteNgUserRechargeRecordsById(Long id);
+}

fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/IUserIrrigationRecordService.java

@@ -18,7 +18,7 @@ public interface IUserIrrigationRecordService
      * @param cardNumber 卡号
      * @return 灌溉记录
      */
-    public List<UserIrrigationRecordDto> selectUserIrrigationRecordListShowBycardNumber(String cardNumber);
+    //public List<UserIrrigationRecordDto> selectUserIrrigationRecordListShowBycardNumber(String cardNumber);
 
     /**
      * 查询用户灌溉记录列表
@@ -26,7 +26,7 @@ public interface IUserIrrigationRecordService
      * @param cardNumber 卡号
      * @return 灌溉记录
      */
-    public List<UserIrrigationRecord> selectUserIrrigationRecordListBycardNumber(String cardNumber);
+    public List<UserIrrigationRecordDto> selectUserIrrigationRecordListBycardNumber(String cardNumber);
 
     /**
      * 查询灌溉记录

fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/NgRechargeMachinesServiceImpl.java

@@ -0,0 +1,96 @@
+package com.fastbee.rechargecard.service.impl;
+
+import java.util.List;
+import com.fastbee.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.fastbee.rechargecard.mapper.NgRechargeMachinesMapper;
+import com.fastbee.rechargecard.domain.NgRechargeMachines;
+import com.fastbee.rechargecard.service.INgRechargeMachinesService;
+
+/**
+ * 充值机信息Service业务层处理
+ *
+ * @author kerwincui
+ * @date 2024-12-19
+ */
+@Service
+public class NgRechargeMachinesServiceImpl implements INgRechargeMachinesService
+{
+    @Autowired
+    private NgRechargeMachinesMapper ngRechargeMachinesMapper;
+
+    /**
+     * 查询充值机信息
+     *
+     * @param id 充值机信息主键
+     * @return 充值机信息
+     */
+    @Override
+    public NgRechargeMachines selectNgRechargeMachinesById(Long id)
+    {
+        return ngRechargeMachinesMapper.selectNgRechargeMachinesById(id);
+    }
+
+    /**
+     * 查询充值机信息列表
+     *
+     * @param ngRechargeMachines 充值机信息
+     * @return 充值机信息
+     */
+    @Override
+    public List<NgRechargeMachines> selectNgRechargeMachinesList(NgRechargeMachines ngRechargeMachines)
+    {
+        return ngRechargeMachinesMapper.selectNgRechargeMachinesList(ngRechargeMachines);
+    }
+
+    /**
+     * 新增充值机信息
+     *
+     * @param ngRechargeMachines 充值机信息
+     * @return 结果
+     */
+    @Override
+    public int insertNgRechargeMachines(NgRechargeMachines ngRechargeMachines)
+    {
+        ngRechargeMachines.setCreateTime(DateUtils.getNowDate());
+        return ngRechargeMachinesMapper.insertNgRechargeMachines(ngRechargeMachines);
+    }
+
+    /**
+     * 修改充值机信息
+     *
+     * @param ngRechargeMachines 充值机信息
+     * @return 结果
+     */
+    @Override
+    public int updateNgRechargeMachines(NgRechargeMachines ngRechargeMachines)
+    {
+        ngRechargeMachines.setUpdateTime(DateUtils.getNowDate());
+        return ngRechargeMachinesMapper.updateNgRechargeMachines(ngRechargeMachines);
+    }
+
+    /**
+     * 批量删除充值机信息
+     *
+     * @param ids 需要删除的充值机信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteNgRechargeMachinesByIds(Long[] ids)
+    {
+        return ngRechargeMachinesMapper.deleteNgRechargeMachinesByIds(ids);
+    }
+
+    /**
+     * 删除充值机信息信息
+     *
+     * @param id 充值机信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteNgRechargeMachinesById(Long id)
+    {
+        return ngRechargeMachinesMapper.deleteNgRechargeMachinesById(id);
+    }
+}

fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/NgUserRechargeRecordsServiceImpl.java

@@ -0,0 +1,96 @@
+package com.fastbee.rechargecard.service.impl;
+
+import java.util.List;
+import com.fastbee.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.fastbee.rechargecard.mapper.NgUserRechargeRecordsMapper;
+import com.fastbee.rechargecard.domain.NgUserRechargeRecords;
+import com.fastbee.rechargecard.service.INgUserRechargeRecordsService;
+
+/**
+ * 用户充值记录Service业务层处理
+ *
+ * @author kerwincui
+ * @date 2024-12-19
+ */
+@Service
+public class NgUserRechargeRecordsServiceImpl implements INgUserRechargeRecordsService
+{
+    @Autowired
+    private NgUserRechargeRecordsMapper ngUserRechargeRecordsMapper;
+
+    /**
+     * 查询用户充值记录
+     *
+     * @param userId 用户id
+     * @return 用户充值记录
+     */
+    @Override
+    public NgUserRechargeRecords selectNgUserRechargeRecordsById(Long userId)
+    {
+        return ngUserRechargeRecordsMapper.selectNgUserRechargeRecordsById(userId);
+    }
+
+    /**
+     * 查询用户充值记录列表
+     *
+     * @param ngUserRechargeRecords 用户充值记录
+     * @return 用户充值记录
+     */
+    @Override
+    public List<NgUserRechargeRecords> selectNgUserRechargeRecordsList(NgUserRechargeRecords ngUserRechargeRecords)
+    {
+        return ngUserRechargeRecordsMapper.selectNgUserRechargeRecordsList(ngUserRechargeRecords);
+    }
+
+    /**
+     * 新增用户充值记录
+     *
+     * @param ngUserRechargeRecords 用户充值记录
+     * @return 结果
+     */
+    @Override
+    public int insertNgUserRechargeRecords(NgUserRechargeRecords ngUserRechargeRecords)
+    {
+        ngUserRechargeRecords.setCreateTime(DateUtils.getNowDate());
+        return ngUserRechargeRecordsMapper.insertNgUserRechargeRecords(ngUserRechargeRecords);
+    }
+
+    /**
+     * 修改用户充值记录
+     *
+     * @param ngUserRechargeRecords 用户充值记录
+     * @return 结果
+     */
+    @Override
+    public int updateNgUserRechargeRecords(NgUserRechargeRecords ngUserRechargeRecords)
+    {
+        ngUserRechargeRecords.setUpdateTime(DateUtils.getNowDate());
+        return ngUserRechargeRecordsMapper.updateNgUserRechargeRecords(ngUserRechargeRecords);
+    }
+
+    /**
+     * 批量删除用户充值记录
+     *
+     * @param ids 需要删除的用户充值记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteNgUserRechargeRecordsByIds(Long[] ids)
+    {
+        return ngUserRechargeRecordsMapper.deleteNgUserRechargeRecordsByIds(ids);
+    }
+
+    /**
+     * 删除用户充值记录信息
+     *
+     * @param id 用户充值记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteNgUserRechargeRecordsById(Long id)
+    {
+        return ngUserRechargeRecordsMapper.deleteNgUserRechargeRecordsById(id);
+    }
+}

fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/UserIrrigationRecordServiceImpl.java

@@ -34,24 +34,15 @@ public class UserIrrigationRecordServiceImpl implements IUserIrrigationRecordSer
      * @return
      */
     @Override
-    public List<UserIrrigationRecord> selectUserIrrigationRecordListBycardNumber(String cardNumber)
-    {
-        return userIrrigationRecordMapper.selectUserIrrigationRecordListBycardNumber(cardNumber);
-    }
-
-    /**
-     * 获取用户灌溉记录展示数据列表
-     * @param cardNumber 卡号
-     * @return
-     */
-    @Override
-    public List<UserIrrigationRecordDto> selectUserIrrigationRecordListShowBycardNumber(String cardNumber)
+    public List<UserIrrigationRecordDto> selectUserIrrigationRecordListBycardNumber(String cardNumber)
     {
+        //return userIrrigationRecordMapper.selectUserIrrigationRecordListBycardNumber(cardNumber);
         List<UserIrrigationRecordDto> result=new ArrayList<>();
         List<UserIrrigationRecord> list=userIrrigationRecordMapper.selectUserIrrigationRecordListBycardNumber(cardNumber);
         for(int i=0;i<list.size();i++)
         {
             UserIrrigationRecordDto temp=new UserIrrigationRecordDto();
+            temp.id=list.get(i).getId();
             temp.userName= sysUserMapper.selectUserById(list.get(i).getUserId()).getUserName();
             temp.deviceName=deviceMapper.selectDeviceBySerialNumber(list.get(i).getDeviceNumber()).getDeviceName();
             temp.cardNumber=list.get(i).getCardNumber();
@@ -64,6 +55,32 @@ public class UserIrrigationRecordServiceImpl implements IUserIrrigationRecordSer
         return result;
     }
 
+    /**
+     * 获取用户灌溉记录展示数据列表
+     * @param cardNumber 卡号
+     * @return
+     */
+    /*@Override
+    public List<UserIrrigationRecordDto> selectUserIrrigationRecordListShowBycardNumber(String cardNumber)
+    {
+        List<UserIrrigationRecordDto> result=new ArrayList<>();
+        List<UserIrrigationRecord> list=userIrrigationRecordMapper.selectUserIrrigationRecordListBycardNumber(cardNumber);
+        for(int i=0;i<list.size();i++)
+        {
+            UserIrrigationRecordDto temp=new UserIrrigationRecordDto();
+            temp.id=list.get(i).getId();
+            temp.userName= sysUserMapper.selectUserById(list.get(i).getUserId()).getUserName();
+            temp.deviceName=deviceMapper.selectDeviceBySerialNumber(list.get(i).getDeviceNumber()).getDeviceName();
+            temp.cardNumber=list.get(i).getCardNumber();
+            temp.flow=list.get(i).getCurFlow();
+            temp.startTime=list.get(i).getStartTime();
+            temp.endTime=list.get(i).getEndTime();
+            result.add(temp);
+        }
+
+        return result;
+    }*/
+
     /**
      * 查询灌溉记录
      *