diff --git a/doc/运营小程序接口文档.md b/doc/运营小程序接口文档.md index 930a17681..92479368c 100644 --- a/doc/运营小程序接口文档.md +++ b/doc/运营小程序接口文档.md @@ -161,7 +161,7 @@ 请求方式:POST -入参 +### 入参 | 字段名 | 类型 | 是否必传 | 备注 | | ---------- | ------------ | -------- | --------------------------------------- | @@ -169,7 +169,7 @@ | type | String | Y | 日期类型(1-近7天;2-近30天;3-近一年) | | dateTime | String | N | 用户选中某天的日期 | -反参 +### 反参 | 字段名 | 类型 | 是否必传 | 备注 | | ------------------------------- | ------------------------- | -------- | ---------------- | diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/business/BusinessStationInfoController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/business/BusinessStationInfoController.java index fd995617e..dccac02d9 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/business/BusinessStationInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/business/BusinessStationInfoController.java @@ -5,8 +5,8 @@ import com.google.common.collect.ImmutableMap; import com.jsowell.common.core.controller.BaseController; import com.jsowell.common.exception.BusinessException; import com.jsowell.common.response.RestApiResponse; -import com.jsowell.pile.dto.StationBusinessAnalyzeInfoDTO; -import com.jsowell.pile.dto.StationStatisticsInfoDTO; +import com.jsowell.pile.dto.business.StationBusinessAnalyzeInfoDTO; +import com.jsowell.pile.dto.business.StationStatisticsInfoDTO; import com.jsowell.pile.service.OrderBasicInfoService; import com.jsowell.pile.service.PileStationInfoService; import com.jsowell.pile.vo.uniapp.business.StationBusinessAnalyzeInfoVO; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/business/QueryConnectorInfoDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/business/QueryConnectorInfoDTO.java new file mode 100644 index 000000000..755f145fd --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/business/QueryConnectorInfoDTO.java @@ -0,0 +1,38 @@ +package com.jsowell.pile.dto.business; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 运营端小程序查询枪口信息DTO + * + * @author Lemon + * @Date 2024/8/26 14:33:12 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class QueryConnectorInfoDTO { + /** + * 站点id + */ + private String stationId; + + /** + * 枪口状态 + */ + private String connectorStatus; + + /** + * 页码 + */ + private int pageNum; + + /** + * 每页条数 + */ + private int pageSize; +} diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/StationBusinessAnalyzeInfoDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/business/StationBusinessAnalyzeInfoDTO.java similarity index 94% rename from jsowell-pile/src/main/java/com/jsowell/pile/dto/StationBusinessAnalyzeInfoDTO.java rename to jsowell-pile/src/main/java/com/jsowell/pile/dto/business/StationBusinessAnalyzeInfoDTO.java index 4105ee661..86abb9264 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/StationBusinessAnalyzeInfoDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/business/StationBusinessAnalyzeInfoDTO.java @@ -1,4 +1,4 @@ -package com.jsowell.pile.dto; +package com.jsowell.pile.dto.business; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/StationStatisticsInfoDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/business/StationStatisticsInfoDTO.java similarity index 91% rename from jsowell-pile/src/main/java/com/jsowell/pile/dto/StationStatisticsInfoDTO.java rename to jsowell-pile/src/main/java/com/jsowell/pile/dto/business/StationStatisticsInfoDTO.java index ea304b528..aeb0cfdf6 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/StationStatisticsInfoDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/business/StationStatisticsInfoDTO.java @@ -1,4 +1,4 @@ -package com.jsowell.pile.dto; +package com.jsowell.pile.dto.business; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileConnectorInfoMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileConnectorInfoMapper.java index ed47af802..361e6a26d 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileConnectorInfoMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileConnectorInfoMapper.java @@ -114,4 +114,10 @@ public interface PileConnectorInfoMapper { */ List getUniAppConnectorList(@Param("stationId") Long stationId); + /** + * 批量查询枪口状态 + * @param pileConnectorCodeList + * @return + */ + List getConnectorStatus(@Param("pileConnectorCodeList") List pileConnectorCodeList); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileConnectorInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileConnectorInfoService.java index a51a370d7..db59dc586 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileConnectorInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileConnectorInfoService.java @@ -5,6 +5,7 @@ import com.jsowell.pile.domain.PileConnectorInfo; import com.jsowell.pile.dto.QueryConnectorDTO; import com.jsowell.pile.dto.QueryConnectorListDTO; import com.jsowell.pile.dto.UpdateConnectorParkNoDTO; +import com.jsowell.pile.dto.business.QueryConnectorInfoDTO; import com.jsowell.pile.vo.base.ConnectorInfoVO; import com.jsowell.pile.vo.web.PileConnectorInfoVO; @@ -128,9 +129,17 @@ public interface PileConnectorInfoService { /** * 修改车位号 - * @param pileConnectorInfo + * @param dto */ int updateConnectorParkNo(UpdateConnectorParkNoDTO dto); boolean checkPileOffLine(String pileSn); + + + //↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓ 后管小程序 ↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓ + + /** + * 通过站点id和枪口状态查询枪口列表 + */ + void getConnectorListByStationAndStatus(QueryConnectorInfoDTO dto); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileStationInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileStationInfoService.java index 76c79ed10..c40658719 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileStationInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileStationInfoService.java @@ -4,6 +4,8 @@ import com.jsowell.common.core.page.PageResponse; import com.jsowell.pile.domain.PileStationInfo; import com.jsowell.pile.dto.*; import com.jsowell.pile.dto.amap.GetStationInfoDTO; +import com.jsowell.pile.dto.business.StationBusinessAnalyzeInfoDTO; +import com.jsowell.pile.dto.business.StationStatisticsInfoDTO; import com.jsowell.pile.dto.lutongyunting.BindParkingPlatformDTO; import com.jsowell.pile.dto.ningxiajiaotou.NXJTQueryStationInfoDTO; import com.jsowell.pile.vo.uniapp.business.StationBusinessAnalyzeInfoVO; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java index bdee87381..1199b15e2 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java @@ -22,6 +22,7 @@ import com.jsowell.pile.domain.PileConnectorInfo; import com.jsowell.pile.dto.QueryConnectorDTO; import com.jsowell.pile.dto.QueryConnectorListDTO; import com.jsowell.pile.dto.UpdateConnectorParkNoDTO; +import com.jsowell.pile.dto.business.QueryConnectorInfoDTO; import com.jsowell.pile.mapper.PileBasicInfoMapper; import com.jsowell.pile.mapper.PileConnectorInfoMapper; import com.jsowell.pile.service.*; @@ -769,4 +770,45 @@ public class PileConnectorInfoServiceImpl implements PileConnectorInfoService { return i; } + + /** + * 批量获取枪口状态 + * @param pileConnectorCodeList + * @return + */ + private Map getConnectorStatus(List pileConnectorCodeList) { + List pileConnectorInfos = pileConnectorInfoMapper.getConnectorStatus(pileConnectorCodeList); + for (PileConnectorInfo pileConnectorInfo : pileConnectorInfos) { + String status = pileConnectorInfo.getStatus(); + if (StringUtils.equals(status, PileConnectorDataBaseStatusEnum.OFF_NETWORK.getValue())) { + + } + } + return null; + } + + //↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓ 后管小程序 ↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓ + + @Override + public void getConnectorListByStationAndStatus(QueryConnectorInfoDTO dto) { + String stationId = dto.getStationId(); + String connectorStatus = dto.getConnectorStatus(); + int pageNum = dto.getPageNum(); + int pageSize = dto.getPageSize(); + + // 根据站点id和枪口状态查询枪口列表 + QueryConnectorListDTO queryConnectorListDTO = QueryConnectorListDTO.builder() + .pageNum(pageNum) + .pageSize(pageSize) + .stationIdList(Lists.newArrayList(Long.parseLong(stationId))) + .build(); + List pileConnectorInfoVOList = getConnectorInfoListByParams(queryConnectorListDTO); + if (connectorStatus != null) { + // 筛选出符合状态的数据 + pileConnectorInfoVOList = pileConnectorInfoVOList.stream() + .filter(x -> x.getStatus() == Integer.parseInt(connectorStatus)) + .collect(Collectors.toList()); + } + + } } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java index 96af673cf..6424a1720 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java @@ -14,10 +14,7 @@ import com.jsowell.common.core.redis.RedisCache; import com.jsowell.common.enums.ykc.PileConnectorDataBaseStatusEnum; import com.jsowell.common.enums.ykc.ReturnCodeEnum; import com.jsowell.common.exception.BusinessException; -import com.jsowell.common.util.DateUtils; -import com.jsowell.common.util.DistanceUtils; -import com.jsowell.common.util.SecurityUtils; -import com.jsowell.common.util.StringUtils; +import com.jsowell.common.util.*; import com.jsowell.common.util.ip.AddressUtils; import com.jsowell.pile.domain.PileBasicInfo; import com.jsowell.pile.domain.PileStationInfo; @@ -25,6 +22,8 @@ import com.jsowell.pile.domain.SettleOrderReport; import com.jsowell.pile.domain.ThirdpartyParkingConfig; import com.jsowell.pile.dto.*; import com.jsowell.pile.dto.amap.GetStationInfoDTO; +import com.jsowell.pile.dto.business.StationBusinessAnalyzeInfoDTO; +import com.jsowell.pile.dto.business.StationStatisticsInfoDTO; import com.jsowell.pile.dto.lutongyunting.BindParkingPlatformDTO; import com.jsowell.pile.dto.ningxiajiaotou.NXJTQueryStationInfoDTO; import com.jsowell.pile.mapper.PileStationInfoMapper; @@ -37,8 +36,6 @@ import com.jsowell.pile.vo.uniapp.business.StationBusinessAnalyzeInfoVO; import com.jsowell.pile.vo.uniapp.business.StationOrderQuantityInfoVO; import com.jsowell.pile.vo.uniapp.business.StationStatisticsInfosVO; import com.jsowell.pile.vo.uniapp.customer.CurrentTimePriceDetails; -import com.jsowell.pile.vo.web.OrderDetailInfoVO; -import com.jsowell.pile.vo.web.PileConnectorInfoVO; import com.jsowell.pile.vo.web.PileStationVO; import com.jsowell.system.service.SysDeptService; import com.jsowell.system.service.SysUserService; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/business/BusinessConnectorInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/business/BusinessConnectorInfoVO.java new file mode 100644 index 000000000..6d30195e1 --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/business/BusinessConnectorInfoVO.java @@ -0,0 +1,68 @@ +package com.jsowell.pile.vo.uniapp.business; + +import com.jsowell.pile.vo.web.PileConnectorInfoVO; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * 运营端小程序枪口信息VO + * + * @author Lemon + * @Date 2024/8/27 8:33:37 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class BusinessConnectorInfoVO { + /** + * 站点id + */ + private String stationId; + + /** + * 站点名称 + */ + private String stationName; + + /** + * 总枪口数量 + */ + private String connectorNum; + + /** + * 充电中枪口数量 + */ + private String chargingConnectorNum; + + /** + * 空闲枪口数量 + */ + private String freeConnectorNum; + + /** + * 挂起枪口数量 + */ + private String hangingConnectorNum; + + /** + * 占用中枪口数量 + */ + private String occupiedConnectorNum; + + /** + * 离线枪口数量 + */ + private String offlineConnectorNum; + + /** + * 故障枪口数量 + */ + private String faultConnectorNum; + + private List pileConnectorInfoVOList; +} diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileConnectorInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileConnectorInfoMapper.xml index d867e38d3..2738e1b51 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileConnectorInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileConnectorInfoMapper.xml @@ -247,4 +247,14 @@ WHERE t1.del_flag = '0' AND t2.station_id = #{stationId,jdbcType=BIGINT} + + \ No newline at end of file