From 6680df8ef07e83883d93b8d62a72933cd22e8752 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E9=AD=94=E4=BB=99=7E?= <13068499+willowhh@user.noreply.gitee.com> Date: Thu, 19 Dec 2024 14:54:20 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=9F=8E=E9=95=87=E4=BA=A9=E5=9D=87?= =?UTF-8?q?=E7=A1=AE=E6=9D=83=E8=AF=A6=E7=BB=86=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NgUrbanMuRightsController.java | 110 ++++++++++++++++++ .../rechargecard/domain/NgUrbanMuRights.java | 47 ++++++++ .../mapper/NgUrbanMuRightsMapper.java | 63 ++++++++++ .../service/INgUrbanMuRightsService.java | 61 ++++++++++ .../impl/NgUrbanMuRightsServiceImpl.java | 96 +++++++++++++++ .../rechargecard/NgUrbanMuRightsMapper.xml | 86 ++++++++++++++ 6 files changed, 463 insertions(+) create mode 100644 fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/NgUrbanMuRightsController.java create mode 100644 fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/NgUrbanMuRights.java create mode 100644 fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/mapper/NgUrbanMuRightsMapper.java create mode 100644 fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/INgUrbanMuRightsService.java create mode 100644 fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/NgUrbanMuRightsServiceImpl.java create mode 100644 fastbee-service/fastbee-rechargecard-service/src/main/resources/mapper/rechargecard/NgUrbanMuRightsMapper.xml diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/NgUrbanMuRightsController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/NgUrbanMuRightsController.java new file mode 100644 index 0000000..a06199e --- /dev/null +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/NgUrbanMuRightsController.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.NgUrbanMuRights; +import com.fastbee.rechargecard.service.INgUrbanMuRightsService; +import com.fastbee.common.utils.poi.ExcelUtil; +import com.fastbee.common.core.page.TableDataInfo; + +/** + * 城镇亩均确权Controller + * + * @author kerwincui + * @date 2024-12-19 + */ +@RestController +@RequestMapping("/rechargecard/rights") +@Api(tags = "城镇亩均确权") +public class NgUrbanMuRightsController extends BaseController +{ + @Autowired + private INgUrbanMuRightsService ngUrbanMuRightsService; + +/** + * 查询城镇亩均确权列表 + */ +@PreAuthorize("@ss.hasPermi('rechargecard:rights:list')") +@GetMapping("/list") +@ApiOperation("查询城镇亩均确权列表") + public TableDataInfo list(NgUrbanMuRights ngUrbanMuRights) + { + startPage(); + List list = ngUrbanMuRightsService.selectNgUrbanMuRightsList(ngUrbanMuRights); + return getDataTable(list); + } + + /** + * 导出城镇亩均确权列表 + */ + @ApiOperation("导出城镇亩均确权列表") + @PreAuthorize("@ss.hasPermi('rechargecard:rights:export')") + @PostMapping("/export") + public void export(HttpServletResponse response, NgUrbanMuRights ngUrbanMuRights) + { + List list = ngUrbanMuRightsService.selectNgUrbanMuRightsList(ngUrbanMuRights); + ExcelUtil util = new ExcelUtil(NgUrbanMuRights.class); + util.exportExcel(response, list, "城镇亩均确权数据"); + } + + /** + * 获取城镇亩均确权详细信息 + */ + @PreAuthorize("@ss.hasPermi('rechargecard:rights:query')") + @GetMapping(value = "/{muRightsId}") + @ApiOperation("获取城镇亩均确权详细信息") + public AjaxResult getInfo(@PathVariable("muRightsId") Long muRightsId) + { + return success(ngUrbanMuRightsService.selectNgUrbanMuRightsByMuRightsId(muRightsId)); + } + + /** + * 新增城镇亩均确权 + */ + @PreAuthorize("@ss.hasPermi('rechargecard:rights:add')") + @PostMapping + @ApiOperation("新增城镇亩均确权") + public AjaxResult add(@RequestBody NgUrbanMuRights ngUrbanMuRights) + { + return toAjax(ngUrbanMuRightsService.insertNgUrbanMuRights(ngUrbanMuRights)); + } + + /** + * 修改城镇亩均确权 + */ + @PreAuthorize("@ss.hasPermi('rechargecard:rights:edit')") + @PutMapping + @ApiOperation("修改城镇亩均确权") + public AjaxResult edit(@RequestBody NgUrbanMuRights ngUrbanMuRights) + { + return toAjax(ngUrbanMuRightsService.updateNgUrbanMuRights(ngUrbanMuRights)); + } + + /** + * 删除城镇亩均确权 + */ + @PreAuthorize("@ss.hasPermi('rechargecard:rights:remove')") + @DeleteMapping("/{muRightsIds}") + @ApiOperation("删除城镇亩均确权") + public AjaxResult remove(@PathVariable Long[] muRightsIds) + { + return toAjax(ngUrbanMuRightsService.deleteNgUrbanMuRightsByMuRightsIds(muRightsIds)); + } +} diff --git a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/NgUrbanMuRights.java b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/NgUrbanMuRights.java new file mode 100644 index 0000000..81373ab --- /dev/null +++ b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/NgUrbanMuRights.java @@ -0,0 +1,47 @@ +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_urban_mu_rights + * + * @author kerwincui + * @date 2024-12-19 + */ +@ApiModel(value = "NgUrbanMuRights",description = "城镇亩均确权 ng_urban_mu_rights") +@Data +@EqualsAndHashCode(callSuper = true) +public class NgUrbanMuRights extends BaseEntity + { +private static final long serialVersionUID = 1L; + + /** 主键 */ + private Long muRightsId; + + /** 年度 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "年度", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("年度") + private Date year; + + /** 用水量 */ + @Excel(name = "用水量") + @ApiModelProperty("用水量") + private BigDecimal water; + + /** 行政区域(县) */ + @Excel(name = "行政区域(县)") + @ApiModelProperty("行政区域(县)") + private String administrative; + +} diff --git a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/mapper/NgUrbanMuRightsMapper.java b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/mapper/NgUrbanMuRightsMapper.java new file mode 100644 index 0000000..fd90194 --- /dev/null +++ b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/mapper/NgUrbanMuRightsMapper.java @@ -0,0 +1,63 @@ +package com.fastbee.rechargecard.mapper; + +import java.util.List; +import com.fastbee.rechargecard.domain.NgUrbanMuRights; +import org.apache.ibatis.annotations.Mapper; + +/** + * 城镇亩均确权Mapper接口 + * + * @author kerwincui + * @date 2024-12-19 + */ +@Mapper +public interface NgUrbanMuRightsMapper +{ + /** + * 查询城镇亩均确权 + * + * @param muRightsId 城镇亩均确权主键 + * @return 城镇亩均确权 + */ + public NgUrbanMuRights selectNgUrbanMuRightsByMuRightsId(Long muRightsId); + + /** + * 查询城镇亩均确权列表 + * + * @param ngUrbanMuRights 城镇亩均确权 + * @return 城镇亩均确权集合 + */ + public List selectNgUrbanMuRightsList(NgUrbanMuRights ngUrbanMuRights); + + /** + * 新增城镇亩均确权 + * + * @param ngUrbanMuRights 城镇亩均确权 + * @return 结果 + */ + public int insertNgUrbanMuRights(NgUrbanMuRights ngUrbanMuRights); + + /** + * 修改城镇亩均确权 + * + * @param ngUrbanMuRights 城镇亩均确权 + * @return 结果 + */ + public int updateNgUrbanMuRights(NgUrbanMuRights ngUrbanMuRights); + + /** + * 删除城镇亩均确权 + * + * @param muRightsId 城镇亩均确权主键 + * @return 结果 + */ + public int deleteNgUrbanMuRightsByMuRightsId(Long muRightsId); + + /** + * 批量删除城镇亩均确权 + * + * @param muRightsIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteNgUrbanMuRightsByMuRightsIds(Long[] muRightsIds); +} diff --git a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/INgUrbanMuRightsService.java b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/INgUrbanMuRightsService.java new file mode 100644 index 0000000..dbeca8f --- /dev/null +++ b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/INgUrbanMuRightsService.java @@ -0,0 +1,61 @@ +package com.fastbee.rechargecard.service; + +import java.util.List; +import com.fastbee.rechargecard.domain.NgUrbanMuRights; + +/** + * 城镇亩均确权Service接口 + * + * @author kerwincui + * @date 2024-12-19 + */ +public interface INgUrbanMuRightsService +{ + /** + * 查询城镇亩均确权 + * + * @param muRightsId 城镇亩均确权主键 + * @return 城镇亩均确权 + */ + public NgUrbanMuRights selectNgUrbanMuRightsByMuRightsId(Long muRightsId); + + /** + * 查询城镇亩均确权列表 + * + * @param ngUrbanMuRights 城镇亩均确权 + * @return 城镇亩均确权集合 + */ + public List selectNgUrbanMuRightsList(NgUrbanMuRights ngUrbanMuRights); + + /** + * 新增城镇亩均确权 + * + * @param ngUrbanMuRights 城镇亩均确权 + * @return 结果 + */ + public int insertNgUrbanMuRights(NgUrbanMuRights ngUrbanMuRights); + + /** + * 修改城镇亩均确权 + * + * @param ngUrbanMuRights 城镇亩均确权 + * @return 结果 + */ + public int updateNgUrbanMuRights(NgUrbanMuRights ngUrbanMuRights); + + /** + * 批量删除城镇亩均确权 + * + * @param muRightsIds 需要删除的城镇亩均确权主键集合 + * @return 结果 + */ + public int deleteNgUrbanMuRightsByMuRightsIds(Long[] muRightsIds); + + /** + * 删除城镇亩均确权信息 + * + * @param muRightsId 城镇亩均确权主键 + * @return 结果 + */ + public int deleteNgUrbanMuRightsByMuRightsId(Long muRightsId); +} diff --git a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/NgUrbanMuRightsServiceImpl.java b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/NgUrbanMuRightsServiceImpl.java new file mode 100644 index 0000000..c500fed --- /dev/null +++ b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/NgUrbanMuRightsServiceImpl.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.NgUrbanMuRightsMapper; +import com.fastbee.rechargecard.domain.NgUrbanMuRights; +import com.fastbee.rechargecard.service.INgUrbanMuRightsService; + +/** + * 城镇亩均确权Service业务层处理 + * + * @author kerwincui + * @date 2024-12-19 + */ +@Service +public class NgUrbanMuRightsServiceImpl implements INgUrbanMuRightsService +{ + @Autowired + private NgUrbanMuRightsMapper ngUrbanMuRightsMapper; + + /** + * 查询城镇亩均确权 + * + * @param muRightsId 城镇亩均确权主键 + * @return 城镇亩均确权 + */ + @Override + public NgUrbanMuRights selectNgUrbanMuRightsByMuRightsId(Long muRightsId) + { + return ngUrbanMuRightsMapper.selectNgUrbanMuRightsByMuRightsId(muRightsId); + } + + /** + * 查询城镇亩均确权列表 + * + * @param ngUrbanMuRights 城镇亩均确权 + * @return 城镇亩均确权 + */ + @Override + public List selectNgUrbanMuRightsList(NgUrbanMuRights ngUrbanMuRights) + { + return ngUrbanMuRightsMapper.selectNgUrbanMuRightsList(ngUrbanMuRights); + } + + /** + * 新增城镇亩均确权 + * + * @param ngUrbanMuRights 城镇亩均确权 + * @return 结果 + */ + @Override + public int insertNgUrbanMuRights(NgUrbanMuRights ngUrbanMuRights) + { + ngUrbanMuRights.setCreateTime(DateUtils.getNowDate()); + return ngUrbanMuRightsMapper.insertNgUrbanMuRights(ngUrbanMuRights); + } + + /** + * 修改城镇亩均确权 + * + * @param ngUrbanMuRights 城镇亩均确权 + * @return 结果 + */ + @Override + public int updateNgUrbanMuRights(NgUrbanMuRights ngUrbanMuRights) + { + ngUrbanMuRights.setUpdateTime(DateUtils.getNowDate()); + return ngUrbanMuRightsMapper.updateNgUrbanMuRights(ngUrbanMuRights); + } + + /** + * 批量删除城镇亩均确权 + * + * @param muRightsIds 需要删除的城镇亩均确权主键 + * @return 结果 + */ + @Override + public int deleteNgUrbanMuRightsByMuRightsIds(Long[] muRightsIds) + { + return ngUrbanMuRightsMapper.deleteNgUrbanMuRightsByMuRightsIds(muRightsIds); + } + + /** + * 删除城镇亩均确权信息 + * + * @param muRightsId 城镇亩均确权主键 + * @return 结果 + */ + @Override + public int deleteNgUrbanMuRightsByMuRightsId(Long muRightsId) + { + return ngUrbanMuRightsMapper.deleteNgUrbanMuRightsByMuRightsId(muRightsId); + } +} diff --git a/fastbee-service/fastbee-rechargecard-service/src/main/resources/mapper/rechargecard/NgUrbanMuRightsMapper.xml b/fastbee-service/fastbee-rechargecard-service/src/main/resources/mapper/rechargecard/NgUrbanMuRightsMapper.xml new file mode 100644 index 0000000..cb19d05 --- /dev/null +++ b/fastbee-service/fastbee-rechargecard-service/src/main/resources/mapper/rechargecard/NgUrbanMuRightsMapper.xml @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + select mu_rights_id, year, water, administrative, remark, create_time, update_time, create_by, update_by from ng_urban_mu_rights + + + + + + + + insert into ng_urban_mu_rights + + year, + water, + administrative, + remark, + create_time, + update_time, + create_by, + update_by, + + + #{year}, + #{water}, + #{administrative}, + #{remark}, + #{createTime}, + #{updateTime}, + #{createBy}, + #{updateBy}, + + + + + update ng_urban_mu_rights + + year = #{year}, + water = #{water}, + administrative = #{administrative}, + remark = #{remark}, + create_time = #{createTime}, + update_time = #{updateTime}, + create_by = #{createBy}, + update_by = #{updateBy}, + + where mu_rights_id = #{muRightsId} + + + + delete from ng_urban_mu_rights where mu_rights_id = #{muRightsId} + + + + delete from ng_urban_mu_rights where mu_rights_id in + + #{muRightsId} + + + \ No newline at end of file From c05bd421dcc03f5d9793dc48198ad92405c4cadf Mon Sep 17 00:00:00 2001 From: ALEI_ALEI Date: Thu, 19 Dec 2024 15:07:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=85=85=E5=80=BC=E6=9C=BA=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=92=8C=E7=94=A8=E6=88=B7=E5=85=85=E5=80=BC=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E7=9A=84=E9=80=BB=E8=BE=91=E5=AE=9E=E7=8E=B0=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E7=94=A8=E6=88=B7=E5=85=85=E5=80=BC=E5=8D=A1=E8=B4=A6?= =?UTF-8?q?=E5=8D=95=E6=98=8E=E7=BB=86=E5=92=8C=E7=94=A8=E6=88=B7=E5=85=85?= =?UTF-8?q?=E5=80=BC=E5=8D=A1=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NgRechargeMachinesController.java | 110 +++++++++++++++ .../NgUserRechargeRecordsController.java | 110 +++++++++++++++ .../UserIrrigationRecordController.java | 4 +- .../domain/NgRechargeMachines.java | 76 +++++++++++ .../domain/NgUserRechargeRecords.java | 92 +++++++++++++ .../domain/UserRechargeCards.java | 5 + .../domain/dto/UserIrrigationRecordDto.java | 1 + .../mapper/NgRechargeMachinesMapper.java | 63 +++++++++ .../mapper/NgUserRechargeRecordsMapper.java | 63 +++++++++ .../service/INgRechargeMachinesService.java | 61 +++++++++ .../INgUserRechargeRecordsService.java | 61 +++++++++ .../service/IUserIrrigationRecordService.java | 4 +- .../impl/NgRechargeMachinesServiceImpl.java | 96 +++++++++++++ .../NgUserRechargeRecordsServiceImpl.java | 96 +++++++++++++ .../impl/UserIrrigationRecordServiceImpl.java | 41 ++++-- .../rechargecard/NgRechargeMachinesMapper.xml | 111 +++++++++++++++ .../NgUserRechargeRecordsMapper.xml | 126 ++++++++++++++++++ .../UserConsumptionDetailsMapper.xml | 12 +- .../UserIrrigationRecordMapper.xml | 3 +- .../rechargecard/UserRechargeCardsMapper.xml | 7 +- 20 files changed, 1118 insertions(+), 24 deletions(-) create mode 100644 fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/NgRechargeMachinesController.java create mode 100644 fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/NgUserRechargeRecordsController.java create mode 100644 fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/NgRechargeMachines.java create mode 100644 fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/NgUserRechargeRecords.java create mode 100644 fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/mapper/NgRechargeMachinesMapper.java create mode 100644 fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/mapper/NgUserRechargeRecordsMapper.java create mode 100644 fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/INgRechargeMachinesService.java create mode 100644 fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/INgUserRechargeRecordsService.java create mode 100644 fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/NgRechargeMachinesServiceImpl.java create mode 100644 fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/NgUserRechargeRecordsServiceImpl.java create mode 100644 fastbee-service/fastbee-rechargecard-service/src/main/resources/mapper/rechargecard/NgRechargeMachinesMapper.xml create mode 100644 fastbee-service/fastbee-rechargecard-service/src/main/resources/mapper/rechargecard/NgUserRechargeRecordsMapper.xml diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/NgRechargeMachinesController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/NgRechargeMachinesController.java new file mode 100644 index 0000000..6bceb21 --- /dev/null +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/NgRechargeMachinesController.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.NgRechargeMachines; +import com.fastbee.rechargecard.service.INgRechargeMachinesService; +import com.fastbee.common.utils.poi.ExcelUtil; +import com.fastbee.common.core.page.TableDataInfo; + +/** + * 充值机信息Controller + * + * @author kerwincui + * @date 2024-12-19 + */ +@RestController +@RequestMapping("/rechargecard/machines") +@Api(tags = "充值机信息") +public class NgRechargeMachinesController extends BaseController +{ + @Autowired + private INgRechargeMachinesService ngRechargeMachinesService; + + /** + * 查询充值机信息列表 + */ + @PreAuthorize("@ss.hasPermi('rechargecard:machines:list')") + @GetMapping("/list") + @ApiOperation("查询充值机信息列表") + public TableDataInfo list(NgRechargeMachines ngRechargeMachines) + { + startPage(); + List list = ngRechargeMachinesService.selectNgRechargeMachinesList(ngRechargeMachines); + return getDataTable(list); + } + + /** + * 导出充值机信息列表 + */ + @ApiOperation("导出充值机信息列表") + @PreAuthorize("@ss.hasPermi('rechargecard:machines:export')") + @PostMapping("/export") + public void export(HttpServletResponse response, NgRechargeMachines ngRechargeMachines) + { + List list = ngRechargeMachinesService.selectNgRechargeMachinesList(ngRechargeMachines); + ExcelUtil util = new ExcelUtil(NgRechargeMachines.class); + util.exportExcel(response, list, "充值机信息数据"); + } + + /** + * 获取充值机信息详细信息 + */ + @PreAuthorize("@ss.hasPermi('rechargecard:machines:query')") + @GetMapping(value = "/{id}") + @ApiOperation("获取充值机信息详细信息") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(ngRechargeMachinesService.selectNgRechargeMachinesById(id)); + } + + /** + * 新增充值机信息 + */ + @PreAuthorize("@ss.hasPermi('rechargecard:machines:add')") + @PostMapping + @ApiOperation("新增充值机信息") + public AjaxResult add(@RequestBody NgRechargeMachines ngRechargeMachines) + { + return toAjax(ngRechargeMachinesService.insertNgRechargeMachines(ngRechargeMachines)); + } + + /** + * 修改充值机信息 + */ + @PreAuthorize("@ss.hasPermi('rechargecard:machines:edit')") + @PutMapping + @ApiOperation("修改充值机信息") + public AjaxResult edit(@RequestBody NgRechargeMachines ngRechargeMachines) + { + return toAjax(ngRechargeMachinesService.updateNgRechargeMachines(ngRechargeMachines)); + } + + /** + * 删除充值机信息 + */ + @PreAuthorize("@ss.hasPermi('rechargecard:machines:remove')") + @DeleteMapping("/{ids}") + @ApiOperation("删除充值机信息") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(ngRechargeMachinesService.deleteNgRechargeMachinesByIds(ids)); + } +} diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/NgUserRechargeRecordsController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/NgUserRechargeRecordsController.java new file mode 100644 index 0000000..d84eb26 --- /dev/null +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/NgUserRechargeRecordsController.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.NgUserRechargeRecords; +import com.fastbee.rechargecard.service.INgUserRechargeRecordsService; +import com.fastbee.common.utils.poi.ExcelUtil; +import com.fastbee.common.core.page.TableDataInfo; + +/** + * 用户充值记录Controller + * + * @author kerwincui + * @date 2024-12-19 + */ +@RestController +@RequestMapping("/rechargecard/records") +@Api(tags = "用户充值记录") +public class NgUserRechargeRecordsController extends BaseController +{ + @Autowired + private INgUserRechargeRecordsService ngUserRechargeRecordsService; + + /** + * 查询用户充值记录列表 + */ + @PreAuthorize("@ss.hasPermi('rechargecard:records:list')") + @GetMapping("/list") + @ApiOperation("查询用户充值记录列表") + public TableDataInfo list(NgUserRechargeRecords ngUserRechargeRecords) + { + startPage(); + List list = ngUserRechargeRecordsService.selectNgUserRechargeRecordsList(ngUserRechargeRecords); + return getDataTable(list); + } + + /** + * 导出用户充值记录列表 + */ + @ApiOperation("导出用户充值记录列表") + @PreAuthorize("@ss.hasPermi('rechargecard:records:export')") + @PostMapping("/export") + public void export(HttpServletResponse response, NgUserRechargeRecords ngUserRechargeRecords) + { + List list = ngUserRechargeRecordsService.selectNgUserRechargeRecordsList(ngUserRechargeRecords); + ExcelUtil util = new ExcelUtil(NgUserRechargeRecords.class); + util.exportExcel(response, list, "用户充值记录数据"); + } + + /** + * 获取用户充值记录详细信息 + */ + @PreAuthorize("@ss.hasPermi('rechargecard:records:query')") + @GetMapping(value = "/{userId}") + @ApiOperation("获取用户充值记录详细信息") + public AjaxResult getInfo(@PathVariable("userId") Long userId) + { + return success(ngUserRechargeRecordsService.selectNgUserRechargeRecordsById(userId)); + } + + /** + * 新增用户充值记录 + */ + @PreAuthorize("@ss.hasPermi('rechargecard:records:add')") + @PostMapping + @ApiOperation("新增用户充值记录") + public AjaxResult add(@RequestBody NgUserRechargeRecords ngUserRechargeRecords) + { + return toAjax(ngUserRechargeRecordsService.insertNgUserRechargeRecords(ngUserRechargeRecords)); + } + + /** + * 修改用户充值记录 + */ + @PreAuthorize("@ss.hasPermi('rechargecard:records:edit')") + @PutMapping + @ApiOperation("修改用户充值记录") + public AjaxResult edit(@RequestBody NgUserRechargeRecords ngUserRechargeRecords) + { + return toAjax(ngUserRechargeRecordsService.updateNgUserRechargeRecords(ngUserRechargeRecords)); + } + + /** + * 删除用户充值记录 + */ + @PreAuthorize("@ss.hasPermi('rechargecard:records:remove')") + @DeleteMapping("/{ids}") + @ApiOperation("删除用户充值记录") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(ngUserRechargeRecordsService.deleteNgUserRechargeRecordsByIds(ids)); + } +} diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/UserIrrigationRecordController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/UserIrrigationRecordController.java index eafd3f7..2581259 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/UserIrrigationRecordController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/UserIrrigationRecordController.java @@ -65,13 +65,13 @@ public class UserIrrigationRecordController extends BaseController /** * 获取用户灌溉记录展示详细信息列表 */ - @PreAuthorize("@ss.hasPermi('rechargecard:record:query')") + /*@PreAuthorize("@ss.hasPermi('rechargecard:record:query')") @GetMapping(value = "/list/show/{cardNumber}") @ApiOperation("获取灌溉记录详细信息") public AjaxResult getShowInfo(@PathVariable("cardNumber") String cardNumber) { return success(userIrrigationRecordService.selectUserIrrigationRecordListShowBycardNumber(cardNumber)); - } + }*/ /** * 导出灌溉记录列表 diff --git a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/NgRechargeMachines.java b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/NgRechargeMachines.java new file mode 100644 index 0000000..c3edb47 --- /dev/null +++ b/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; + +} diff --git a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/NgUserRechargeRecords.java b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/NgUserRechargeRecords.java new file mode 100644 index 0000000..8cd924b --- /dev/null +++ b/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; + +} diff --git a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/UserRechargeCards.java b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/UserRechargeCards.java index f5147e9..bab0c10 100644 --- a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/UserRechargeCards.java +++ b/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; + } diff --git a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/dto/UserIrrigationRecordDto.java b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/dto/UserIrrigationRecordDto.java index 9574aac..b57b06e 100644 --- a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/dto/UserIrrigationRecordDto.java +++ b/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; diff --git a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/mapper/NgRechargeMachinesMapper.java b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/mapper/NgRechargeMachinesMapper.java new file mode 100644 index 0000000..8be4ec2 --- /dev/null +++ b/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 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); +} diff --git a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/mapper/NgUserRechargeRecordsMapper.java b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/mapper/NgUserRechargeRecordsMapper.java new file mode 100644 index 0000000..929fca7 --- /dev/null +++ b/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 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); +} diff --git a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/INgRechargeMachinesService.java b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/INgRechargeMachinesService.java new file mode 100644 index 0000000..c88420b --- /dev/null +++ b/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 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); +} diff --git a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/INgUserRechargeRecordsService.java b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/INgUserRechargeRecordsService.java new file mode 100644 index 0000000..fdec3ca --- /dev/null +++ b/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 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); +} diff --git a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/IUserIrrigationRecordService.java b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/IUserIrrigationRecordService.java index 99f348b..76705d4 100644 --- a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/IUserIrrigationRecordService.java +++ b/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 selectUserIrrigationRecordListShowBycardNumber(String cardNumber); + //public List selectUserIrrigationRecordListShowBycardNumber(String cardNumber); /** * 查询用户灌溉记录列表 @@ -26,7 +26,7 @@ public interface IUserIrrigationRecordService * @param cardNumber 卡号 * @return 灌溉记录 */ - public List selectUserIrrigationRecordListBycardNumber(String cardNumber); + public List selectUserIrrigationRecordListBycardNumber(String cardNumber); /** * 查询灌溉记录 diff --git a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/NgRechargeMachinesServiceImpl.java b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/NgRechargeMachinesServiceImpl.java new file mode 100644 index 0000000..1704c26 --- /dev/null +++ b/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 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); + } +} diff --git a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/NgUserRechargeRecordsServiceImpl.java b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/NgUserRechargeRecordsServiceImpl.java new file mode 100644 index 0000000..1982702 --- /dev/null +++ b/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 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); + } +} diff --git a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/UserIrrigationRecordServiceImpl.java b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/UserIrrigationRecordServiceImpl.java index 941c8d0..862ffd4 100644 --- a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/UserIrrigationRecordServiceImpl.java +++ b/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 selectUserIrrigationRecordListBycardNumber(String cardNumber) - { - return userIrrigationRecordMapper.selectUserIrrigationRecordListBycardNumber(cardNumber); - } - - /** - * 获取用户灌溉记录展示数据列表 - * @param cardNumber 卡号 - * @return - */ - @Override - public List selectUserIrrigationRecordListShowBycardNumber(String cardNumber) + public List selectUserIrrigationRecordListBycardNumber(String cardNumber) { + //return userIrrigationRecordMapper.selectUserIrrigationRecordListBycardNumber(cardNumber); List result=new ArrayList<>(); List list=userIrrigationRecordMapper.selectUserIrrigationRecordListBycardNumber(cardNumber); for(int i=0;i selectUserIrrigationRecordListShowBycardNumber(String cardNumber) + { + List result=new ArrayList<>(); + List list=userIrrigationRecordMapper.selectUserIrrigationRecordListBycardNumber(cardNumber); + for(int i=0;i + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + + + + insert into ng_recharge_machines + + location, + device_model, + serial_number, + area_code, + installation_date, + status, + contact_person, + contact_phone, + remark, + create_time, + update_time, + create_by, + update_by, + + + #{location}, + #{deviceModel}, + #{serialNumber}, + #{areaCode}, + #{installationDate}, + #{status}, + #{contactPerson}, + #{contactPhone}, + #{remark}, + #{createTime}, + #{updateTime}, + #{createBy}, + #{updateBy}, + + + + + update ng_recharge_machines + + location = #{location}, + device_model = #{deviceModel}, + serial_number = #{serialNumber}, + area_code = #{areaCode}, + installation_date = #{installationDate}, + status = #{status}, + contact_person = #{contactPerson}, + contact_phone = #{contactPhone}, + remark = #{remark}, + create_time = #{createTime}, + update_time = #{updateTime}, + create_by = #{createBy}, + update_by = #{updateBy}, + + where id = #{id} + + + + delete from ng_recharge_machines where id = #{id} + + + + delete from ng_recharge_machines where id in + + #{id} + + + \ No newline at end of file diff --git a/fastbee-service/fastbee-rechargecard-service/src/main/resources/mapper/rechargecard/NgUserRechargeRecordsMapper.xml b/fastbee-service/fastbee-rechargecard-service/src/main/resources/mapper/rechargecard/NgUserRechargeRecordsMapper.xml new file mode 100644 index 0000000..b145330 --- /dev/null +++ b/fastbee-service/fastbee-rechargecard-service/src/main/resources/mapper/rechargecard/NgUserRechargeRecordsMapper.xml @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + + + + insert into ng_user_recharge_records + + 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, + + + #{userId}, + #{userName}, + #{cardNumber}, + #{areaCode}, + #{type}, + #{amount}, + #{balance}, + #{rechargeTime}, + #{rechargeCode}, + #{status}, + #{deviceId}, + #{remark}, + #{createTime}, + #{updateTime}, + #{createBy}, + #{updateBy}, + + + + + update ng_user_recharge_records + + user_id = #{userId}, + user_name = #{userName}, + card_number = #{cardNumber}, + area_code = #{areaCode}, + type = #{type}, + amount = #{amount}, + balance = #{balance}, + recharge_time = #{rechargeTime}, + recharge_code = #{rechargeCode}, + status = #{status}, + device_id = #{deviceId}, + remark = #{remark}, + create_time = #{createTime}, + update_time = #{updateTime}, + create_by = #{createBy}, + update_by = #{updateBy}, + + where id = #{id} + + + + delete from ng_user_recharge_records where id = #{id} + + + + delete from ng_user_recharge_records where id in + + #{id} + + + \ No newline at end of file diff --git a/fastbee-service/fastbee-rechargecard-service/src/main/resources/mapper/rechargecard/UserConsumptionDetailsMapper.xml b/fastbee-service/fastbee-rechargecard-service/src/main/resources/mapper/rechargecard/UserConsumptionDetailsMapper.xml index 50dbe3f..23f9ec1 100644 --- a/fastbee-service/fastbee-rechargecard-service/src/main/resources/mapper/rechargecard/UserConsumptionDetailsMapper.xml +++ b/fastbee-service/fastbee-rechargecard-service/src/main/resources/mapper/rechargecard/UserConsumptionDetailsMapper.xml @@ -27,7 +27,7 @@ - + @@ -35,7 +35,7 @@ - select id, user_id, device_number, card_number, project_id, dept_id, billing_type, pump_time, unit_price, total_price, discount, tax_amount, amount_due, billing_period_unit, billing_period_duration, billing_date, start_time, end_time, payment_status, payment_method, payment_time, status, remarks, create_time, update_time, create_by, update_by from user_consumption_details + select id, user_id, device_number, card_number, project_id, dept_id, billing_type, pump_time, unit_price, total_price, discount, tax_amount, amount_due, billing_period_unit, billing_period_duration, billing_date, start_time, end_time, payment_status, payment_method, payment_time, status, remark, create_time, update_time, create_by, update_by from user_consumption_details @@ -102,7 +102,7 @@ payment_method, payment_time, status, - remarks, + remark, create_time, update_time, create_by, @@ -130,7 +130,7 @@ #{paymentMethod}, #{paymentTime}, #{status}, - #{remarks}, + #{remark}, #{createTime}, #{updateTime}, #{createBy}, @@ -162,7 +162,7 @@ payment_method = #{paymentMethod}, payment_time = #{paymentTime}, status = #{status}, - remarks = #{remarks}, + remark = #{remark}, create_time = #{createTime}, update_time = #{updateTime}, create_by = #{createBy}, diff --git a/fastbee-service/fastbee-rechargecard-service/src/main/resources/mapper/rechargecard/UserIrrigationRecordMapper.xml b/fastbee-service/fastbee-rechargecard-service/src/main/resources/mapper/rechargecard/UserIrrigationRecordMapper.xml index dc8348a..6ffaef3 100644 --- a/fastbee-service/fastbee-rechargecard-service/src/main/resources/mapper/rechargecard/UserIrrigationRecordMapper.xml +++ b/fastbee-service/fastbee-rechargecard-service/src/main/resources/mapper/rechargecard/UserIrrigationRecordMapper.xml @@ -57,10 +57,11 @@ + @@ -44,6 +45,7 @@ and expiration_date = #{expirationDate} and status = #{status} and user_id = #{userId} + and area_code = #{areaCode} @@ -72,6 +74,7 @@ update_by, del_flag, user_id, + area_code #{userName}, @@ -91,6 +94,7 @@ #{updateBy}, #{delFlag}, #{userId}, + #{areaCode} @@ -114,6 +118,7 @@ update_by = #{updateBy}, del_flag = #{delFlag}, user_id = #{userId}, + area_code = #{areaCode} where id = #{id}