diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/Dto/Options.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/Dto/Options.java new file mode 100644 index 0000000..c258965 --- /dev/null +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/Dto/Options.java @@ -0,0 +1,30 @@ +package com.evotech.hd.common.core.Dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +/** + * Options + * + * @author andy.shi + * @ClassName:Options + * @date: 2026年02月14日 9:54 + * @remark: 开发人员联系方式 1042025947@qq.com/微信同步 + */ +@Data +@Schema(name = "下拉菜单参数") +public class Options { + + @Schema(description = "下拉菜单的label") + String label; + @Schema(description = "下拉菜单的value") + String value; + + public Options() { + } + + public Options(String label, String value) { + this.label = label; + this.value = value; + } +} diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStation.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStation.java index 3441a39..d79815e 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStation.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStation.java @@ -27,6 +27,11 @@ public class BatteryStation extends BaseEntity implements Serializable { @Schema(description = "归属运营商ID", requiredMode = RequiredMode.REQUIRED) @NotBlank(message = "无关联运营商信息") private String proxyId; + @Schema(description = "运营商名称", requiredMode = RequiredMode.REQUIRED) + @TableField(exist = false) + private String poname; + + @Schema(description = "站点名称", requiredMode = RequiredMode.REQUIRED) @NotBlank(message = "站点名称不能为空") diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/request/PageListSwapOrderRequest.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/request/PageListSwapOrderRequest.java index 9044236..0fd74ec 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/request/PageListSwapOrderRequest.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/request/PageListSwapOrderRequest.java @@ -1,15 +1,13 @@ package com.evotech.hd.common.core.entity.cloud.request; -import java.util.Date; - -import org.springframework.format.annotation.DateTimeFormat; - import com.evotech.hd.common.core.entity.BasePageRequest; import com.fasterxml.jackson.annotation.JsonFormat; - import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; @Data @@ -54,6 +52,9 @@ public class PageListSwapOrderRequest extends BasePageRequest { @Schema(description = "公司编码") private String ccode; + + @Schema(description = "运营商code") + private String proCode; diff --git a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/dao/MessageMqttDao.java b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/dao/MessageMqttDao.java index 5e3cdde..e99a53f 100644 --- a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/dao/MessageMqttDao.java +++ b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/dao/MessageMqttDao.java @@ -1,7 +1,12 @@ package com.evotech.hd.cloud.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.evotech.hd.cloud.entity.MessageMqtt; +import com.evotech.hd.cloud.entity.request.PageListMessageMqttRequest; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * @author zrb @@ -9,4 +14,5 @@ import com.evotech.hd.cloud.entity.MessageMqtt; */ public interface MessageMqttDao extends BaseMapper { + List pageList(Page page, @Param("param") PageListMessageMqttRequest plmmr); } diff --git a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/entity/MessageMqtt.java b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/entity/MessageMqtt.java index f293a43..141fe11 100644 --- a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/entity/MessageMqtt.java +++ b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/entity/MessageMqtt.java @@ -1,6 +1,7 @@ package com.evotech.hd.cloud.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -30,6 +31,11 @@ public class MessageMqtt implements Serializable { @Schema(description = "换电站") private String stationCode; + @Schema(description = "换电站名称") + @TableField(exist = false) + private String stationName; + + @Schema(description = "传送方向") private String direction; diff --git a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/BatteryStationServiceImpl.java b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/BatteryStationServiceImpl.java index be5f019..f506c61 100644 --- a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/BatteryStationServiceImpl.java +++ b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/BatteryStationServiceImpl.java @@ -346,7 +346,7 @@ public class BatteryStationServiceImpl implements BatteryStationService { @Override public List deviceList(String proxyCode) { - return batteryStationDao.selectList(new LambdaQueryWrapper().eq(BatteryStation::getProxyId, proxyCode).select(BatteryStation::getPkId, BatteryStation::getName, BatteryStation::getStoreId, BatteryStation::getOrgCode)); + return batteryStationDao.selectList(new LambdaQueryWrapper().eq(BatteryStation::getProxyId, proxyCode).select(BatteryStation::getPkId, BatteryStation::getName, BatteryStation::getCode, BatteryStation::getStoreId, BatteryStation::getOrgCode)); } @Override diff --git a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/MessageMqttServiceImpl.java b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/MessageMqttServiceImpl.java index 62a06bd..e97e564 100644 --- a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/MessageMqttServiceImpl.java +++ b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/MessageMqttServiceImpl.java @@ -1,7 +1,6 @@ package com.evotech.hd.cloud.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.evotech.hd.cloud.dao.MessageMqttDao; import com.evotech.hd.cloud.entity.MessageMqtt; @@ -14,7 +13,6 @@ import com.evotech.hd.common.core.utils.Collections; import jakarta.annotation.Resource; import org.apache.commons.lang3.time.DateFormatUtils; import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; import java.util.Date; import java.util.List; @@ -30,12 +28,18 @@ public class MessageMqttServiceImpl implements MessageMqttService { @Override public Result> list(PageListMessageMqttRequest plmmr) { Page page = new Page(plmmr.getPageNo(), plmmr.getPageSize()); - page = messageMqttDao.selectPage(page, new QueryWrapper() - .eq(StringUtils.hasText(plmmr.getStationCode()), "station_code", plmmr.getStationCode()) - .eq(StringUtils.hasText(plmmr.getDirection()), "direction", plmmr.getDirection()) - .eq(StringUtils.hasText(plmmr.getType()), "type", plmmr.getType()) - .eq(StringUtils.hasText(plmmr.getMessageFunction()), "message_function", plmmr.getMessageFunction()) - .orderByDesc("pk_id")); + List list = messageMqttDao.pageList(page, plmmr); + + + +// page = messageMqttDao.selectPage(page, new QueryWrapper() +// .eq(StringUtils.hasText(plmmr.getStationCode()), "station_code", plmmr.getStationCode()) +// .eq(StringUtils.hasText(plmmr.getDirection()), "direction", plmmr.getDirection()) +// .eq(StringUtils.hasText(plmmr.getType()), "type", plmmr.getType()) +// .eq(StringUtils.hasText(plmmr.getMessageFunction()), "message_function", plmmr.getMessageFunction()) +// .orderByDesc("pk_id")); + page.setRecords(list); + if (page.getRecords().isEmpty()) { return new Result>().error(CodeMsg.DATABASE_RESULT_NULL); } diff --git a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/OrderServiceImpl.java b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/OrderServiceImpl.java index 20d630c..308638d 100644 --- a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/OrderServiceImpl.java +++ b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/OrderServiceImpl.java @@ -103,6 +103,8 @@ public class OrderServiceImpl extends ServiceImpl implements Or @Autowired private BatteryStationDcService batteryStationDcService; @Autowired + private BatteryStationService batteryStationService; + @Autowired private OrderSwapBatteryStepService orderSwapBatteryStepService; @Autowired private OrderDetailService orderDetailService; @@ -117,6 +119,15 @@ public class OrderServiceImpl extends ServiceImpl implements Or @Override public Result> pageList(PageListSwapOrderRequest plsor) { + List stationCodeList = Collections.emptyList(); + if(StringUtils.isNotEmpty(plsor.getProCode())){ + List list = batteryStationService.deviceList(plsor.getProCode()); + if(Collections.isNotEmpty(list)){ + for (BatteryStation station : list){ + stationCodeList.add(station.getCode()); + } + } + } Page page = getBaseMapper().selectPage(new Page(plsor.getPageNo(), plsor.getPageSize()), new LambdaQueryWrapper() .eq(StringUtils.isNotEmpty(plsor.getOrderNo()), Order::getOrderNo, plsor.getOrderNo()) @@ -127,6 +138,7 @@ public class OrderServiceImpl extends ServiceImpl implements Or .eq(StringUtils.isNotEmpty(plsor.getTradeNo()), Order::getTradeNo, plsor.getTradeNo()) .eq(StringUtils.isNotEmpty(plsor.getStatus()), Order::getStatus, plsor.getStatus()) .eq(StringUtils.isNotEmpty(plsor.getUserId()), Order::getPreWechatId, plsor.getUserId()) + .in(Collections.isNotEmpty(stationCodeList), Order::getStationCode, stationCodeList) .ne(Order::getDelFlag, 1) .orderByDesc(Order::getOrderTime)); diff --git a/cloud-manage-server/src/main/resources/mapper/BatteryStationMapper.xml b/cloud-manage-server/src/main/resources/mapper/BatteryStationMapper.xml index a7038be..76a75c5 100644 --- a/cloud-manage-server/src/main/resources/mapper/BatteryStationMapper.xml +++ b/cloud-manage-server/src/main/resources/mapper/BatteryStationMapper.xml @@ -61,11 +61,13 @@ + select + m.*, + s.name as stationName + From + yt_t_message_mqtt m + LEFT JOIN yt_t_battery_station s ON s.code= m.station_code + + + and m.station_code = #{param.stationCode} + + + and m.direction = #{param.direction} + + + and m.type = #{param.type} + + + and m.message_function = #{param.messageFunction} + + + + order by m.pk_id desc + + + diff --git a/cloud-manage-server/src/main/resources/mapper/OrderMapper.xml b/cloud-manage-server/src/main/resources/mapper/OrderMapper.xml index deb1985..2444342 100644 --- a/cloud-manage-server/src/main/resources/mapper/OrderMapper.xml +++ b/cloud-manage-server/src/main/resources/mapper/OrderMapper.xml @@ -179,6 +179,9 @@ from hd_cloud_manage.yt_t_order o left join hd_cloud_manage.yt_t_order_detail od on od.order_id = o.pk_id left join hd_cloud_manage.yt_t_order_swap_battery_pre osbp on osbp.pk_id = o.order_pre_id + + left join hd_cloud_manage.yt_t_battery_station bs on bs.station_code = o.station_code + where o.del_flag != 1 and o.order_no=#{orderNo} @@ -204,6 +207,9 @@ and o.user_id=#{userId} + + and bs.proxy_id = #{proCode} + order by order_time desc diff --git a/resource-server/src/main/java/com/evotech/hd/resource/controller/ProxyOperaterController.java b/resource-server/src/main/java/com/evotech/hd/resource/controller/ProxyOperaterController.java index 071998d..e515c3d 100644 --- a/resource-server/src/main/java/com/evotech/hd/resource/controller/ProxyOperaterController.java +++ b/resource-server/src/main/java/com/evotech/hd/resource/controller/ProxyOperaterController.java @@ -1,6 +1,7 @@ package com.evotech.hd.resource.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.evotech.hd.common.core.Dto.Options; import com.evotech.hd.common.core.Dto.Result; import com.evotech.hd.common.core.entity.resource.ProxyOperater; import com.evotech.hd.resource.entity.request.PageListProxyOperaterRequest; @@ -64,7 +65,11 @@ public class ProxyOperaterController { return proxyOperaterService.basicInfo(proxyCode); } - - + @Operation(summary = "下拉菜单选项") + @GetMapping("/option/list") + @ApiOperationSupport(order = 5) + public Result> optionList() { + return proxyOperaterService.optionsList(); + } } diff --git a/resource-server/src/main/java/com/evotech/hd/resource/service/ProxyOperaterService.java b/resource-server/src/main/java/com/evotech/hd/resource/service/ProxyOperaterService.java index a15104b..6643728 100644 --- a/resource-server/src/main/java/com/evotech/hd/resource/service/ProxyOperaterService.java +++ b/resource-server/src/main/java/com/evotech/hd/resource/service/ProxyOperaterService.java @@ -1,6 +1,7 @@ package com.evotech.hd.resource.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.evotech.hd.common.core.Dto.Options; import com.evotech.hd.common.core.Dto.Result; import com.evotech.hd.common.core.entity.resource.ProxyOperater; import com.evotech.hd.resource.entity.request.PageListProxyOperaterRequest; @@ -20,4 +21,6 @@ public interface ProxyOperaterService { public Result> deviceList(); Result basicInfo(String proxyCode); + + public Result> optionsList(); } diff --git a/resource-server/src/main/java/com/evotech/hd/resource/service/impl/ProxyOperaterServiceImpl.java b/resource-server/src/main/java/com/evotech/hd/resource/service/impl/ProxyOperaterServiceImpl.java index faf8154..8ff4c4f 100644 --- a/resource-server/src/main/java/com/evotech/hd/resource/service/impl/ProxyOperaterServiceImpl.java +++ b/resource-server/src/main/java/com/evotech/hd/resource/service/impl/ProxyOperaterServiceImpl.java @@ -3,6 +3,7 @@ package com.evotech.hd.resource.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.evotech.hd.common.core.Dto.Options; import com.evotech.hd.common.core.Dto.Result; import com.evotech.hd.common.core.dao.resource.ProxyOperaterDao; import com.evotech.hd.common.core.entity.resource.ProxyOperater; @@ -16,6 +17,7 @@ import org.springframework.util.StringUtils; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; @Service public class ProxyOperaterServiceImpl implements ProxyOperaterService { @@ -80,4 +82,11 @@ public class ProxyOperaterServiceImpl implements ProxyOperaterService { return new Result().success(proxyOperaterDao.selectOne(new LambdaQueryWrapper().eq(ProxyOperater::getPocode, proxyCode).select(ProxyOperater::getPkId, ProxyOperater::getPoname,ProxyOperater::getPocode), false)); } + @Override + public Result> optionsList() { + return new Result>().success(proxyOperaterDao.selectList(new LambdaQueryWrapper().select(ProxyOperater::getPoname, ProxyOperater::getPocode).eq(ProxyOperater::getDelFlag, 0)).stream().map(data->{ + return new Options(data.getPoname(), data.getPocode()); + }).collect(Collectors.toList())); + } + }