diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/asset/AssetApi.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/asset/AssetApi.java similarity index 78% rename from ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/asset/AssetApi.java rename to ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/asset/AssetApi.java index fc4ca56cd..30cd889f5 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/asset/AssetApi.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/asset/AssetApi.java @@ -1,7 +1,6 @@ -package cn.iocoder.yudao.module.datacenter.controller.admin.asset; +package cn.iocoder.yudao.module.datacenter.controller.app.asset; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.datacenter.controller.admin.asset.vo.AssetRespVO; +import cn.iocoder.yudao.module.datacenter.controller.app.asset.vo.AssetRespVO; import cn.iocoder.yudao.module.datacenter.service.asset.AssetService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -15,14 +14,12 @@ import javax.annotation.Resource; import java.util.List; import java.util.Map; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; - /** * @Description 设备 */ @Tag(name = "大屏服务 - 设备") @RestController -@RequestMapping("/datacenter/asset") +@RequestMapping("/asset") @Validated public class AssetApi { @Resource diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/asset/vo/AssetRespVO.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/asset/vo/AssetRespVO.java similarity index 95% rename from ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/asset/vo/AssetRespVO.java rename to ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/asset/vo/AssetRespVO.java index 13f124e6f..06b44e90c 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/asset/vo/AssetRespVO.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/asset/vo/AssetRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.datacenter.controller.admin.asset.vo; +package cn.iocoder.yudao.module.datacenter.controller.app.asset.vo; import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/checkticket/CheckTicketApi.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/checkticket/CheckTicketApi.java similarity index 83% rename from ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/checkticket/CheckTicketApi.java rename to ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/checkticket/CheckTicketApi.java index 5b83dc24c..81dbc89b2 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/checkticket/CheckTicketApi.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/checkticket/CheckTicketApi.java @@ -1,6 +1,5 @@ -package cn.iocoder.yudao.module.datacenter.controller.admin.checkticket; +package cn.iocoder.yudao.module.datacenter.controller.app.checkticket; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.datacenter.service.checkticket.CheckTicketService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -11,8 +10,6 @@ import javax.annotation.Resource; import java.util.List; import java.util.Map; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; - /** * @Description 检票 */ diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/checkticket/vo/CheckTicketPageReqVO.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/checkticket/vo/CheckTicketPageReqVO.java similarity index 95% rename from ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/checkticket/vo/CheckTicketPageReqVO.java rename to ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/checkticket/vo/CheckTicketPageReqVO.java index 4c468a9d1..298391891 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/checkticket/vo/CheckTicketPageReqVO.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/checkticket/vo/CheckTicketPageReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.datacenter.controller.admin.checkticket.vo; +package cn.iocoder.yudao.module.datacenter.controller.app.checkticket.vo; import cn.iocoder.yudao.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/checkticket/vo/CheckTicketRespVO.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/checkticket/vo/CheckTicketRespVO.java similarity index 95% rename from ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/checkticket/vo/CheckTicketRespVO.java rename to ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/checkticket/vo/CheckTicketRespVO.java index 0d4153932..c06f453ef 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/checkticket/vo/CheckTicketRespVO.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/checkticket/vo/CheckTicketRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.datacenter.controller.admin.checkticket.vo; +package cn.iocoder.yudao.module.datacenter.controller.app.checkticket.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/checkticket/vo/CheckTicketSaveReqVO.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/checkticket/vo/CheckTicketSaveReqVO.java similarity index 93% rename from ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/checkticket/vo/CheckTicketSaveReqVO.java rename to ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/checkticket/vo/CheckTicketSaveReqVO.java index 1a9538e3a..4d7b88620 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/checkticket/vo/CheckTicketSaveReqVO.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/checkticket/vo/CheckTicketSaveReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.datacenter.controller.admin.checkticket.vo; +package cn.iocoder.yudao.module.datacenter.controller.app.checkticket.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/saledata/SaleDataApi.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/saledata/SaleDataApi.java similarity index 94% rename from ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/saledata/SaleDataApi.java rename to ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/saledata/SaleDataApi.java index d7cbe87e4..08e698cfe 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/saledata/SaleDataApi.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/saledata/SaleDataApi.java @@ -1,6 +1,5 @@ -package cn.iocoder.yudao.module.datacenter.controller.admin.saledata; +package cn.iocoder.yudao.module.datacenter.controller.app.saledata; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.datacenter.service.saledata.SaleDataService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -12,14 +11,12 @@ import java.math.BigDecimal; import java.util.List; import java.util.Map; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; - /** * @Description 售票 */ @Tag(name = "大屏服务 - 售票") @RestController -@RequestMapping("/datacenter/saledata") +@RequestMapping("/saledata") @Validated public class SaleDataApi { @Resource diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/saledata/vo/AgeVo.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/saledata/vo/AgeVo.java similarity index 77% rename from ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/saledata/vo/AgeVo.java rename to ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/saledata/vo/AgeVo.java index 73bb4cc7e..0303d6911 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/saledata/vo/AgeVo.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/saledata/vo/AgeVo.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.datacenter.controller.admin.saledata.vo; +package cn.iocoder.yudao.module.datacenter.controller.app.saledata.vo; import lombok.Data; diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/saledata/vo/AggregationVO.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/saledata/vo/AggregationVO.java similarity index 66% rename from ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/saledata/vo/AggregationVO.java rename to ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/saledata/vo/AggregationVO.java index 1ae0b8c3c..0c4b55455 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/saledata/vo/AggregationVO.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/saledata/vo/AggregationVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.datacenter.controller.admin.saledata.vo; +package cn.iocoder.yudao.module.datacenter.controller.app.saledata.vo; import lombok.Data; diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/saledata/vo/SaleDataPageReqVO.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/saledata/vo/SaleDataPageReqVO.java similarity index 96% rename from ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/saledata/vo/SaleDataPageReqVO.java rename to ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/saledata/vo/SaleDataPageReqVO.java index 8a0e4f4e6..27e1d0634 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/saledata/vo/SaleDataPageReqVO.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/saledata/vo/SaleDataPageReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.datacenter.controller.admin.saledata.vo; +package cn.iocoder.yudao.module.datacenter.controller.app.saledata.vo; import cn.iocoder.yudao.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/saledata/vo/SaleDataRespVO.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/saledata/vo/SaleDataRespVO.java similarity index 96% rename from ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/saledata/vo/SaleDataRespVO.java rename to ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/saledata/vo/SaleDataRespVO.java index d83284e40..cebd106c9 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/saledata/vo/SaleDataRespVO.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/saledata/vo/SaleDataRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.datacenter.controller.admin.saledata.vo; +package cn.iocoder.yudao.module.datacenter.controller.app.saledata.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/saledata/vo/SaleDataSaveReqVO.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/saledata/vo/SaleDataSaveReqVO.java similarity index 95% rename from ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/saledata/vo/SaleDataSaveReqVO.java rename to ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/saledata/vo/SaleDataSaveReqVO.java index 06c4f9ed3..7188c665b 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/saledata/vo/SaleDataSaveReqVO.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/saledata/vo/SaleDataSaveReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.datacenter.controller.admin.saledata.vo; +package cn.iocoder.yudao.module.datacenter.controller.app.saledata.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/ticssrMachine/TicssrMachineApi.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/ticssrMachine/TicssrMachineApi.java similarity index 86% rename from ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/ticssrMachine/TicssrMachineApi.java rename to ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/ticssrMachine/TicssrMachineApi.java index 065006de1..68699674c 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/ticssrMachine/TicssrMachineApi.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/ticssrMachine/TicssrMachineApi.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.datacenter.controller.admin.ticssrMachine; +package cn.iocoder.yudao.module.datacenter.controller.app.ticssrMachine; -import cn.iocoder.yudao.module.datacenter.controller.admin.asset.vo.AssetRespVO; +import cn.iocoder.yudao.module.datacenter.controller.app.asset.vo.AssetRespVO; import cn.iocoder.yudao.module.datacenter.service.asset.AssetService; import cn.iocoder.yudao.module.datacenter.service.passengerInformation.PassengerInformationService; import io.swagger.v3.oas.annotations.tags.Tag; @@ -17,7 +17,7 @@ import java.util.List; */ @Tag(name = "大屏服务 - 临时身份证自助补办机") @RestController -@RequestMapping("/datacenter/ticssrMachine") +@RequestMapping("/ticssrMachine") @Validated public class TicssrMachineApi { @Autowired diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/transitionflight/TransitionFlightApi.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/transitionflight/TransitionFlightApi.java similarity index 97% rename from ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/transitionflight/TransitionFlightApi.java rename to ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/transitionflight/TransitionFlightApi.java index 993f357d8..0fc0be96d 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/transitionflight/TransitionFlightApi.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/transitionflight/TransitionFlightApi.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.datacenter.controller.admin.transitionflight; +package cn.iocoder.yudao.module.datacenter.controller.app.transitionflight; -import cn.iocoder.yudao.module.datacenter.controller.admin.transitionflight.vo.FerryData; +import cn.iocoder.yudao.module.datacenter.controller.app.transitionflight.vo.FerryData; import cn.iocoder.yudao.module.datacenter.utlis.ResponseVO; import com.alibaba.nacos.shaded.com.google.gson.Gson; import com.alibaba.nacos.shaded.com.google.gson.JsonObject; diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/transitionflight/vo/FerryData.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/transitionflight/vo/FerryData.java similarity index 79% rename from ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/transitionflight/vo/FerryData.java rename to ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/transitionflight/vo/FerryData.java index 343f47e4a..e02afd470 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/transitionflight/vo/FerryData.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/transitionflight/vo/FerryData.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.datacenter.controller.admin.transitionflight.vo; +package cn.iocoder.yudao.module.datacenter.controller.app.transitionflight.vo; import lombok.Data; diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/vehicleaccess/VehicleAccessApi.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/VehicleAccessApi.java similarity index 97% rename from ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/vehicleaccess/VehicleAccessApi.java rename to ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/VehicleAccessApi.java index 0fceb00dc..61c93326e 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/vehicleaccess/VehicleAccessApi.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/VehicleAccessApi.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.datacenter.controller.admin.vehicleaccess; +package cn.iocoder.yudao.module.datacenter.controller.app.vehicleaccess; -import cn.iocoder.yudao.module.datacenter.controller.admin.vehicleaccess.vo.AreaDataVO; -import cn.iocoder.yudao.module.datacenter.controller.admin.vehicleaccess.vo.ParkingLotDataVO; -import cn.iocoder.yudao.module.datacenter.controller.admin.vehicleaccess.vo.RevenueVO; +import cn.iocoder.yudao.module.datacenter.controller.app.vehicleaccess.vo.AreaDataVO; +import cn.iocoder.yudao.module.datacenter.controller.app.vehicleaccess.vo.ParkingLotDataVO; +import cn.iocoder.yudao.module.datacenter.controller.app.vehicleaccess.vo.RevenueVO; import cn.iocoder.yudao.module.datacenter.dal.dataobject.vehicleaccess.*; import cn.iocoder.yudao.module.datacenter.dal.mongodb.vehicleaccess.*; import cn.iocoder.yudao.module.datacenter.utlis.ResponseVO; @@ -16,7 +16,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.math.BigDecimal; -import java.math.RoundingMode; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/vehicleaccess/vo/AppearanceRecordCarInfoVo.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/AppearanceRecordCarInfoVo.java similarity index 73% rename from ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/vehicleaccess/vo/AppearanceRecordCarInfoVo.java rename to ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/AppearanceRecordCarInfoVo.java index d01551da0..df7369d6f 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/vehicleaccess/vo/AppearanceRecordCarInfoVo.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/AppearanceRecordCarInfoVo.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.datacenter.controller.admin.vehicleaccess.vo; +package cn.iocoder.yudao.module.datacenter.controller.app.vehicleaccess.vo; import lombok.Data; diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/vehicleaccess/vo/AppearanceRecordChargeListVo.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/AppearanceRecordChargeListVo.java similarity index 75% rename from ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/vehicleaccess/vo/AppearanceRecordChargeListVo.java rename to ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/AppearanceRecordChargeListVo.java index a451afb26..f5eef473b 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/vehicleaccess/vo/AppearanceRecordChargeListVo.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/AppearanceRecordChargeListVo.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.datacenter.controller.admin.vehicleaccess.vo; +package cn.iocoder.yudao.module.datacenter.controller.app.vehicleaccess.vo; import lombok.Data; diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/vehicleaccess/vo/AppearanceRecordChargeStatisticsVo.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/AppearanceRecordChargeStatisticsVo.java similarity index 87% rename from ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/vehicleaccess/vo/AppearanceRecordChargeStatisticsVo.java rename to ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/AppearanceRecordChargeStatisticsVo.java index e752e6391..f3d40fb37 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/vehicleaccess/vo/AppearanceRecordChargeStatisticsVo.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/AppearanceRecordChargeStatisticsVo.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.datacenter.controller.admin.vehicleaccess.vo; +package cn.iocoder.yudao.module.datacenter.controller.app.vehicleaccess.vo; import lombok.Data; diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/vehicleaccess/vo/AppearanceRecordPassInfoVo.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/AppearanceRecordPassInfoVo.java similarity index 80% rename from ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/vehicleaccess/vo/AppearanceRecordPassInfoVo.java rename to ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/AppearanceRecordPassInfoVo.java index e22d1c7a8..0bc335380 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/vehicleaccess/vo/AppearanceRecordPassInfoVo.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/AppearanceRecordPassInfoVo.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.datacenter.controller.admin.vehicleaccess.vo; +package cn.iocoder.yudao.module.datacenter.controller.app.vehicleaccess.vo; import lombok.Data; diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/vehicleaccess/vo/AppearanceRecordPlaceInfoVo.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/AppearanceRecordPlaceInfoVo.java similarity index 70% rename from ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/vehicleaccess/vo/AppearanceRecordPlaceInfoVo.java rename to ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/AppearanceRecordPlaceInfoVo.java index 66b21c3ec..f5c75eb9f 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/vehicleaccess/vo/AppearanceRecordPlaceInfoVo.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/AppearanceRecordPlaceInfoVo.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.datacenter.controller.admin.vehicleaccess.vo; +package cn.iocoder.yudao.module.datacenter.controller.app.vehicleaccess.vo; import lombok.Data; diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/vehicleaccess/vo/AppearanceRecordProfitListVo.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/AppearanceRecordProfitListVo.java similarity index 76% rename from ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/vehicleaccess/vo/AppearanceRecordProfitListVo.java rename to ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/AppearanceRecordProfitListVo.java index cccc43e47..6f51951a0 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/vehicleaccess/vo/AppearanceRecordProfitListVo.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/AppearanceRecordProfitListVo.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.datacenter.controller.admin.vehicleaccess.vo; +package cn.iocoder.yudao.module.datacenter.controller.app.vehicleaccess.vo; import lombok.Data; diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/vehicleaccess/vo/AppearanceRecordUserInfoVo.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/AppearanceRecordUserInfoVo.java similarity index 55% rename from ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/vehicleaccess/vo/AppearanceRecordUserInfoVo.java rename to ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/AppearanceRecordUserInfoVo.java index 52018478d..207ac6c8f 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/vehicleaccess/vo/AppearanceRecordUserInfoVo.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/AppearanceRecordUserInfoVo.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.datacenter.controller.admin.vehicleaccess.vo; +package cn.iocoder.yudao.module.datacenter.controller.app.vehicleaccess.vo; import lombok.Data; diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/vehicleaccess/vo/AppearanceRecordVo.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/AppearanceRecordVo.java similarity index 91% rename from ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/vehicleaccess/vo/AppearanceRecordVo.java rename to ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/AppearanceRecordVo.java index 7297bafcb..97f7c9c03 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/vehicleaccess/vo/AppearanceRecordVo.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/AppearanceRecordVo.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.datacenter.controller.admin.vehicleaccess.vo; +package cn.iocoder.yudao.module.datacenter.controller.app.vehicleaccess.vo; import lombok.Data; diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/vehicleaccess/vo/AreaDataVO.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/AreaDataVO.java similarity index 72% rename from ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/vehicleaccess/vo/AreaDataVO.java rename to ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/AreaDataVO.java index 6fd9ccc14..9a85081fb 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/vehicleaccess/vo/AreaDataVO.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/AreaDataVO.java @@ -1,9 +1,7 @@ -package cn.iocoder.yudao.module.datacenter.controller.admin.vehicleaccess.vo; +package cn.iocoder.yudao.module.datacenter.controller.app.vehicleaccess.vo; import lombok.Data; -import java.math.BigDecimal; - @Data public class AreaDataVO { diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/vehicleaccess/vo/BlueCardHeartbeatVo.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/BlueCardHeartbeatVo.java similarity index 77% rename from ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/vehicleaccess/vo/BlueCardHeartbeatVo.java rename to ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/BlueCardHeartbeatVo.java index 09fb9594b..f2f61c82f 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/vehicleaccess/vo/BlueCardHeartbeatVo.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/BlueCardHeartbeatVo.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.datacenter.controller.admin.vehicleaccess.vo; +package cn.iocoder.yudao.module.datacenter.controller.app.vehicleaccess.vo; import lombok.Data; diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/vehicleaccess/vo/EntryRecordPlaceInfoVo.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/EntryRecordPlaceInfoVo.java similarity index 69% rename from ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/vehicleaccess/vo/EntryRecordPlaceInfoVo.java rename to ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/EntryRecordPlaceInfoVo.java index b9a8f7121..b30ef7ab8 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/vehicleaccess/vo/EntryRecordPlaceInfoVo.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/EntryRecordPlaceInfoVo.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.datacenter.controller.admin.vehicleaccess.vo; +package cn.iocoder.yudao.module.datacenter.controller.app.vehicleaccess.vo; import lombok.Data; diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/vehicleaccess/vo/EntryRecordUserInfoVo.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/EntryRecordUserInfoVo.java similarity index 69% rename from ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/vehicleaccess/vo/EntryRecordUserInfoVo.java rename to ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/EntryRecordUserInfoVo.java index ee5e13e8a..9b9f5e3c9 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/vehicleaccess/vo/EntryRecordUserInfoVo.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/EntryRecordUserInfoVo.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.datacenter.controller.admin.vehicleaccess.vo; +package cn.iocoder.yudao.module.datacenter.controller.app.vehicleaccess.vo; import lombok.Data; diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/vehicleaccess/vo/EntryRecordVo.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/EntryRecordVo.java similarity index 89% rename from ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/vehicleaccess/vo/EntryRecordVo.java rename to ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/EntryRecordVo.java index 3125e0531..db78b983c 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/vehicleaccess/vo/EntryRecordVo.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/EntryRecordVo.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.datacenter.controller.admin.vehicleaccess.vo; +package cn.iocoder.yudao.module.datacenter.controller.app.vehicleaccess.vo; import lombok.Data; diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/vehicleaccess/vo/ParkingLotDataVO.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/ParkingLotDataVO.java similarity index 89% rename from ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/vehicleaccess/vo/ParkingLotDataVO.java rename to ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/ParkingLotDataVO.java index a011bb715..ce2b1c605 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/vehicleaccess/vo/ParkingLotDataVO.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/ParkingLotDataVO.java @@ -1,8 +1,7 @@ -package cn.iocoder.yudao.module.datacenter.controller.admin.vehicleaccess.vo; +package cn.iocoder.yudao.module.datacenter.controller.app.vehicleaccess.vo; import lombok.Data; -import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/vehicleaccess/vo/RevenueVO.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/RevenueVO.java similarity index 82% rename from ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/vehicleaccess/vo/RevenueVO.java rename to ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/RevenueVO.java index ebf414630..72b709590 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/vehicleaccess/vo/RevenueVO.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/RevenueVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.datacenter.controller.admin.vehicleaccess.vo; +package cn.iocoder.yudao.module.datacenter.controller.app.vehicleaccess.vo; import lombok.Data; diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/weather/WeatherApi.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/weather/WeatherApi.java similarity index 82% rename from ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/weather/WeatherApi.java rename to ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/weather/WeatherApi.java index 4ab12caab..ed2d3b43c 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/weather/WeatherApi.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/weather/WeatherApi.java @@ -1,7 +1,6 @@ -package cn.iocoder.yudao.module.datacenter.controller.admin.weather; +package cn.iocoder.yudao.module.datacenter.controller.app.weather; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.datacenter.controller.admin.weather.vo.WeatherInfoVO; +import cn.iocoder.yudao.module.datacenter.controller.app.weather.vo.WeatherInfoVO; import cn.iocoder.yudao.module.datacenter.utlis.GoodWeatherUtil; import cn.iocoder.yudao.module.datacenter.utlis.ResponseVO; import io.swagger.v3.oas.annotations.Operation; diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/weather/vo/WeatherInfoVO.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/weather/vo/WeatherInfoVO.java similarity index 84% rename from ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/weather/vo/WeatherInfoVO.java rename to ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/weather/vo/WeatherInfoVO.java index 4acf33b24..3449d3da7 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/admin/weather/vo/WeatherInfoVO.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/weather/vo/WeatherInfoVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.datacenter.controller.admin.weather.vo; +package cn.iocoder.yudao.module.datacenter.controller.app.weather.vo; import lombok.Data; diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/dal/dataobject/vehicleaccess/AppearanceRecord.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/dal/dataobject/vehicleaccess/AppearanceRecord.java index dae5ddc93..29fbbffda 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/dal/dataobject/vehicleaccess/AppearanceRecord.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/dal/dataobject/vehicleaccess/AppearanceRecord.java @@ -1,6 +1,6 @@ package cn.iocoder.yudao.module.datacenter.dal.dataobject.vehicleaccess; -import cn.iocoder.yudao.module.datacenter.controller.admin.vehicleaccess.vo.AppearanceRecordVo; +import cn.iocoder.yudao.module.datacenter.controller.app.vehicleaccess.vo.AppearanceRecordVo; import lombok.Data; import org.springframework.data.mongodb.core.index.Indexed; import org.springframework.data.mongodb.core.mapping.Document; diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/dal/dataobject/vehicleaccess/BlueCardHeartbeat.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/dal/dataobject/vehicleaccess/BlueCardHeartbeat.java index 04524ead7..90deab023 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/dal/dataobject/vehicleaccess/BlueCardHeartbeat.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/dal/dataobject/vehicleaccess/BlueCardHeartbeat.java @@ -1,6 +1,6 @@ package cn.iocoder.yudao.module.datacenter.dal.dataobject.vehicleaccess; -import cn.iocoder.yudao.module.datacenter.controller.admin.vehicleaccess.vo.BlueCardHeartbeatVo; +import cn.iocoder.yudao.module.datacenter.controller.app.vehicleaccess.vo.BlueCardHeartbeatVo; import lombok.Data; import org.springframework.data.mongodb.core.index.Indexed; import org.springframework.data.mongodb.core.mapping.Document; diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/dal/dataobject/vehicleaccess/EntryRecord.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/dal/dataobject/vehicleaccess/EntryRecord.java index 12b4463d5..29f34774a 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/dal/dataobject/vehicleaccess/EntryRecord.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/dal/dataobject/vehicleaccess/EntryRecord.java @@ -1,6 +1,6 @@ package cn.iocoder.yudao.module.datacenter.dal.dataobject.vehicleaccess; -import cn.iocoder.yudao.module.datacenter.controller.admin.vehicleaccess.vo.EntryRecordVo; +import cn.iocoder.yudao.module.datacenter.controller.app.vehicleaccess.vo.EntryRecordVo; import lombok.Data; import org.springframework.data.mongodb.core.index.Indexed; import org.springframework.data.mongodb.core.mapping.Document; diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/dal/mongodb/saledata/SaleDataRepository.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/dal/mongodb/saledata/SaleDataRepository.java index 44109e7ad..7be78301c 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/dal/mongodb/saledata/SaleDataRepository.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/dal/mongodb/saledata/SaleDataRepository.java @@ -1,8 +1,8 @@ package cn.iocoder.yudao.module.datacenter.dal.mongodb.saledata; -import cn.iocoder.yudao.module.datacenter.controller.admin.saledata.vo.AgeVo; -import cn.iocoder.yudao.module.datacenter.controller.admin.saledata.vo.AggregationVO; +import cn.iocoder.yudao.module.datacenter.controller.app.saledata.vo.AgeVo; +import cn.iocoder.yudao.module.datacenter.controller.app.saledata.vo.AggregationVO; import cn.iocoder.yudao.module.datacenter.dal.dataobject.saledata.SaleData; import org.springframework.data.mongodb.repository.Aggregation; import org.springframework.data.mongodb.repository.MongoRepository; diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/service/asset/AssetService.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/service/asset/AssetService.java index 719b998c4..e157f4273 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/service/asset/AssetService.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/service/asset/AssetService.java @@ -1,6 +1,6 @@ package cn.iocoder.yudao.module.datacenter.service.asset; -import cn.iocoder.yudao.module.datacenter.controller.admin.asset.vo.AssetRespVO; +import cn.iocoder.yudao.module.datacenter.controller.app.asset.vo.AssetRespVO; import java.util.List; import java.util.Map; diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/service/asset/AssetServiceImpl.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/service/asset/AssetServiceImpl.java index 1efcb77f1..8f6a7488f 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/service/asset/AssetServiceImpl.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/service/asset/AssetServiceImpl.java @@ -1,12 +1,10 @@ package cn.iocoder.yudao.module.datacenter.service.asset; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; -import cn.iocoder.yudao.module.datacenter.controller.admin.asset.vo.AssetRespVO; +import cn.iocoder.yudao.module.datacenter.controller.app.asset.vo.AssetRespVO; import cn.iocoder.yudao.module.datacenter.dal.dataobject.asset.Asset; import cn.iocoder.yudao.module.datacenter.dal.mongodb.asset.AssetRepository; -import com.baomidou.dynamic.datasource.annotation.Slave; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/service/saledata/SaleDataServiceImpl.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/service/saledata/SaleDataServiceImpl.java index cfe43a57d..5879730a7 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/service/saledata/SaleDataServiceImpl.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/service/saledata/SaleDataServiceImpl.java @@ -2,18 +2,15 @@ package cn.iocoder.yudao.module.datacenter.service.saledata; import cn.iocoder.yudao.framework.common.util.ticket.IdCardUtil; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.datacenter.controller.admin.saledata.vo.AgeVo; -import cn.iocoder.yudao.module.datacenter.controller.admin.saledata.vo.AggregationVO; +import cn.iocoder.yudao.module.datacenter.controller.app.saledata.vo.AgeVo; +import cn.iocoder.yudao.module.datacenter.controller.app.saledata.vo.AggregationVO; import cn.iocoder.yudao.module.datacenter.dal.dataobject.saledata.SaleData; import cn.iocoder.yudao.module.datacenter.dal.mongodb.saledata.SaleDataRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.validation.annotation.Validated; -import javax.annotation.Resource; import java.math.BigDecimal; import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/utlis/GoodWeatherUtil.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/utlis/GoodWeatherUtil.java index 2f82bf9f8..1dde195f3 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/utlis/GoodWeatherUtil.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/utlis/GoodWeatherUtil.java @@ -1,6 +1,6 @@ package cn.iocoder.yudao.module.datacenter.utlis; -import cn.iocoder.yudao.module.datacenter.controller.admin.weather.vo.WeatherInfoVO; +import cn.iocoder.yudao.module.datacenter.controller.app.weather.vo.WeatherInfoVO; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/WebProperties.java b/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/WebProperties.java index 03f4d70b6..20e0a2117 100644 --- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/WebProperties.java +++ b/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/WebProperties.java @@ -17,7 +17,7 @@ import javax.validation.constraints.NotNull; public class WebProperties { @NotNull(message = "APP API 不能为空") - private Api appApi = new Api("/app-api", "**.controller.app.**"); + private Api appApi = new Api("/api", "**.controller.app.**"); @NotNull(message = "Admin API 不能为空") private Api adminApi = new Api("/admin-api", "**.controller.admin.**"); diff --git a/yudao-gateway/src/main/resources/application.yaml b/yudao-gateway/src/main/resources/application.yaml index 912b36ef8..9ef0101f0 100644 --- a/yudao-gateway/src/main/resources/application.yaml +++ b/yudao-gateway/src/main/resources/application.yaml @@ -176,7 +176,7 @@ spring: - id: datacenter-admin-api # 路由的编号 uri: grayLb://datacenter-server predicates: # 断言，作为路由的匹配条件，对应 RouteDefinition 数组 - - Path=/admin-api/datacenter/** + - Path=/api/** filters: - RewritePath=/admin-api/datacenter/v3/api-docs, /v3/api-docs # 配置，保证转发到 /v3/api-docs