修改 用户充值记录、刷卡记录、灌溉记录接口

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

@@ -68,13 +68,31 @@ public class NgUserRechargeRecordsController extends BaseController
      * 获取用户充值记录详细信息
      */
 //    @PreAuthorize("@ss.hasPermi('rechargecard:records:query')")
-    @GetMapping(value = "/{userId}")
+    @GetMapping(value = "/user")
     @ApiOperation("获取用户充值记录详细信息")
-    public AjaxResult getInfo(@PathVariable("userId") Long userId)
+    public TableDataInfo getInfo(NgUserRechargeRecords ngUserRechargeRecords)
     {
-        return success(ngUserRechargeRecordsService.selectNgUserRechargeRecordsById(userId));
+        startPage();
+        List<NgUserRechargeRecords> list = ngUserRechargeRecordsService.selectNgUserRechargeRecordsByCardNumber(ngUserRechargeRecords);
+        return getDataTable(list);
     }
 
+    /**
+     * 获取充值机充值记录详细信息
+     */
+//    @PreAuthorize("@ss.hasPermi('rechargecard:records:query')")
+    /*@GetMapping(value = "/serial/{serialNumber}")*/
+    @GetMapping(value = "/serial")
+    @ApiOperation("获取充值机充值记录详细信息")
+    public TableDataInfo getSerialInfo(NgUserRechargeRecords ngUserRechargeRecords)
+    {
+        startPage();
+        List<NgUserRechargeRecords> list = ngUserRechargeRecordsService.selectNgUserRechargeRecordsBySerialNumber(ngUserRechargeRecords);
+        return getDataTable(list);
+    }
+
+
+
     /**
      * 新增用户充值记录
      */

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

@@ -63,6 +63,7 @@ public class UserConsumptionDetailsController extends BaseController
         return getDataTable(list);
     }
 
+
     /**
      * 导出用户充值卡账单明细记录列表
      */
@@ -76,14 +77,16 @@ public class UserConsumptionDetailsController extends BaseController
     }
 
     /**
-     * 获取用户充值卡账单明细记录详细信息列表
+     * 获取单用户刷卡详细信息
      */
-    @GetMapping(value = "/list/{cardNumber}")
+    @GetMapping(value = "/list/show/swip")
-    @ApiOperation("获取用户充值卡账单明细记录详细信息列表")
+    @ApiOperation("获取单用户刷卡记录详细信息展示列表")
-    public AjaxResult getInfo(@PathVariable("cardNumber") String cardNumber)
+    public TableDataInfo getInfo(UserConsumptionDetails userConsumptionDetails)
     {
         //return success(userConsumptionDetailsService.selectUserConsumptionDetailsById(cardNumber));
-        return success(userConsumptionDetailsService.selectUserConsumptionDetailsListById(cardNumber));
+        startPage();
+        List<UserConsumptionDetailsDto> list = userConsumptionDetailsService.selectUserConsumptionDetailsListByCardNumber(userConsumptionDetails);
+        return getDataTable(list);
     }
 
     /**

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.UserConsumptionDetails;
 import com.fastbee.rechargecard.domain.dto.UserIrrigationRecordDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -64,7 +65,7 @@ public class UserIrrigationRecordController extends BaseController
     }
 
     /**
-     * 获取用户灌溉记录展示详细信息列表
+     * 获取全部灌溉记录展示详细信息列表
      */
 //    @PreAuthorize("@ss.hasPermi('rechargecard:record:list')")
     @GetMapping("/list/show")
@@ -75,20 +76,33 @@ public class UserIrrigationRecordController extends BaseController
         List<UserIrrigationRecordDto> list = userIrrigationRecordService.selectUserIrrigationRecordShowList(userIrrigationRecord);
         return getDataTable(list);
     }
+
     /**
      * 获取用户灌溉记录展示详细信息列表
      */
-    /*@PreAuthorize("@ss.hasPermi('rechargecard:record:list')")
+//    @PreAuthorize("@ss.hasPermi('rechargecard:record:list')")
-    @GetMapping("/list/show/{cardNumber}")
+    @GetMapping("/list/show/user")
-    @ApiOperation("查询灌溉记录列表")
+    @ApiOperation("查询用户灌溉记录列表")
-    public TableDataInfo ShowlistByCardNumber(@PathVariable("cardNumber") String cardNumber)
+    public TableDataInfo ShowlistByCardNumber(UserIrrigationRecord userIrrigationRecord)
     {
         startPage();
-        UserIrrigationRecord userIrrigationRecord=new UserIrrigationRecord();
+        List<UserIrrigationRecordDto> list = userIrrigationRecordService.selectUserIrrigationRecordShowListByCardNumber(userIrrigationRecord);
-        userIrrigationRecord.setCardNumber(cardNumber);
-        List<UserIrrigationRecordDto> list = userIrrigationRecordService.selectUserIrrigationRecordShowList(userIrrigationRecord);
         return getDataTable(list);
-    }*/
+    }
+
+    /**
+     * 获取灌溉控制器灌溉记录展示详细信息列表
+     */
+//    @PreAuthorize("@ss.hasPermi('rechargecard:record:list')")
+    @GetMapping("/list/device/{deviceNumber}")
+    @ApiOperation("查询灌溉控制器灌溉记录列表")
+    public TableDataInfo ShowlistByDeviceNumber(@PathVariable("deviceNumber") String deviceNumber)
+    {
+        startPage();
+        List<UserIrrigationRecord> list = userIrrigationRecordService.selectUserIrrigationRecordShowListByDeviceNumber(deviceNumber);
+        return getDataTable(list);
+    }
+
 
     /**
      * 导出灌溉记录列表

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

@@ -16,10 +16,18 @@ public interface NgUserRechargeRecordsMapper
     /**
      * 查询用户充值记录
      *
-     * @param userId 用户id
+     * @param
      * @return 用户充值记录
      */
-    public NgUserRechargeRecords selectNgUserRechargeRecordsById(Long userId);
+    public List<NgUserRechargeRecords> selectNgUserRechargeRecordsByCardNumber(NgUserRechargeRecords ngUserRechargeRecords);
+
+    /**
+     * 查询充值机充值记录
+     *
+     * @param
+     * @return 用户充值记录
+     */
+    public List<NgUserRechargeRecords> selectNgUserRechargeRecordsBySerialNumber(NgUserRechargeRecords ngUserRechargeRecords);
 
     /**
      * 查询用户充值记录列表

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

@@ -21,6 +21,13 @@ public interface UserConsumptionDetailsMapper extends BaseMapper<UserConsumption
      * @return
      */
     public List<UserConsumptionDetails> selectUserConsumptionDetailsListById(String cardNumber);
+
+    /**
+     * 根据卡号查询用户充值卡账单明细记录列表，判断是否为刷卡记录，billingType=1为刷卡
+     * @param cardNumber
+     * @return
+     */
+    public List<UserConsumptionDetails> selectUserConsumptionDetailsSwipListByCardNumber(String cardNumber);
     /**
      * 查询用户充值卡账单明细记录
      * @param id

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

@@ -14,13 +14,30 @@ import org.apache.ibatis.annotations.Mapper;
 public interface UserIrrigationRecordMapper
 {
     /**
-     * 查询用户灌溉记录列表
+     * 查询单用户灌溉记录列表
      *
-     * @param cardNumber
+     * @param
      * @return 灌溉记录集合
      */
     public List<UserIrrigationRecord> selectUserIrrigationRecordListBycardNumber(String cardNumber);
 
+
+    /**
+     * 查询单用户灌溉记录列表
+     *
+     * @param
+     * @return 灌溉记录集合
+     */
+    public List<UserIrrigationRecord> selectUserIrrigationRecordShowListBycardNumber(UserIrrigationRecord userIrrigationRecord);
+
+    /**
+     * 查询灌溉控制器灌溉记录列表
+     *
+     * @param deviceNumber
+     * @return 灌溉记录集合
+     */
+    public List<UserIrrigationRecord> selectUserIrrigationRecordListByDeviceNumber(String deviceNumber);
+
     /**
      * 查询灌溉记录
      *

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

@@ -2,6 +2,7 @@ package com.fastbee.rechargecard.service;
 
 import java.util.List;
 import com.fastbee.rechargecard.domain.NgUserRechargeRecords;
+import com.fastbee.rechargecard.mapper.NgUserRechargeRecordsMapper;
 
 /**
  * 用户充值记录Service接口
@@ -14,10 +15,18 @@ public interface INgUserRechargeRecordsService
     /**
      * 查询用户充值记录
      *
-     * @param userId 用户id
+     * @param
      * @return 用户充值记录
      */
-    public NgUserRechargeRecords selectNgUserRechargeRecordsById(Long userId);
+    public List<NgUserRechargeRecords> selectNgUserRechargeRecordsByCardNumber(NgUserRechargeRecords ngUserRechargeRecords);
+
+    /**
+     * 查询充值机充值记录
+     *
+     * @param
+     * @return 用户充值记录
+     */
+    public List<NgUserRechargeRecords> selectNgUserRechargeRecordsBySerialNumber(NgUserRechargeRecords ngUserRechargeRecords);
 
     /**
      * 查询用户充值记录列表

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

@@ -14,6 +14,12 @@ import org.springframework.stereotype.Service;
 
 public interface IUserConsumptionDetailsService
 {
+    /**
+     * 根据卡号查询展示的账单信息
+     * @param
+     * @return
+     */
+    public List<UserConsumptionDetailsDto> selectUserConsumptionDetailsListByCardNumber(UserConsumptionDetails userConsumptionDetails);
     /**
      * 根据卡号查询用户充值卡账单明细记录列表
      *

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

@@ -1,6 +1,8 @@
 package com.fastbee.rechargecard.service;
 
 import java.util.List;
+
+import com.fastbee.rechargecard.domain.UserConsumptionDetails;
 import com.fastbee.rechargecard.domain.UserIrrigationRecord;
 import com.fastbee.rechargecard.domain.dto.UserIrrigationRecordDto;
 
@@ -15,10 +17,18 @@ public interface IUserIrrigationRecordService
     /**
      * 查询用户灌溉展示记录列表
      *
-     * @param cardNumber 卡号
+     * @param
      * @return 灌溉记录
      */
-    //public List<UserIrrigationRecordDto> selectUserIrrigationRecordListShowBycardNumber(String cardNumber);
+    public List<UserIrrigationRecordDto> selectUserIrrigationRecordShowListByCardNumber(UserIrrigationRecord userIrrigationRecord);
+
+    /**
+     * 查询灌溉控制器灌溉展示记录列表
+     *
+     * @param deviceNumber 控制器编码
+     * @return 灌溉记录
+     */
+    public List<UserIrrigationRecord> selectUserIrrigationRecordShowListByDeviceNumber(String deviceNumber);
 
     /**
      * 查询展示灌溉记录列表

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

@@ -23,13 +23,25 @@ public class NgUserRechargeRecordsServiceImpl implements INgUserRechargeRecordsS
     /**
      * 查询用户充值记录
      *
-     * @param userId 用户id
+     * @param
      * @return 用户充值记录
      */
     @Override
-    public NgUserRechargeRecords selectNgUserRechargeRecordsById(Long userId)
+    public List<NgUserRechargeRecords> selectNgUserRechargeRecordsByCardNumber(NgUserRechargeRecords ngUserRechargeRecords)
     {
-        return ngUserRechargeRecordsMapper.selectNgUserRechargeRecordsById(userId);
+        return ngUserRechargeRecordsMapper.selectNgUserRechargeRecordsByCardNumber(ngUserRechargeRecords);
+    }
+
+    /**
+     * 查询充值机充值记录
+     *
+     * @param
+     * @return 用户充值记录
+     */
+    @Override
+    public List<NgUserRechargeRecords> selectNgUserRechargeRecordsBySerialNumber(NgUserRechargeRecords ngUserRechargeRecords)
+    {
+        return ngUserRechargeRecordsMapper.selectNgUserRechargeRecordsBySerialNumber(ngUserRechargeRecords);
     }
 
     /**

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

@@ -27,6 +27,45 @@ public class UserConsumptionDetailsServiceImpl implements IUserConsumptionDetail
     @Autowired
     private SysUserMapper sysUserMapper;
 
+    @Override
+    public List<UserConsumptionDetailsDto> selectUserConsumptionDetailsListByCardNumber(UserConsumptionDetails data) {
+        List<UserConsumptionDetailsDto> result=new ArrayList<>();
+        List<UserConsumptionDetails> value=userConsumptionDetailsMapper.selectUserConsumptionDetailsList(data);
+        for(int i=0;i<value.size();i++)
+        {
+            UserConsumptionDetails userConsumptionDetails=value.get(i);
+            UserConsumptionDetailsDto temp=new UserConsumptionDetailsDto();
+            temp.setUserName(sysUserMapper.selectUserById(userConsumptionDetails.getUserId()).getUserName());
+            temp.setId(userConsumptionDetails.getId());
+            temp.setUserId(userConsumptionDetails.getUserId());
+            temp.setDeviceNumber(userConsumptionDetails.getDeviceNumber());
+            temp.setCardNumber(userConsumptionDetails.getCardNumber());
+            temp.setProjectId(userConsumptionDetails.getProjectId());
+            temp.setDeptId(userConsumptionDetails.getDeptId());
+            temp.setBillingType(userConsumptionDetails.getBillingType());
+            temp.setPumpTime(userConsumptionDetails.getPumpTime());
+            temp.setUnitPrice(userConsumptionDetails.getUnitPrice());
+            temp.setTotalPrice(userConsumptionDetails.getTotalPrice());
+            temp.setDiscount(userConsumptionDetails.getDiscount());
+            temp.setTaxAmount(userConsumptionDetails.getTaxAmount());
+            temp.setAmountDue(userConsumptionDetails.getAmountDue());
+            temp.setBillingPeriodDuration(userConsumptionDetails.getBillingPeriodDuration());
+            temp.setBillingPeriodUnit(userConsumptionDetails.getBillingPeriodUnit());
+            temp.setBillingDate(userConsumptionDetails.getBillingDate());
+            temp.setStartTime(userConsumptionDetails.getStartTime());
+            temp.setEndTime(userConsumptionDetails.getEndTime());
+            temp.setPaymentMethod(userConsumptionDetails.getPaymentMethod());
+            temp.setPaymentStatus(userConsumptionDetails.getPaymentStatus());
+            temp.setPaymentTime(userConsumptionDetails.getPaymentTime());
+            temp.setStatus(userConsumptionDetails.getStatus());
+            temp.setAreaCode(userConsumptionDetails.getAreaCode());
+
+            result.add(temp);
+
+        }
+        return result;
+    }
+
     /**
      * 根据卡号查询用户充值卡账单明细记录列表
      *

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

@@ -6,6 +6,7 @@ import java.util.List;
 import com.fastbee.common.utils.DateUtils;
 import com.fastbee.iot.mapper.DeviceMapper;
 import com.fastbee.rechargecard.domain.NgIrrigationControllers;
+import com.fastbee.rechargecard.domain.UserConsumptionDetails;
 import com.fastbee.rechargecard.domain.dto.UserIrrigationRecordDto;
 import com.fastbee.rechargecard.mapper.NgIrrigationControllersMapper;
 import com.fastbee.system.mapper.SysUserMapper;
@@ -32,6 +33,32 @@ public class UserIrrigationRecordServiceImpl implements IUserIrrigationRecordSer
     private NgIrrigationControllersMapper ngIrrigationControllersMapper;
 
 
+    @Override
+    public List<UserIrrigationRecordDto> selectUserIrrigationRecordShowListByCardNumber(UserIrrigationRecord userIrrigationRecord) {
+        List<UserIrrigationRecordDto> result=new ArrayList<>();
+        List<UserIrrigationRecord> list=userIrrigationRecordMapper.selectUserIrrigationRecordShowListBycardNumber(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=ngIrrigationControllersMapper.selectNgIrrigationControllersBySerialNumber(list.get(i).getDeviceNumber()).getControllerName() == null ? "":ngIrrigationControllersMapper.selectNgIrrigationControllersBySerialNumber(list.get(i).getDeviceNumber()).getControllerName();
+            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;
+    }
+
+    @Override
+    public List<UserIrrigationRecord> selectUserIrrigationRecordShowListByDeviceNumber(String deviceNumber) {
+        List<UserIrrigationRecord> list=userIrrigationRecordMapper.selectUserIrrigationRecordListByDeviceNumber(deviceNumber);
+        return list;
+    }
+
     @Override
     public List<UserIrrigationRecordDto> selectUserIrrigationRecordShowList(UserIrrigationRecord userIrrigationRecord) {
         List<UserIrrigationRecordDto> result=new ArrayList<>();

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

@@ -51,9 +51,49 @@
         </where>
     </select>
 
-    <select id="selectNgUserRechargeRecordsById" parameterType="Long" resultMap="NgUserRechargeRecordsResult">
+    <!--<select id="selectNgUserRechargeRecordsByCardNumber" parameterType="String" resultMap="NgUserRechargeRecordsResult">
         <include refid="selectNgUserRechargeRecordsVo"/>
-        where user_id = #{userId}
+        where card_number = #{cardNumber}
+    </select>-->
+    <select id="selectNgUserRechargeRecordsByCardNumber" parameterType="String" resultMap="NgUserRechargeRecordsResult">
+        <include refid="selectNgUserRechargeRecordsVo"/>
+        <where>
+
+            <if test="cardNumber != null  and cardNumber != ''">  card_number = #{cardNumber}</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
+            <if test="areaCode != null  and areaCode != ''"> and area_code = #{areaCode}</if>
+            <if test="type != null "> and type = #{type}</if>
+            <if test="amount != null "> and amount = #{amount}</if>
+            <if test="balance != null "> and balance = #{balance}</if>
+            <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="serialNumber != null  and serialNumber != ''"> and serial_number = #{serialNumber}</if>
+            <if test="deviceNumber != null  and deviceNumber != ''"> and device_number = #{deviceNumber}</if>
+            <if test="projectId != null "> and project_id = #{projectId}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+        </where>
+    </select>
+
+    <select id="selectNgUserRechargeRecordsBySerialNumber" parameterType="NgUserRechargeRecords" resultMap="NgUserRechargeRecordsResult">
+        <include refid="selectNgUserRechargeRecordsVo"/>
+        <where>
+            <if test="serialNumber != null  and serialNumber != ''"> serial_number = #{serialNumber}</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
+            <if test="cardNumber != null  and cardNumber != ''"> and card_number = #{cardNumber}</if>
+            <if test="areaCode != null  and areaCode != ''"> and area_code = #{areaCode}</if>
+            <if test="type != null "> and type = #{type}</if>
+            <if test="amount != null "> and amount = #{amount}</if>
+            <if test="balance != null "> and balance = #{balance}</if>
+            <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="deviceNumber != null  and deviceNumber != ''"> and device_number = #{deviceNumber}</if>
+            <if test="projectId != null "> and project_id = #{projectId}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+        </where>
     </select>
 
     <insert id="insertNgUserRechargeRecords" parameterType="NgUserRechargeRecords" useGeneratedKeys="true" keyProperty="id">

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

@@ -74,7 +74,15 @@
 
     <select id="selectUserConsumptionDetailsListById" parameterType="String" resultMap="UserConsumptionDetailsResult">
         <include refid="selectUserConsumptionDetailsVo"/>
-        where card_number = #{cardNumber}
+        where
+            card_number = #{cardNumber}
+    </select>
+
+    <select id="selectUserConsumptionDetailsSwipListByCardNumber" parameterType="String" resultMap="UserConsumptionDetailsResult">
+        <include refid="selectUserConsumptionDetailsVo"/>
+        where
+        card_number = #{cardNumber}
+        and billing_type=1
     </select>
 
     <insert id="insertUserConsumptionDetails" parameterType="UserConsumptionDetails" useGeneratedKeys="true" keyProperty="id">

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

@@ -58,6 +58,24 @@
         <include refid="selectUserIrrigationRecordVo"/>
         <where>
             <if test="cardNumber != null  and cardNumber != ''"> card_number = #{cardNumber}</if>
+
+        </where>
+    </select>
+
+
+
+    <select id="selectUserIrrigationRecordShowListBycardNumber" parameterType="UserIrrigationRecord" resultMap="UserIrrigationRecordResult">
+        <include refid="selectUserIrrigationRecordVo"/>
+        <where>
+            <if test="cardNumber != null  and cardNumber != ''"> card_number = #{cardNumber}</if>
+
+        </where>
+    </select>
+
+    <select id="selectUserIrrigationRecordListByDeviceNumber" parameterType="String" resultMap="UserIrrigationRecordResult">
+        <include refid="selectUserIrrigationRecordVo"/>
+        <where>
+            <if test="deviceNumber != null  and deviceNumber != ''"> device_number = #{deviceNumber}</if>
         </where>
     </select>