Merge branch 'dev-new' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev-new

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;
+    }
 }

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;
+
+}

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);
 }

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<PileFirmwareInfo> list = selectPileFirmwareInfoList(pileFirmwareInfo);
+
+        PageInfo<PileFirmwareInfo> 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;
+    }
 }

jsowell-pile/src/main/resources/mapper/pile/PileFirmwareInfoMapper.xml

@@ -27,6 +27,7 @@
         <include refid="selectPileFirmwareInfoVo"/>
         <where>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="useRange != null  and useRange != ''"> and use_range = #{useRange,jdbcType=VARCHAR}</if>
         </where>
     </select>