From ee0eddb680c75f28597ff1690866592f8d29c642 Mon Sep 17 00:00:00 2001 From: Lemon Date: Thu, 21 Nov 2024 16:24:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=20=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E6=9F=A5=E8=AF=A2=E6=A1=A9=E5=8D=87=E7=BA=A7=E5=9B=BA?= =?UTF-8?q?=E4=BB=B6=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../uniapp/customer/PersonPileController.java | 24 +++++++++++++ .../jsowell/pile/dto/PileFirmwareInfoDTO.java | 30 ++++++++++++++++ .../pile/service/PileFirmwareInfoService.java | 9 +++++ .../impl/PileFirmwareInfoServiceImpl.java | 34 +++++++++++++++++++ .../mapper/pile/PileFirmwareInfoMapper.xml | 1 + 5 files changed, 98 insertions(+) create mode 100644 jsowell-pile/src/main/java/com/jsowell/pile/dto/PileFirmwareInfoDTO.java diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PersonPileController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PersonPileController.java index be6dd77d0..4d73641d7 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PersonPileController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PersonPileController.java @@ -4,14 +4,17 @@ import com.alibaba.fastjson2.JSON; import com.google.common.collect.ImmutableMap; import com.jsowell.common.UserAgentUtils; import com.jsowell.common.annotation.Anonymous; +import com.jsowell.common.constant.Constants; import com.jsowell.common.core.controller.BaseController; import com.jsowell.common.core.page.PageResponse; import com.jsowell.common.enums.ykc.ReturnCodeEnum; import com.jsowell.common.exception.BusinessException; import com.jsowell.common.response.RestApiResponse; import com.jsowell.common.util.StringUtils; +import com.jsowell.pile.domain.PileFirmwareInfo; import com.jsowell.pile.dto.*; import com.jsowell.pile.service.PileBasicInfoService; +import com.jsowell.pile.service.PileFirmwareInfoService; import com.jsowell.pile.service.PileMerchantInfoService; import com.jsowell.pile.service.PileReservationInfoService; import com.jsowell.pile.vo.PileReservationInfoVO; @@ -52,6 +55,9 @@ public class PersonPileController extends BaseController { @Autowired private PileReservationInfoService pileReservationInfoService; + @Autowired + private PileFirmwareInfoService pileFirmwareInfoService; + /** * 用户绑定个人桩 @@ -509,4 +515,22 @@ public class PersonPileController extends BaseController { logger.info("保存蓝牙充电记录params:{}, result:{}", dto, JSON.toJSONString(response)); return response; } + + /** + * 查询桩升级程序信息列表 + * http://localhost:8080/uniapp/personalPile/selectPileFirmwareList + * @return + */ + @PostMapping("/selectPileFirmwareList") + public RestApiResponse selectPileFirmwareList(@RequestBody PileFirmwareInfoDTO dto) { + RestApiResponse response = null; + try { + PageResponse pageResponse = pileFirmwareInfoService.selectPileFirmwareListByUseRange(dto); + response = new RestApiResponse<>(pageResponse); + } catch (Exception e) { + logger.error("查询桩升级程序信息列表 error, ",e); + } + logger.info("查询桩升级程序信息列表 param:{}, result:{}", JSON.toJSONString(dto), response); + return response; + } } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/PileFirmwareInfoDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/PileFirmwareInfoDTO.java new file mode 100644 index 000000000..6fe65c6ff --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/PileFirmwareInfoDTO.java @@ -0,0 +1,30 @@ +package com.jsowell.pile.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 查询桩固件DTO + * + * @author Lemon + * @Date 2024/11/21 16:03:18 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class PileFirmwareInfoDTO { + + private Integer pageNo; + + private Integer pageSize; + + /** + * 使用范围 + * 1-4G；2-蓝牙 + */ + private String useRange; + +} diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileFirmwareInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileFirmwareInfoService.java index daafa1bea..4b757c819 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileFirmwareInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileFirmwareInfoService.java @@ -1,6 +1,8 @@ package com.jsowell.pile.service; +import com.jsowell.common.core.page.PageResponse; import com.jsowell.pile.domain.PileFirmwareInfo; +import com.jsowell.pile.dto.PileFirmwareInfoDTO; import org.springframework.web.multipart.MultipartFile; import java.util.List; @@ -59,4 +61,11 @@ public interface PileFirmwareInfoService { * @return 结果 */ public int deletePileFirmwareInfoById(Long id); + + /** + * 通过使用范围查询桩固件信息列表 + * @param dto + * @return + */ + PageResponse selectPileFirmwareListByUseRange(PileFirmwareInfoDTO dto); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileFirmwareInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileFirmwareInfoServiceImpl.java index f0007cb5b..9fb339a7d 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileFirmwareInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileFirmwareInfoServiceImpl.java @@ -1,8 +1,14 @@ package com.jsowell.pile.service.impl; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.jsowell.common.constant.Constants; +import com.jsowell.common.core.page.PageResponse; import com.jsowell.common.util.DateUtils; import com.jsowell.common.util.file.AliyunOssUploadUtils; import com.jsowell.pile.domain.PileFirmwareInfo; +import com.jsowell.pile.domain.PileReservationInfo; +import com.jsowell.pile.dto.PileFirmwareInfoDTO; import com.jsowell.pile.mapper.PileFirmwareInfoMapper; import com.jsowell.pile.service.PileFirmwareInfoService; import org.springframework.beans.factory.annotation.Autowired; @@ -100,4 +106,32 @@ public class PileFirmwareInfoServiceImpl implements PileFirmwareInfoService { public int deletePileFirmwareInfoById(Long id) { return pileFirmwareInfoMapper.deletePileFirmwareInfoById(id); } + + /** + * 通过使用范围查询桩固件信息列表 + * @param dto + * @return + */ + @Override + public PageResponse selectPileFirmwareListByUseRange(PileFirmwareInfoDTO dto) { + int pageNo = dto.getPageNo() == null ? Constants.one : dto.getPageNo(); + int pageSize = dto.getPageSize() == null ? 10 : dto.getPageSize(); + + PileFirmwareInfo pileFirmwareInfo = new PileFirmwareInfo(); + pileFirmwareInfo.setUseRange(dto.getUseRange()); + + PageHelper.startPage(pageNo, pageSize); + List list = selectPileFirmwareInfoList(pileFirmwareInfo); + + PageInfo pageInfo = new PageInfo<>(list); + + PageResponse pageResponse = new PageResponse(); + pageResponse.setPageNum(pageInfo.getPageNum()); + pageResponse.setPageSize(pageInfo.getPageSize()); + pageResponse.setPages(pageInfo.getPages()); + pageResponse.setTotal(pageInfo.getTotal()); + pageResponse.setList(pageInfo.getList()); + + return pageResponse; + } } diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileFirmwareInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileFirmwareInfoMapper.xml index be56640c9..836e2a5b9 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileFirmwareInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileFirmwareInfoMapper.xml @@ -27,6 +27,7 @@ and name like concat('%', #{name}, '%') + and use_range = #{useRange,jdbcType=VARCHAR}