Merge remote-tracking branch 'origin/master'

fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/NgIrrigationControllersController.java

@@ -0,0 +1,110 @@
+package com.fastbee.data.controller.userRecharge;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.fastbee.common.annotation.Log;
+import com.fastbee.common.core.controller.BaseController;
+import com.fastbee.common.core.domain.AjaxResult;
+import com.fastbee.common.enums.BusinessType;
+import com.fastbee.rechargecard.domain.NgIrrigationControllers;
+import com.fastbee.rechargecard.service.INgIrrigationControllersService;
+import com.fastbee.common.utils.poi.ExcelUtil;
+import com.fastbee.common.core.page.TableDataInfo;
+
+/**
+ * 灌溉控制器信息Controller
+ *
+ * @author kerwincui
+ * @date 2024-12-19
+ */
+@RestController
+@RequestMapping("/rechargecard/controllers")
+@Api(tags = "灌溉控制器信息")
+public class NgIrrigationControllersController extends BaseController
+{
+    @Autowired
+    private INgIrrigationControllersService ngIrrigationControllersService;
+
+    /**
+     * 查询灌溉控制器信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('rechargecard:controllers:list')")
+    @GetMapping("/list")
+    @ApiOperation("查询灌溉控制器信息列表")
+    public TableDataInfo list(NgIrrigationControllers ngIrrigationControllers)
+    {
+        startPage();
+        List<NgIrrigationControllers> list = ngIrrigationControllersService.selectNgIrrigationControllersList(ngIrrigationControllers);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出灌溉控制器信息列表
+     */
+    @ApiOperation("导出灌溉控制器信息列表")
+    @PreAuthorize("@ss.hasPermi('rechargecard:controllers:export')")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, NgIrrigationControllers ngIrrigationControllers)
+    {
+        List<NgIrrigationControllers> list = ngIrrigationControllersService.selectNgIrrigationControllersList(ngIrrigationControllers);
+        ExcelUtil<NgIrrigationControllers> util = new ExcelUtil<NgIrrigationControllers>(NgIrrigationControllers.class);
+        util.exportExcel(response, list, "灌溉控制器信息数据");
+    }
+
+    /**
+     * 获取灌溉控制器信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('rechargecard:controllers:query')")
+    @GetMapping(value = "/{id}")
+    @ApiOperation("获取灌溉控制器信息详细信息")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(ngIrrigationControllersService.selectNgIrrigationControllersById(id));
+    }
+
+    /**
+     * 新增灌溉控制器信息
+     */
+    @PreAuthorize("@ss.hasPermi('rechargecard:controllers:add')")
+    @PostMapping
+    @ApiOperation("新增灌溉控制器信息")
+    public AjaxResult add(@RequestBody NgIrrigationControllers ngIrrigationControllers)
+    {
+        return toAjax(ngIrrigationControllersService.insertNgIrrigationControllers(ngIrrigationControllers));
+    }
+
+    /**
+     * 修改灌溉控制器信息
+     */
+    @PreAuthorize("@ss.hasPermi('rechargecard:controllers:edit')")
+    @PutMapping
+    @ApiOperation("修改灌溉控制器信息")
+    public AjaxResult edit(@RequestBody NgIrrigationControllers ngIrrigationControllers)
+    {
+        return toAjax(ngIrrigationControllersService.updateNgIrrigationControllers(ngIrrigationControllers));
+    }
+
+    /**
+     * 删除灌溉控制器信息
+     */
+    @PreAuthorize("@ss.hasPermi('rechargecard:controllers:remove')")
+    @DeleteMapping("/{ids}")
+    @ApiOperation("删除灌溉控制器信息")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(ngIrrigationControllersService.deleteNgIrrigationControllersByIds(ids));
+    }
+}

fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/UserIrrigationRecordController.java

@@ -3,6 +3,7 @@ package com.fastbee.data.controller.userRecharge;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.fastbee.rechargecard.domain.dto.UserIrrigationRecordDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -65,12 +66,28 @@ public class UserIrrigationRecordController extends BaseController
     /**
      * 获取用户灌溉记录展示详细信息列表
      */
-    /*@PreAuthorize("@ss.hasPermi('rechargecard:record:query')")
+    @PreAuthorize("@ss.hasPermi('rechargecard:record:list')")
-    @GetMapping(value = "/list/show/{cardNumber}")
+    @GetMapping("/list/show")
-    @ApiOperation("获取灌溉记录详细信息")
+    @ApiOperation("查询灌溉记录列表")
-    public AjaxResult getShowInfo(@PathVariable("cardNumber") String cardNumber)
+    public TableDataInfo Showlist(UserIrrigationRecord userIrrigationRecord)
     {
-        return success(userIrrigationRecordService.selectUserIrrigationRecordListShowBycardNumber(cardNumber));
+        startPage();
+        List<UserIrrigationRecordDto> list = userIrrigationRecordService.selectUserIrrigationRecordShowList(userIrrigationRecord);
+        return getDataTable(list);
+    }
+    /**
+     * 获取用户灌溉记录展示详细信息列表
+     */
+    /*@PreAuthorize("@ss.hasPermi('rechargecard:record:list')")
+    @GetMapping("/list/show/{cardNumber}")
+    @ApiOperation("查询灌溉记录列表")
+    public TableDataInfo ShowlistByCardNumber(@PathVariable("cardNumber") String cardNumber)
+    {
+        startPage();
+        UserIrrigationRecord userIrrigationRecord=new UserIrrigationRecord();
+        userIrrigationRecord.setCardNumber(cardNumber);
+        List<UserIrrigationRecordDto> list = userIrrigationRecordService.selectUserIrrigationRecordShowList(userIrrigationRecord);
+        return getDataTable(list);
     }*/
 
     /**

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

@@ -0,0 +1,67 @@
+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_irrigation_controllers
+ *
+ * @author kerwincui
+ * @date 2024-12-19
+ */
+@ApiModel(value = "NgIrrigationControllers",description = "灌溉控制器信息 ng_irrigation_controllers")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class NgIrrigationControllers extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键ID */
+    private Long id;
+
+    /** 控制器编码 */
+    @Excel(name = "控制器编码")
+    @ApiModelProperty("控制器编码")
+    private String serialNumber;
+
+    /** 控制器名称 */
+    @Excel(name = "控制器名称")
+    @ApiModelProperty("控制器名称")
+    private String controllerName;
+
+    /** 控制器型号 */
+    @Excel(name = "控制器型号")
+    @ApiModelProperty("控制器型号")
+    private String controllerModel;
+
+    /** 安装日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "安装日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("安装日期")
+    private Date installationDate;
+
+    /** 控制器状态,0=开启，1=关闭，2=维护中 */
+    @Excel(name = "控制器状态,0=开启，1=关闭，2=维护中")
+    @ApiModelProperty("控制器状态,0=开启，1=关闭，2=维护中")
+    private Integer status;
+
+    /** 上次维护日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "上次维护日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("上次维护日期")
+    private Date lastMaintenance;
+
+    /** 区域码 */
+    @Excel(name = "区域码")
+    @ApiModelProperty("区域码")
+    private String areaCode;
+
+}

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

@@ -68,9 +68,9 @@ public class NgRechargeMachines extends BaseEntity
     @ApiModelProperty("联系电话")
     private String contactPhone;
 
-    /** 备注 */
+    /** 充值机名称 */
-    @Excel(name = "备注")
+    @Excel(name = "充值机名称")
-    @ApiModelProperty("备注")
+    @ApiModelProperty("充值机名称")
-    private String remark;
+    private String deviceName;
 
 }

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

@@ -79,14 +79,9 @@ public class NgUserRechargeRecords extends BaseEntity
     @ApiModelProperty("充值状态,0=成功，1=失败")
     private Integer status;
 
-    /** 充值机id */
+    /** 充值机编码 */
-    @Excel(name = "充值机id")
+    @Excel(name = "充值机编码")
-    @ApiModelProperty("充值机id")
+    @ApiModelProperty("充值机编码")
-    private Long deviceId;
+    private String serialNumber;
-
-    /** 备注 */
-    @Excel(name = "备注")
-    @ApiModelProperty("备注")
-    private String remark;
 
 }

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

@@ -99,19 +99,19 @@ public class UserConsumptionDetails extends BaseEntity
     private BigDecimal billingPeriodDuration;
 
     /** 账单生成的日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:MM:SS")
     @Excel(name = "账单生成的日期", width = 30, dateFormat = "yyyy-MM-dd")
     @ApiModelProperty("账单生成的日期")
     private Date billingDate;
 
     /** 开泵时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:MM:SS")
     @Excel(name = "开泵时间", width = 30, dateFormat = "yyyy-MM-dd")
     @ApiModelProperty("开泵时间")
     private Date startTime;
 
     /** 关泵时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:MM:SS")
     @Excel(name = "关泵时间", width = 30, dateFormat = "yyyy-MM-dd")
     @ApiModelProperty("关泵时间")
     private Date endTime;
@@ -127,7 +127,7 @@ public class UserConsumptionDetails extends BaseEntity
     private Integer paymentMethod;
 
     /**  账单支付的时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:MM:SS")
     @Excel(name = " 账单支付的时间", width = 30, dateFormat = "yyyy-MM-dd")
     @ApiModelProperty(" 账单支付的时间")
     private Date paymentTime;

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

@@ -74,13 +74,13 @@ public class UserIrrigationRecord extends BaseEntity
     private BigDecimal balance;
 
     /** 开泵时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:MM:SS")
     @Excel(name = "开泵时间", width = 30, dateFormat = "yyyy-MM-dd")
     @ApiModelProperty("开泵时间")
     private Date startTime;
 
     /** 关泵时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:MM:SS")
     @Excel(name = "关泵时间", width = 30, dateFormat = "yyyy-MM-dd")
     @ApiModelProperty("关泵时间")
     private Date endTime;

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

@@ -2,6 +2,7 @@ package com.fastbee.rechargecard.domain.dto;
 
 import cn.hutool.core.date.DateTime;
 import com.fastbee.rechargecard.domain.UserIrrigationRecord;
+import com.fasterxml.jackson.annotation.JsonFormat;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -13,6 +14,8 @@ public class UserIrrigationRecordDto
     public String deviceName;
     public String cardNumber;
     public BigDecimal flow;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:MM:SS")
     public Date startTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:MM:SS")
     public Date endTime;
 }

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

@@ -0,0 +1,63 @@
+package com.fastbee.rechargecard.mapper;
+
+import java.util.List;
+import com.fastbee.rechargecard.domain.NgIrrigationControllers;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 灌溉控制器信息Mapper接口
+ *
+ * @author kerwincui
+ * @date 2024-12-19
+ */
+@Mapper
+public interface NgIrrigationControllersMapper
+{
+    /**
+     * 查询灌溉控制器信息
+     *
+     * @param id 灌溉控制器信息主键
+     * @return 灌溉控制器信息
+     */
+    public NgIrrigationControllers selectNgIrrigationControllersById(Long id);
+
+    /**
+     * 查询灌溉控制器信息列表
+     *
+     * @param ngIrrigationControllers 灌溉控制器信息
+     * @return 灌溉控制器信息集合
+     */
+    public List<NgIrrigationControllers> selectNgIrrigationControllersList(NgIrrigationControllers ngIrrigationControllers);
+
+    /**
+     * 新增灌溉控制器信息
+     *
+     * @param ngIrrigationControllers 灌溉控制器信息
+     * @return 结果
+     */
+    public int insertNgIrrigationControllers(NgIrrigationControllers ngIrrigationControllers);
+
+    /**
+     * 修改灌溉控制器信息
+     *
+     * @param ngIrrigationControllers 灌溉控制器信息
+     * @return 结果
+     */
+    public int updateNgIrrigationControllers(NgIrrigationControllers ngIrrigationControllers);
+
+    /**
+     * 删除灌溉控制器信息
+     *
+     * @param id 灌溉控制器信息主键
+     * @return 结果
+     */
+    public int deleteNgIrrigationControllersById(Long id);
+
+    /**
+     * 批量删除灌溉控制器信息
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteNgIrrigationControllersByIds(Long[] ids);
+}

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

@@ -0,0 +1,61 @@
+package com.fastbee.rechargecard.service;
+
+import java.util.List;
+import com.fastbee.rechargecard.domain.NgIrrigationControllers;
+
+/**
+ * 灌溉控制器信息Service接口
+ *
+ * @author kerwincui
+ * @date 2024-12-19
+ */
+public interface INgIrrigationControllersService
+{
+    /**
+     * 查询灌溉控制器信息
+     *
+     * @param id 灌溉控制器信息主键
+     * @return 灌溉控制器信息
+     */
+    public NgIrrigationControllers selectNgIrrigationControllersById(Long id);
+
+    /**
+     * 查询灌溉控制器信息列表
+     *
+     * @param ngIrrigationControllers 灌溉控制器信息
+     * @return 灌溉控制器信息集合
+     */
+    public List<NgIrrigationControllers> selectNgIrrigationControllersList(NgIrrigationControllers ngIrrigationControllers);
+
+    /**
+     * 新增灌溉控制器信息
+     *
+     * @param ngIrrigationControllers 灌溉控制器信息
+     * @return 结果
+     */
+    public int insertNgIrrigationControllers(NgIrrigationControllers ngIrrigationControllers);
+
+    /**
+     * 修改灌溉控制器信息
+     *
+     * @param ngIrrigationControllers 灌溉控制器信息
+     * @return 结果
+     */
+    public int updateNgIrrigationControllers(NgIrrigationControllers ngIrrigationControllers);
+
+    /**
+     * 批量删除灌溉控制器信息
+     *
+     * @param ids 需要删除的灌溉控制器信息主键集合
+     * @return 结果
+     */
+    public int deleteNgIrrigationControllersByIds(Long[] ids);
+
+    /**
+     * 删除灌溉控制器信息信息
+     *
+     * @param id 灌溉控制器信息主键
+     * @return 结果
+     */
+    public int deleteNgIrrigationControllersById(Long id);
+}

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

@@ -20,6 +20,14 @@ public interface IUserIrrigationRecordService
      */
     //public List<UserIrrigationRecordDto> selectUserIrrigationRecordListShowBycardNumber(String cardNumber);
 
+    /**
+     * 查询展示灌溉记录列表
+     *
+     * @param userIrrigationRecord 灌溉记录
+     * @return 灌溉记录集合
+     */
+    public List<UserIrrigationRecordDto> selectUserIrrigationRecordShowList(UserIrrigationRecord userIrrigationRecord);
+
     /**
      * 查询用户灌溉记录列表
      *

fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/NgIrrigationControllersServiceImpl.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.NgIrrigationControllersMapper;
+import com.fastbee.rechargecard.domain.NgIrrigationControllers;
+import com.fastbee.rechargecard.service.INgIrrigationControllersService;
+
+/**
+ * 灌溉控制器信息Service业务层处理
+ *
+ * @author kerwincui
+ * @date 2024-12-19
+ */
+@Service
+public class NgIrrigationControllersServiceImpl implements INgIrrigationControllersService
+{
+    @Autowired
+    private NgIrrigationControllersMapper ngIrrigationControllersMapper;
+
+    /**
+     * 查询灌溉控制器信息
+     *
+     * @param id 灌溉控制器信息主键
+     * @return 灌溉控制器信息
+     */
+    @Override
+    public NgIrrigationControllers selectNgIrrigationControllersById(Long id)
+    {
+        return ngIrrigationControllersMapper.selectNgIrrigationControllersById(id);
+    }
+
+    /**
+     * 查询灌溉控制器信息列表
+     *
+     * @param ngIrrigationControllers 灌溉控制器信息
+     * @return 灌溉控制器信息
+     */
+    @Override
+    public List<NgIrrigationControllers> selectNgIrrigationControllersList(NgIrrigationControllers ngIrrigationControllers)
+    {
+        return ngIrrigationControllersMapper.selectNgIrrigationControllersList(ngIrrigationControllers);
+    }
+
+    /**
+     * 新增灌溉控制器信息
+     *
+     * @param ngIrrigationControllers 灌溉控制器信息
+     * @return 结果
+     */
+    @Override
+    public int insertNgIrrigationControllers(NgIrrigationControllers ngIrrigationControllers)
+    {
+        ngIrrigationControllers.setCreateTime(DateUtils.getNowDate());
+        return ngIrrigationControllersMapper.insertNgIrrigationControllers(ngIrrigationControllers);
+    }
+
+    /**
+     * 修改灌溉控制器信息
+     *
+     * @param ngIrrigationControllers 灌溉控制器信息
+     * @return 结果
+     */
+    @Override
+    public int updateNgIrrigationControllers(NgIrrigationControllers ngIrrigationControllers)
+    {
+        ngIrrigationControllers.setUpdateTime(DateUtils.getNowDate());
+        return ngIrrigationControllersMapper.updateNgIrrigationControllers(ngIrrigationControllers);
+    }
+
+    /**
+     * 批量删除灌溉控制器信息
+     *
+     * @param ids 需要删除的灌溉控制器信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteNgIrrigationControllersByIds(Long[] ids)
+    {
+        return ngIrrigationControllersMapper.deleteNgIrrigationControllersByIds(ids);
+    }
+
+    /**
+     * 删除灌溉控制器信息信息
+     *
+     * @param id 灌溉控制器信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteNgIrrigationControllersById(Long id)
+    {
+        return ngIrrigationControllersMapper.deleteNgIrrigationControllersById(id);
+    }
+}

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

@@ -1,5 +1,6 @@
 package com.fastbee.rechargecard.service.impl;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import com.fastbee.common.utils.DateUtils;
@@ -28,6 +29,26 @@ public class UserIrrigationRecordServiceImpl implements IUserIrrigationRecordSer
     @Autowired
     private DeviceMapper deviceMapper;
 
+    @Override
+    public List<UserIrrigationRecordDto> selectUserIrrigationRecordShowList(UserIrrigationRecord userIrrigationRecord) {
+        List<UserIrrigationRecordDto> result=new ArrayList<>();
+        List<UserIrrigationRecord> list=userIrrigationRecordMapper.selectUserIrrigationRecordList(userIrrigationRecord);
+        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()==null ? "" :sysUserMapper.selectUserById(list.get(i).getUserId()).getUserName();
+            temp.deviceName=deviceMapper.selectDeviceBySerialNumber(list.get(i).getDeviceNumber()).getDeviceName() == null ? "":deviceMapper.selectDeviceBySerialNumber(list.get(i).getDeviceNumber()).getDeviceName();
+            temp.cardNumber=list.get(i).getCardNumber() == null ? "" : list.get(i).getCardNumber();
+            temp.flow=list.get(i).getCurFlow()==null ? BigDecimal.valueOf(0) :list.get(i).getCurFlow();
+            temp.startTime=list.get(i).getStartTime()==null ? null : list.get(i).getStartTime();
+            temp.endTime=list.get(i).getEndTime()==null ? null :list.get(0).getEndTime();
+            result.add(temp);
+        }
+
+        return result;
+    }
+
     /**
      * 获取用户灌溉记录列表
      * @param cardNumber 卡号

fastbee-service/fastbee-rechargecard-service/src/main/resources/mapper/rechargecard/NgIrrigationControllersMapper.xml

@@ -0,0 +1,106 @@
+<?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.fastbee.rechargecard.mapper.NgIrrigationControllersMapper">
+
+    <resultMap type="NgIrrigationControllers" id="NgIrrigationControllersResult">
+        <result property="id"    column="id"    />
+        <result property="serialNumber"    column="serial_number"    />
+        <result property="controllerName"    column="controller_name"    />
+        <result property="controllerModel"    column="controller_model"    />
+        <result property="installationDate"    column="installation_date"    />
+        <result property="status"    column="status"    />
+        <result property="lastMaintenance"    column="last_maintenance"    />
+        <result property="areaCode"    column="area_code"    />
+        <result property="remark"    column="remark"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="updateBy"    column="update_by"    />
+    </resultMap>
+
+    <sql id="selectNgIrrigationControllersVo">
+        select id, serial_number, controller_name, controller_model, installation_date, status, last_maintenance, area_code, remark, create_time, update_time, create_by, update_by from ng_irrigation_controllers
+    </sql>
+
+    <select id="selectNgIrrigationControllersList" parameterType="NgIrrigationControllers" resultMap="NgIrrigationControllersResult">
+        <include refid="selectNgIrrigationControllersVo"/>
+        <where>
+            <if test="serialNumber != null  and serialNumber != ''"> and serial_number = #{serialNumber}</if>
+            <if test="controllerName != null  and controllerName != ''"> and controller_name like concat('%', #{controllerName}, '%')</if>
+            <if test="controllerModel != null  and controllerModel != ''"> and controller_model = #{controllerModel}</if>
+            <if test="installationDate != null "> and installation_date = #{installationDate}</if>
+            <if test="status != null "> and status = #{status}</if>
+            <if test="lastMaintenance != null "> and last_maintenance = #{lastMaintenance}</if>
+            <if test="areaCode != null  and areaCode != ''"> and area_code = #{areaCode}</if>
+        </where>
+    </select>
+
+    <select id="selectNgIrrigationControllersById" parameterType="Long" resultMap="NgIrrigationControllersResult">
+        <include refid="selectNgIrrigationControllersVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertNgIrrigationControllers" parameterType="NgIrrigationControllers" useGeneratedKeys="true" keyProperty="id">
+        insert into ng_irrigation_controllers
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="serialNumber != null and serialNumber != ''">serial_number,</if>
+            <if test="controllerName != null">controller_name,</if>
+            <if test="controllerModel != null and controllerModel != ''">controller_model,</if>
+            <if test="installationDate != null">installation_date,</if>
+            <if test="status != null">status,</if>
+            <if test="lastMaintenance != null">last_maintenance,</if>
+            <if test="areaCode != null">area_code,</if>
+            <if test="remark != null">remark,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="updateBy != null">update_by,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="serialNumber != null and serialNumber != ''">#{serialNumber},</if>
+            <if test="controllerName != null">#{controllerName},</if>
+            <if test="controllerModel != null and controllerModel != ''">#{controllerModel},</if>
+            <if test="installationDate != null">#{installationDate},</if>
+            <if test="status != null">#{status},</if>
+            <if test="lastMaintenance != null">#{lastMaintenance},</if>
+            <if test="areaCode != null">#{areaCode},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+        </trim>
+    </insert>
+
+    <update id="updateNgIrrigationControllers" parameterType="NgIrrigationControllers">
+        update ng_irrigation_controllers
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="serialNumber != null and serialNumber != ''">serial_number = #{serialNumber},</if>
+            <if test="controllerName != null">controller_name = #{controllerName},</if>
+            <if test="controllerModel != null and controllerModel != ''">controller_model = #{controllerModel},</if>
+            <if test="installationDate != null">installation_date = #{installationDate},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="lastMaintenance != null">last_maintenance = #{lastMaintenance},</if>
+            <if test="areaCode != null">area_code = #{areaCode},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteNgIrrigationControllersById" parameterType="Long">
+        delete from ng_irrigation_controllers where id = #{id}
+    </delete>
+
+    <delete id="deleteNgIrrigationControllersByIds" parameterType="String">
+        delete from ng_irrigation_controllers where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

fastbee-service/fastbee-rechargecard-service/src/main/resources/mapper/rechargecard/NgRechargeMachinesMapper.xml

@@ -19,10 +19,11 @@
         <result property="updateTime"    column="update_time"    />
         <result property="createBy"    column="create_by"    />
         <result property="updateBy"    column="update_by"    />
+        <result property="deviceName"    column="device_name"    />
     </resultMap>
 
     <sql id="selectNgRechargeMachinesVo">
-        select id, location, device_model, serial_number, area_code, installation_date, status, contact_person, contact_phone, remark, create_time, update_time, create_by, update_by from ng_recharge_machines
+        select id, location, device_model, serial_number, area_code, installation_date, status, contact_person, contact_phone, remark, create_time, update_time, create_by, update_by, device_name from ng_recharge_machines
     </sql>
 
     <select id="selectNgRechargeMachinesList" parameterType="NgRechargeMachines" resultMap="NgRechargeMachinesResult">
@@ -36,6 +37,7 @@
             <if test="status != null "> and status = #{status}</if>
             <if test="contactPerson != null  and contactPerson != ''"> and contact_person = #{contactPerson}</if>
             <if test="contactPhone != null  and contactPhone != ''"> and contact_phone = #{contactPhone}</if>
+            <if test="deviceName != null  and deviceName != ''"> and device_name like concat('%', #{deviceName}, '%')</if>
         </where>
     </select>
 
@@ -60,6 +62,7 @@
             <if test="updateTime != null">update_time,</if>
             <if test="createBy != null">create_by,</if>
             <if test="updateBy != null">update_by,</if>
+            <if test="deviceName != null">device_name,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="location != null">#{location},</if>
@@ -75,6 +78,7 @@
             <if test="updateTime != null">#{updateTime},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="updateBy != null">#{updateBy},</if>
+            <if test="deviceName != null">#{deviceName},</if>
         </trim>
     </insert>
 
@@ -94,6 +98,7 @@
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="deviceName != null">device_name = #{deviceName},</if>
         </trim>
         where id = #{id}
     </update>

fastbee-service/fastbee-rechargecard-service/src/main/resources/mapper/rechargecard/NgUserRechargeRecordsMapper.xml

@@ -16,7 +16,7 @@
         <result property="rechargeTime"    column="recharge_time"    />
         <result property="rechargeCode"    column="recharge_code"    />
         <result property="status"    column="status"    />
-        <result property="deviceId"    column="device_id"    />
+        <result property="serialNumber"    column="serial_number"    />
         <result property="remark"    column="remark"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
@@ -25,7 +25,7 @@
     </resultMap>
 
     <sql id="selectNgUserRechargeRecordsVo">
-        select id, user_id, user_name, card_number, area_code, type, amount, balance, recharge_time, recharge_code, status, device_id, remark, create_time, update_time, create_by, update_by from ng_user_recharge_records
+        select id, user_id, user_name, card_number, area_code, type, amount, balance, recharge_time, recharge_code, status, serial_number, remark, create_time, update_time, create_by, update_by from ng_user_recharge_records
     </sql>
 
     <select id="selectNgUserRechargeRecordsList" parameterType="NgUserRechargeRecords" resultMap="NgUserRechargeRecordsResult">
@@ -41,7 +41,7 @@
             <if test="rechargeTime != null "> and recharge_time = #{rechargeTime}</if>
             <if test="rechargeCode != null  and rechargeCode != ''"> and recharge_code = #{rechargeCode}</if>
             <if test="status != null "> and status = #{status}</if>
-            <if test="deviceId != null "> and device_id = #{deviceId}</if>
+            <if test="serialNumber != null  and serialNumber != ''"> and serial_number = #{serialNumber}</if>
         </where>
     </select>
 
@@ -63,7 +63,7 @@
             <if test="rechargeTime != null">recharge_time,</if>
             <if test="rechargeCode != null">recharge_code,</if>
             <if test="status != null">status,</if>
-            <if test="deviceId != null">device_id,</if>
+            <if test="serialNumber != null and serialNumber != ''">serial_number,</if>
             <if test="remark != null">remark,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateTime != null">update_time,</if>
@@ -81,7 +81,7 @@
             <if test="rechargeTime != null">#{rechargeTime},</if>
             <if test="rechargeCode != null">#{rechargeCode},</if>
             <if test="status != null">#{status},</if>
-            <if test="deviceId != null">#{deviceId},</if>
+            <if test="serialNumber != null and serialNumber != ''">#{serialNumber},</if>
             <if test="remark != null">#{remark},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateTime != null">#{updateTime},</if>
@@ -103,7 +103,7 @@
             <if test="rechargeTime != null">recharge_time = #{rechargeTime},</if>
             <if test="rechargeCode != null">recharge_code = #{rechargeCode},</if>
             <if test="status != null">status = #{status},</if>
-            <if test="deviceId != null">device_id = #{deviceId},</if>
+            <if test="serialNumber != null and serialNumber != ''">serial_number = #{serialNumber},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>