diff --git a/xhpc-modules/pom.xml b/xhpc-modules/pom.xml index 24488b75..3713a8ff 100644 --- a/xhpc-modules/pom.xml +++ b/xhpc-modules/pom.xml @@ -18,9 +18,9 @@ xhpc-order xhpc-wxma xhpc-tradebill - xhpc-message-board + xhpc-card - xhpc-data-big-screen + xhpc-workorder xhpc-activity xhpc-log diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/api/XhpcMessageBoardApiController.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/api/XhpcMessageBoardApiController.java similarity index 89% rename from xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/api/XhpcMessageBoardApiController.java rename to xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/api/XhpcMessageBoardApiController.java index f8fe9a4b..7609782b 100644 --- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/api/XhpcMessageBoardApiController.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/api/XhpcMessageBoardApiController.java @@ -1,9 +1,9 @@ -package com.xhpc.board.api; +package com.xhpc.card.api; -import com.xhpc.board.domain.QueryUserMassageResponse; -import com.xhpc.board.domain.SendMessageToPlatformRequest; -import com.xhpc.board.domain.UserQueryCondition; -import com.xhpc.board.service.XhpcMessageBoardService; +import com.xhpc.card.domain.QueryUserMassageResponse; +import com.xhpc.card.domain.SendMessageToPlatformRequest; +import com.xhpc.card.domain.UserQueryCondition; +import com.xhpc.card.service.XhpcMessageBoardService; import com.xhpc.common.core.web.controller.BaseController; import com.xhpc.common.core.web.domain.AjaxResult; import com.xhpc.common.log.annotation.Log; diff --git a/xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/databigscreen/controller/XhpcDataBigScreenController.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/controller/XhpcDataBigScreenController.java similarity index 91% rename from xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/databigscreen/controller/XhpcDataBigScreenController.java rename to xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/controller/XhpcDataBigScreenController.java index efca915f..a9632f54 100644 --- a/xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/databigscreen/controller/XhpcDataBigScreenController.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/controller/XhpcDataBigScreenController.java @@ -1,12 +1,12 @@ -package com.xhpc.databigscreen.controller; +package com.xhpc.card.controller; import com.xhpc.common.core.domain.R; import com.xhpc.common.core.web.controller.BaseController; -import com.xhpc.databigscreen.domain.CoreParam; -import com.xhpc.databigscreen.domain.OrderRatio; -import com.xhpc.databigscreen.domain.OrderTrend; -import com.xhpc.databigscreen.domain.RealtimeOrders; -import com.xhpc.databigscreen.service.XhpcDataBigScreenService; +import com.xhpc.card.domain.CoreParam; +import com.xhpc.card.domain.OrderRatio; +import com.xhpc.card.domain.OrderTrend; +import com.xhpc.card.domain.RealtimeOrders; +import com.xhpc.card.service.XhpcDataBigScreenService; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/controller/XhpcMessageBoardController.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/controller/XhpcMessageBoardController.java similarity index 95% rename from xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/controller/XhpcMessageBoardController.java rename to xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/controller/XhpcMessageBoardController.java index 62ecccea..518ceffb 100644 --- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/controller/XhpcMessageBoardController.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/controller/XhpcMessageBoardController.java @@ -1,7 +1,7 @@ -package com.xhpc.board.controller; +package com.xhpc.card.controller; -import com.xhpc.board.domain.*; -import com.xhpc.board.service.XhpcMessageBoardService; +import com.xhpc.card.domain.*; +import com.xhpc.card.service.XhpcMessageBoardService; import com.xhpc.common.core.web.domain.AjaxResult; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; diff --git a/xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/databigscreen/domain/Condition.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/Condition.java similarity index 90% rename from xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/databigscreen/domain/Condition.java rename to xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/Condition.java index 2e4933dd..851481ca 100644 --- a/xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/databigscreen/domain/Condition.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/Condition.java @@ -1,4 +1,4 @@ -package com.xhpc.databigscreen.domain; +package com.xhpc.card.domain; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/databigscreen/domain/CoreParam.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/CoreParam.java similarity index 92% rename from xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/databigscreen/domain/CoreParam.java rename to xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/CoreParam.java index d3edcdbf..0d87364b 100644 --- a/xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/databigscreen/domain/CoreParam.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/CoreParam.java @@ -1,4 +1,4 @@ -package com.xhpc.databigscreen.domain; +package com.xhpc.card.domain; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/databigscreen/domain/OrderRatio.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/OrderRatio.java similarity index 92% rename from xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/databigscreen/domain/OrderRatio.java rename to xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/OrderRatio.java index b81c80d4..0d53a3f4 100644 --- a/xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/databigscreen/domain/OrderRatio.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/OrderRatio.java @@ -1,4 +1,4 @@ -package com.xhpc.databigscreen.domain; +package com.xhpc.card.domain; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/databigscreen/domain/OrderTrend.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/OrderTrend.java similarity index 94% rename from xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/databigscreen/domain/OrderTrend.java rename to xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/OrderTrend.java index 79b5d4eb..308bb461 100644 --- a/xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/databigscreen/domain/OrderTrend.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/OrderTrend.java @@ -1,4 +1,4 @@ -package com.xhpc.databigscreen.domain; +package com.xhpc.card.domain; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/PlatformQueryCondition.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/PlatformQueryCondition.java similarity index 95% rename from xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/PlatformQueryCondition.java rename to xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/PlatformQueryCondition.java index 2d36a24c..e259c34f 100644 --- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/PlatformQueryCondition.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/PlatformQueryCondition.java @@ -1,4 +1,4 @@ -package com.xhpc.board.domain; +package com.xhpc.card.domain; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/PlatformSendMessageToUserRequest.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/PlatformSendMessageToUserRequest.java similarity index 95% rename from xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/PlatformSendMessageToUserRequest.java rename to xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/PlatformSendMessageToUserRequest.java index 943e408a..136c4c4d 100644 --- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/PlatformSendMessageToUserRequest.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/PlatformSendMessageToUserRequest.java @@ -1,4 +1,4 @@ -package com.xhpc.board.domain; +package com.xhpc.card.domain; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/QueryUserListRequest.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/QueryUserListRequest.java similarity index 97% rename from xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/QueryUserListRequest.java rename to xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/QueryUserListRequest.java index fe110b3a..2fba6302 100644 --- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/QueryUserListRequest.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/QueryUserListRequest.java @@ -1,4 +1,4 @@ -package com.xhpc.board.domain; +package com.xhpc.card.domain; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/QueryUserListResponse.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/QueryUserListResponse.java similarity index 96% rename from xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/QueryUserListResponse.java rename to xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/QueryUserListResponse.java index 5191b53e..d5b53443 100644 --- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/QueryUserListResponse.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/QueryUserListResponse.java @@ -1,4 +1,4 @@ -package com.xhpc.board.domain; +package com.xhpc.card.domain; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/QueryUserMassageResponse.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/QueryUserMassageResponse.java similarity index 97% rename from xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/QueryUserMassageResponse.java rename to xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/QueryUserMassageResponse.java index 7bf9fb9e..c9aaca34 100644 --- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/QueryUserMassageResponse.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/QueryUserMassageResponse.java @@ -1,4 +1,4 @@ -package com.xhpc.board.domain; +package com.xhpc.card.domain; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/databigscreen/domain/RealtimeOrders.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/RealtimeOrders.java similarity index 97% rename from xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/databigscreen/domain/RealtimeOrders.java rename to xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/RealtimeOrders.java index 22da49fb..82661cc9 100644 --- a/xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/databigscreen/domain/RealtimeOrders.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/RealtimeOrders.java @@ -1,4 +1,4 @@ -package com.xhpc.databigscreen.domain; +package com.xhpc.card.domain; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/SendMessageToPlatformRequest.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/SendMessageToPlatformRequest.java similarity index 95% rename from xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/SendMessageToPlatformRequest.java rename to xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/SendMessageToPlatformRequest.java index 6b950fa3..985f6cc0 100644 --- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/SendMessageToPlatformRequest.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/SendMessageToPlatformRequest.java @@ -1,4 +1,4 @@ -package com.xhpc.board.domain; +package com.xhpc.card.domain; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/UserInfo.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/UserInfo.java similarity index 97% rename from xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/UserInfo.java rename to xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/UserInfo.java index 6f54c8a3..b9b4aca5 100644 --- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/UserInfo.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/UserInfo.java @@ -1,4 +1,4 @@ -package com.xhpc.board.domain; +package com.xhpc.card.domain; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/UserQueryCondition.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/UserQueryCondition.java similarity index 95% rename from xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/UserQueryCondition.java rename to xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/UserQueryCondition.java index cc8a35b3..9a803890 100644 --- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/domain/UserQueryCondition.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/UserQueryCondition.java @@ -1,4 +1,4 @@ -package com.xhpc.board.domain; +package com.xhpc.card.domain; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcAppUserMapper.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcAppUserMapper.java index d2e36ebd..3057b9ec 100644 --- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcAppUserMapper.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcAppUserMapper.java @@ -47,4 +47,17 @@ public interface XhpcAppUserMapper { */ XhpcAppUser selectByPhone(String userAccount); + + /** + * query user total count by according one or multiple tenant id + * + * @param tenantIdList 租户集合 + * @return 租户数量 + * @author WH + * @date 2022/3/4 10:37 + * @since version-1.0 + */ + Long selectTotalCountByTenantIdAndCurrentTime(@Param("tenantIdList") List tenantIdList, @Param("currentTime") String currentTime); + + } \ No newline at end of file diff --git a/xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/databigscreen/mapper/XhpcChargingStationMapper.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcChargingStationMapper.java similarity index 94% rename from xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/databigscreen/mapper/XhpcChargingStationMapper.java rename to xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcChargingStationMapper.java index 1d5c9b00..b7fd6561 100644 --- a/xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/databigscreen/mapper/XhpcChargingStationMapper.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcChargingStationMapper.java @@ -1,6 +1,6 @@ -package com.xhpc.databigscreen.mapper; +package com.xhpc.card.mapper; -import com.xhpc.databigscreen.pojo.XhpcChargingStation; +import com.xhpc.card.pojo.XhpcChargingStation; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/databigscreen/mapper/XhpcHistoryOrderMapper.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcHistoryOrderMapper.java similarity index 95% rename from xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/databigscreen/mapper/XhpcHistoryOrderMapper.java rename to xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcHistoryOrderMapper.java index 7a53171c..ea67ea29 100644 --- a/xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/databigscreen/mapper/XhpcHistoryOrderMapper.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcHistoryOrderMapper.java @@ -1,6 +1,6 @@ -package com.xhpc.databigscreen.mapper; +package com.xhpc.card.mapper; -import com.xhpc.databigscreen.pojo.XhpcHistoryOrder; +import com.xhpc.card.pojo.XhpcHistoryOrder; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/mapper/XhpcMessageBoardMapper.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcMessageBoardMapper.java similarity index 90% rename from xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/mapper/XhpcMessageBoardMapper.java rename to xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcMessageBoardMapper.java index 2bd03c28..456ca320 100644 --- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/mapper/XhpcMessageBoardMapper.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcMessageBoardMapper.java @@ -1,9 +1,9 @@ -package com.xhpc.board.mapper; +package com.xhpc.card.mapper; -import com.xhpc.board.domain.PlatformSendMessageToUserRequest; -import com.xhpc.board.domain.SendMessageToPlatformRequest; -import com.xhpc.board.domain.UserQueryCondition; -import com.xhpc.board.pojo.XhpcMessageBoard; +import com.xhpc.card.domain.PlatformSendMessageToUserRequest; +import com.xhpc.card.domain.SendMessageToPlatformRequest; +import com.xhpc.card.domain.UserQueryCondition; +import com.xhpc.card.pojo.XhpcMessageBoard; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/mapper/XhpcMessageBoardReceiveUserMapper.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcMessageBoardReceiveUserMapper.java similarity index 90% rename from xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/mapper/XhpcMessageBoardReceiveUserMapper.java rename to xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcMessageBoardReceiveUserMapper.java index f77476c2..35a71e8c 100644 --- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/mapper/XhpcMessageBoardReceiveUserMapper.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcMessageBoardReceiveUserMapper.java @@ -1,9 +1,9 @@ -package com.xhpc.board.mapper; +package com.xhpc.card.mapper; -import com.xhpc.board.domain.QueryUserListRequest; -import com.xhpc.board.domain.SendMessageToPlatformRequest; -import com.xhpc.board.domain.UserQueryCondition; -import com.xhpc.board.pojo.XhpcMessageBoardReceiveUser; +import com.xhpc.card.domain.QueryUserListRequest; +import com.xhpc.card.domain.SendMessageToPlatformRequest; +import com.xhpc.card.domain.UserQueryCondition; +import com.xhpc.card.pojo.XhpcMessageBoardReceiveUser; import java.util.List; diff --git a/xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/databigscreen/mapper/XhpcRateTimeMapper.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcRateTimeMapper.java similarity index 89% rename from xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/databigscreen/mapper/XhpcRateTimeMapper.java rename to xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcRateTimeMapper.java index 66a91d5f..17c94662 100644 --- a/xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/databigscreen/mapper/XhpcRateTimeMapper.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcRateTimeMapper.java @@ -1,6 +1,6 @@ -package com.xhpc.databigscreen.mapper; +package com.xhpc.card.mapper; -import com.xhpc.databigscreen.pojo.XhpcRateTime; +import com.xhpc.card.pojo.XhpcRateTime; import org.apache.ibatis.annotations.Param; import java.util.ArrayList; diff --git a/xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/databigscreen/pojo/XhpcChargingStation.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/pojo/XhpcChargingStation.java similarity index 98% rename from xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/databigscreen/pojo/XhpcChargingStation.java rename to xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/pojo/XhpcChargingStation.java index 58755a1c..0e889737 100644 --- a/xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/databigscreen/pojo/XhpcChargingStation.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/pojo/XhpcChargingStation.java @@ -1,4 +1,4 @@ -package com.xhpc.databigscreen.pojo; +package com.xhpc.card.pojo; import lombok.Data; diff --git a/xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/databigscreen/pojo/XhpcHistoryOrder.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/pojo/XhpcHistoryOrder.java similarity index 99% rename from xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/databigscreen/pojo/XhpcHistoryOrder.java rename to xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/pojo/XhpcHistoryOrder.java index 34a3b9df..73f29a50 100644 --- a/xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/databigscreen/pojo/XhpcHistoryOrder.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/pojo/XhpcHistoryOrder.java @@ -1,4 +1,4 @@ -package com.xhpc.databigscreen.pojo; +package com.xhpc.card.pojo; import lombok.Data; diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/pojo/XhpcMessageBoard.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/pojo/XhpcMessageBoard.java similarity index 97% rename from xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/pojo/XhpcMessageBoard.java rename to xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/pojo/XhpcMessageBoard.java index 2c41e605..218d9a8d 100644 --- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/pojo/XhpcMessageBoard.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/pojo/XhpcMessageBoard.java @@ -1,4 +1,4 @@ -package com.xhpc.board.pojo; +package com.xhpc.card.pojo; import lombok.Data; diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/pojo/XhpcMessageBoardReceiveUser.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/pojo/XhpcMessageBoardReceiveUser.java similarity index 96% rename from xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/pojo/XhpcMessageBoardReceiveUser.java rename to xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/pojo/XhpcMessageBoardReceiveUser.java index f71d6430..a88a6d32 100644 --- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/pojo/XhpcMessageBoardReceiveUser.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/pojo/XhpcMessageBoardReceiveUser.java @@ -1,4 +1,4 @@ -package com.xhpc.board.pojo; +package com.xhpc.card.pojo; import lombok.Data; diff --git a/xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/databigscreen/pojo/XhpcRateTime.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/pojo/XhpcRateTime.java similarity index 97% rename from xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/databigscreen/pojo/XhpcRateTime.java rename to xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/pojo/XhpcRateTime.java index f6f0acb1..017ac879 100644 --- a/xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/databigscreen/pojo/XhpcRateTime.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/pojo/XhpcRateTime.java @@ -1,4 +1,4 @@ -package com.xhpc.databigscreen.pojo; +package com.xhpc.card.pojo; import lombok.Data; diff --git a/xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/databigscreen/service/XhpcDataBigScreenService.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/XhpcDataBigScreenService.java similarity index 86% rename from xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/databigscreen/service/XhpcDataBigScreenService.java rename to xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/XhpcDataBigScreenService.java index 544779e6..18b7d61b 100644 --- a/xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/databigscreen/service/XhpcDataBigScreenService.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/XhpcDataBigScreenService.java @@ -1,10 +1,10 @@ -package com.xhpc.databigscreen.service; +package com.xhpc.card.service; import com.xhpc.common.core.domain.R; -import com.xhpc.databigscreen.domain.CoreParam; -import com.xhpc.databigscreen.domain.OrderRatio; -import com.xhpc.databigscreen.domain.OrderTrend; -import com.xhpc.databigscreen.domain.RealtimeOrders; +import com.xhpc.card.domain.CoreParam; +import com.xhpc.card.domain.OrderRatio; +import com.xhpc.card.domain.OrderTrend; +import com.xhpc.card.domain.RealtimeOrders; import java.util.List; import java.util.Map; diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/XhpcMessageBoardService.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/XhpcMessageBoardService.java similarity index 97% rename from xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/XhpcMessageBoardService.java rename to xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/XhpcMessageBoardService.java index 44cceb0f..1e960c81 100644 --- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/XhpcMessageBoardService.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/XhpcMessageBoardService.java @@ -1,6 +1,6 @@ -package com.xhpc.board.service; +package com.xhpc.card.service; -import com.xhpc.board.domain.*; +import com.xhpc.card.domain.*; /** * 留言板服务的Service diff --git a/xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/databigscreen/service/impl/XhpcDataBigScreenServiceImpl.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcDataBigScreenServiceImpl.java similarity index 98% rename from xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/databigscreen/service/impl/XhpcDataBigScreenServiceImpl.java rename to xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcDataBigScreenServiceImpl.java index cbd12503..4a9f549b 100644 --- a/xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/databigscreen/service/impl/XhpcDataBigScreenServiceImpl.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcDataBigScreenServiceImpl.java @@ -1,20 +1,19 @@ -package com.xhpc.databigscreen.service.impl; +package com.xhpc.card.service.impl; import com.xhpc.common.constant.ConstantClass; import com.xhpc.common.core.domain.R; import com.xhpc.common.redis.service.RedisService; import com.xhpc.common.util.MyDateUtil; import com.xhpc.common.util.UserTypeUtil; -import com.xhpc.databigscreen.domain.CoreParam; -import com.xhpc.databigscreen.domain.OrderRatio; -import com.xhpc.databigscreen.domain.OrderTrend; -import com.xhpc.databigscreen.domain.RealtimeOrders; -import com.xhpc.databigscreen.mapper.XhpcAppUserMapper; -import com.xhpc.databigscreen.mapper.XhpcChargingStationMapper; -import com.xhpc.databigscreen.mapper.XhpcHistoryOrderMapper; -import com.xhpc.databigscreen.mapper.XhpcRateTimeMapper; -import com.xhpc.databigscreen.service.XhpcDataBigScreenService; -import org.springframework.beans.factory.annotation.Autowired; +import com.xhpc.card.domain.CoreParam; +import com.xhpc.card.domain.OrderRatio; +import com.xhpc.card.domain.OrderTrend; +import com.xhpc.card.domain.RealtimeOrders; +import com.xhpc.card.mapper.XhpcAppUserMapper; +import com.xhpc.card.mapper.XhpcChargingStationMapper; +import com.xhpc.card.mapper.XhpcHistoryOrderMapper; +import com.xhpc.card.mapper.XhpcRateTimeMapper; +import com.xhpc.card.service.XhpcDataBigScreenService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcMessageBoardServiceImpl.java similarity index 98% rename from xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java rename to xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcMessageBoardServiceImpl.java index aad8b991..1a06a48b 100644 --- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcMessageBoardServiceImpl.java @@ -1,11 +1,11 @@ -package com.xhpc.board.service.impl; +package com.xhpc.card.service.impl; -import com.xhpc.board.domain.*; -import com.xhpc.board.mapper.XhpcMessageBoardMapper; -import com.xhpc.board.mapper.XhpcMessageBoardReceiveUserMapper; -import com.xhpc.board.pojo.XhpcMessageBoard; -import com.xhpc.board.pojo.XhpcMessageBoardReceiveUser; -import com.xhpc.board.service.XhpcMessageBoardService; +import com.xhpc.card.domain.*; +import com.xhpc.card.mapper.XhpcMessageBoardMapper; +import com.xhpc.card.mapper.XhpcMessageBoardReceiveUserMapper; +import com.xhpc.card.pojo.XhpcMessageBoard; +import com.xhpc.card.pojo.XhpcMessageBoardReceiveUser; +import com.xhpc.card.service.XhpcMessageBoardService; import com.xhpc.common.api.UserTypeService; import com.xhpc.common.core.domain.R; import com.xhpc.common.core.utils.DateUtils; diff --git a/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcAppUserMapper.xml b/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcAppUserMapper.xml index 068b8a34..c88b194b 100644 --- a/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcAppUserMapper.xml +++ b/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcAppUserMapper.xml @@ -317,4 +317,28 @@ soc_protect = #{socProtect,jdbcType=INTEGER} where app_user_id = #{appUserId,jdbcType=BIGINT} + + + \ No newline at end of file diff --git a/xhpc-modules/xhpc-data-big-screen/src/main/resources/mapper/XhpcChargingStationMapper.xml b/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcChargingStationMapper.xml similarity index 97% rename from xhpc-modules/xhpc-data-big-screen/src/main/resources/mapper/XhpcChargingStationMapper.xml rename to xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcChargingStationMapper.xml index cd13be3f..2f7fed3d 100644 --- a/xhpc-modules/xhpc-data-big-screen/src/main/resources/mapper/XhpcChargingStationMapper.xml +++ b/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcChargingStationMapper.xml @@ -1,8 +1,8 @@ - - + + @@ -116,7 +116,7 @@ where charging_station_id = #{chargingStationId,jdbcType=BIGINT} + parameterType="com.xhpc.card.pojo.XhpcChargingStation" useGeneratedKeys="true"> insert into xhpc_charging_station (`name`, operator_id, `type`, construction_site, service_facilities, periphery_facilities, area_code, address, detailed_address, @@ -143,7 +143,7 @@ #{tenantId,jdbcType=VARCHAR}) + parameterType="com.xhpc.card.pojo.XhpcChargingStation" useGeneratedKeys="true"> insert into xhpc_charging_station @@ -336,7 +336,7 @@ - + update xhpc_charging_station @@ -435,7 +435,7 @@ where charging_station_id = #{chargingStationId,jdbcType=BIGINT} - + update xhpc_charging_station set `name` = #{name,jdbcType=VARCHAR}, operator_id = #{operatorId,jdbcType=BIGINT}, diff --git a/xhpc-modules/xhpc-data-big-screen/src/main/resources/mapper/XhpcHistoryOrderMapper.xml b/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcHistoryOrderMapper.xml similarity index 98% rename from xhpc-modules/xhpc-data-big-screen/src/main/resources/mapper/XhpcHistoryOrderMapper.xml rename to xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcHistoryOrderMapper.xml index 94abd528..8116aa15 100644 --- a/xhpc-modules/xhpc-data-big-screen/src/main/resources/mapper/XhpcHistoryOrderMapper.xml +++ b/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcHistoryOrderMapper.xml @@ -1,8 +1,8 @@ - - + + @@ -220,7 +220,7 @@ where history_order_id = #{historyOrderId,jdbcType=BIGINT} + parameterType="com.xhpc.card.pojo.XhpcHistoryOrder" useGeneratedKeys="true"> insert into xhpc_history_order (charging_station_id, charge_order_id, user_id, terminal_id, serial_number, internet_serial_number, power_price_total, service_price_total, total_price, @@ -266,7 +266,7 @@ #{source,jdbcType=INTEGER}, #{tenantId,jdbcType=VARCHAR}) + parameterType="com.xhpc.card.pojo.XhpcHistoryOrder" useGeneratedKeys="true"> insert into xhpc_history_order @@ -591,7 +591,7 @@ - + update xhpc_history_order @@ -756,7 +756,7 @@ where history_order_id = #{historyOrderId,jdbcType=BIGINT} - + update xhpc_history_order set charging_station_id = #{chargingStationId,jdbcType=BIGINT}, charge_order_id = #{chargeOrderId,jdbcType=BIGINT}, diff --git a/xhpc-modules/xhpc-message-board/src/main/resources/mapper/XhpcMessageBoardMapper.xml b/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcMessageBoardMapper.xml similarity index 96% rename from xhpc-modules/xhpc-message-board/src/main/resources/mapper/XhpcMessageBoardMapper.xml rename to xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcMessageBoardMapper.xml index 3becbd5a..c25d75d2 100644 --- a/xhpc-modules/xhpc-message-board/src/main/resources/mapper/XhpcMessageBoardMapper.xml +++ b/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcMessageBoardMapper.xml @@ -1,8 +1,8 @@ - - + + @@ -58,7 +58,7 @@ where message_id = #{messageId,jdbcType=BIGINT} + parameterType="com.xhpc.card.pojo.XhpcMessageBoard" useGeneratedKeys="true"> insert into xhpc_message_board (sender_type, sender_account, send_message_time, message_content, tenant_type, tenant_id, have_new_info, del_flag, sender) @@ -68,7 +68,7 @@ #{haveNewInfo,jdbcType=BOOLEAN}, #{delFlag,jdbcType=BOOLEAN}, #{sender,jdbcType=BOOLEAN}) + parameterType="com.xhpc.card.pojo.XhpcMessageBoard" useGeneratedKeys="true"> insert into xhpc_message_board @@ -233,7 +233,7 @@ (sender_type, sender_account, send_message_time, tenant_type, tenant_id, have_new_info, sender) values (#{senderType}, #{senderAccount}, #{sendMessageTime}, #{tenantType}, #{tenantId}, 0, 1) - + update xhpc_message_board @@ -266,7 +266,7 @@ where message_id = #{messageId,jdbcType=BIGINT} - + update xhpc_message_board set sender_type = #{senderType,jdbcType=TINYINT}, sender_account = #{senderAccount,jdbcType=VARCHAR}, diff --git a/xhpc-modules/xhpc-message-board/src/main/resources/mapper/XhpcMessageBoardReceiveUserMapper.xml b/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcMessageBoardReceiveUserMapper.xml similarity index 94% rename from xhpc-modules/xhpc-message-board/src/main/resources/mapper/XhpcMessageBoardReceiveUserMapper.xml rename to xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcMessageBoardReceiveUserMapper.xml index 25feb143..5699fbda 100644 --- a/xhpc-modules/xhpc-message-board/src/main/resources/mapper/XhpcMessageBoardReceiveUserMapper.xml +++ b/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcMessageBoardReceiveUserMapper.xml @@ -1,8 +1,8 @@ - - + + @@ -21,7 +21,7 @@ have_new_info, del_flag - + insert into xhpc_message_board_receive_user (tenant_id, tenant_type, sender_account, sender_type, user_icon, have_new_info, del_flag) @@ -29,7 +29,7 @@ #{senderType,jdbcType=INTEGER}, #{userIcon,jdbcType=VARCHAR}, #{haveNewInfo,jdbcType=BOOLEAN}, #{delFlag,jdbcType=BOOLEAN}) - + insert into xhpc_message_board_receive_user diff --git a/xhpc-modules/xhpc-data-big-screen/src/main/resources/mapper/XhpcRateTimeMapper.xml b/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcRateTimeMapper.xml similarity index 96% rename from xhpc-modules/xhpc-data-big-screen/src/main/resources/mapper/XhpcRateTimeMapper.xml rename to xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcRateTimeMapper.xml index 147deab3..3b8f462c 100644 --- a/xhpc-modules/xhpc-data-big-screen/src/main/resources/mapper/XhpcRateTimeMapper.xml +++ b/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcRateTimeMapper.xml @@ -1,8 +1,8 @@ - - + + @@ -98,7 +98,7 @@ where rate_time_id = #{rateTimeId,jdbcType=BIGINT} + parameterType="com.xhpc.card.pojo.XhpcRateTime" useGeneratedKeys="true"> insert into xhpc_rate_time (charging_station_id, rate_id, start_time, end_time, `status`, del_flag, create_time, create_by, update_time, @@ -113,7 +113,7 @@ #{tenantId,jdbcType=VARCHAR}) + parameterType="com.xhpc.card.pojo.XhpcRateTime" useGeneratedKeys="true"> insert into xhpc_rate_time @@ -216,7 +216,7 @@ - + update xhpc_rate_time @@ -270,7 +270,7 @@ where rate_time_id = #{rateTimeId,jdbcType=BIGINT} - + update xhpc_rate_time set charging_station_id = #{chargingStationId,jdbcType=BIGINT}, rate_id = #{rateId,jdbcType=BIGINT}, diff --git a/xhpc-modules/xhpc-data-big-screen/pom.xml b/xhpc-modules/xhpc-data-big-screen/pom.xml deleted file mode 100644 index 27a0ae78..00000000 --- a/xhpc-modules/xhpc-data-big-screen/pom.xml +++ /dev/null @@ -1,143 +0,0 @@ - - - - xhpc-modules - com.ruoyi - 3.0.0 - - 4.0.0 - - xhpc-data-big-screen - - - 数据大屏服务 - - - - 8 - 8 - - - - - - - junit - junit - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-sentinel - - - - - org.springframework.boot - spring-boot-starter-actuator - - - - - io.springfox - springfox-swagger-ui - ${swagger.fox.version} - - - - - mysql - mysql-connector-java - - - - - com.ruoyi - ruoyi-common-datasource - - - - - com.ruoyi - ruoyi-common-datascope - - - - - com.ruoyi - ruoyi-common-log - - - - - com.ruoyi - ruoyi-common-swagger - - - com.ruoyi - ruoyi-common-core - - - com.squareup.okhttp3 - okhttp - - - com.ruoyi - xhpc-common - 3.0.0 - compile - - - com.aliyun.oss - aliyun-sdk-oss - 3.10.2 - compile - - - - - - ${project.artifactId} - - - src/main/resources - - - src/main/java - - **/*.xml - - - - - - org.springframework.boot - spring-boot-maven-plugin - 2.4.0 - - - - repackage - - - - - - - - \ No newline at end of file diff --git a/xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/XhpcDataBigScreenApplication.java b/xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/XhpcDataBigScreenApplication.java deleted file mode 100644 index 9f25dd79..00000000 --- a/xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/XhpcDataBigScreenApplication.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.xhpc; - -import com.xhpc.common.security.annotation.EnableCustomConfig; -import com.xhpc.common.swagger.annotation.EnableCustomSwagger2; -import org.mybatis.spring.annotation.MapperScan; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.openfeign.EnableFeignClients; - -/** - * @author WH - * @date 2021/12/7 14:55 - * @since version-1.0 - */ -@EnableCustomConfig -@EnableCustomSwagger2 -@EnableFeignClients -@SpringBootApplication -@MapperScan("com.xhpc.databigscreen.mapper") -public class XhpcDataBigScreenApplication { - - public static void main(String[] args) { - - SpringApplication.run(XhpcDataBigScreenApplication.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ 数据大屏模块启动成功 ლ(´ڡ`ლ)ﾞ \n" + - " .-------. ____ __ \n" + - " | _ _ \\ \\ \\ / / \n" + - " | ( ' ) | \\ _. / ' \n" + - " |(_ o _) / _( )_ .' \n" + - " | (_,_).' __ ___(_ o _)' \n" + - " | |\\ \\ | || |(_,_)' \n" + - " | | \\ `' /| `-' / \n" + - " | | \\ / \\ / \n" + - " ''-' `'-' `-..-' "); - } - -} diff --git a/xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/databigscreen/mapper/XhpcAppUserMapper.java b/xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/databigscreen/mapper/XhpcAppUserMapper.java deleted file mode 100644 index b2f816bf..00000000 --- a/xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/databigscreen/mapper/XhpcAppUserMapper.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.xhpc.databigscreen.mapper; - -import com.xhpc.databigscreen.pojo.XhpcAppUser; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface XhpcAppUserMapper { - - int deleteByPrimaryKey(Long appUserId); - - int insert(XhpcAppUser record); - - int insertSelective(XhpcAppUser record); - - XhpcAppUser selectByPrimaryKey(Long appUserId); - - int updateByPrimaryKeySelective(XhpcAppUser record); - - int updateByPrimaryKey(XhpcAppUser record); - - /** - * query user total count by according one or multiple tenant id - * - * @param tenantIdList 租户集合 - * @return 租户数量 - * @author WH - * @date 2022/3/4 10:37 - * @since version-1.0 - */ - Long selectTotalCountByTenantIdAndCurrentTime(@Param("tenantIdList") List tenantIdList, @Param("currentTime") String currentTime); - -} \ No newline at end of file diff --git a/xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/databigscreen/pojo/XhpcAppUser.java b/xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/databigscreen/pojo/XhpcAppUser.java deleted file mode 100644 index 07aa193b..00000000 --- a/xhpc-modules/xhpc-data-big-screen/src/main/java/com/xhpc/databigscreen/pojo/XhpcAppUser.java +++ /dev/null @@ -1,118 +0,0 @@ -package com.xhpc.databigscreen.pojo; - -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -/** - * xhpc_app_user - * - * @author - */ -@Data -public class XhpcAppUser implements Serializable { - - /** - * 用户ID - */ - private Long appUserId; - - /** - * 手机号码 - */ - private String phone; - - private String weixinOpenId; - - private String alipayOpenId; - - /** - * 微信是否登录（0未登录 1已登录） - */ - private Integer weixinLogin; - - /** - * 支付宝是否登录（0未登录 1已登录） - */ - private Integer alipayLogin; - - /** - * 头像地址 - */ - private String avatar; - - /** - * 余额 - */ - private BigDecimal balance; - - /** - * 密码(加密) - */ - private String password; - - /** - * 帐号状态 - */ - private Integer status; - - /** - * 是否有退款订单审核（0无 1有） - */ - private Integer isRefundApplication; - - /** - * 删除标志（0代表存在 2代表删除） - */ - private String delFlag; - - /** - * 创建者 - */ - private String createBy; - - /** - * 创建时间 - */ - private Date createTime; - - /** - * 更新者 - */ - private String updateBy; - - /** - * 更新时间 - */ - private Date updateTime; - - /** - * 备注 - */ - private String remark; - - /** - * 用户设置的SOC - */ - private Integer soc; - - /** - * 是否退款 0 不退款 1 退款 - */ - private Integer isRefund; - - /** - * 租户id - */ - private String tenantId; - - /** - * 是否开启电池保护 0 未开启 1开启 - */ - private Integer socProtect; - - private static final long serialVersionUID = 1L; - -} \ No newline at end of file diff --git a/xhpc-modules/xhpc-data-big-screen/src/main/resources/banner.txt b/xhpc-modules/xhpc-data-big-screen/src/main/resources/banner.txt deleted file mode 100644 index 27cacb9c..00000000 --- a/xhpc-modules/xhpc-data-big-screen/src/main/resources/banner.txt +++ /dev/null @@ -1,10 +0,0 @@ -Spring Boot Version: ${spring-boot.version} -Spring Application Name: ${spring.application.name} - _ __ _ _ - (_) / _|(_)| | - _ __ _ _ ___ _ _ _ ______ | |_ _ | | ___ -| '__|| | | | / _ \ | | | || ||______|| _|| || | / _ \ -| | | |_| || (_) || |_| || | | | | || || __/ -|_| \__,_| \___/ \__, ||_| |_| |_||_| \___| - __/ | - |___/ \ No newline at end of file diff --git a/xhpc-modules/xhpc-data-big-screen/src/main/resources/bootstrap.yml b/xhpc-modules/xhpc-data-big-screen/src/main/resources/bootstrap.yml deleted file mode 100644 index 546229d7..00000000 --- a/xhpc-modules/xhpc-data-big-screen/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,28 +0,0 @@ -# Tomcat -server: - port: 9806 - -# Spring -spring: - application: - # 应用名称 - name: xhpc-data-big-screen - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: 172.31.183.135:8848 - config: - # 配置中心地址 - server-addr: 172.31.183.135:8848 - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} -logging: - level: - com.xhpc.databigscreen.mapper: debug \ No newline at end of file diff --git a/xhpc-modules/xhpc-data-big-screen/src/main/resources/logback.xml b/xhpc-modules/xhpc-data-big-screen/src/main/resources/logback.xml deleted file mode 100644 index 089dfd3c..00000000 --- a/xhpc-modules/xhpc-data-big-screen/src/main/resources/logback.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - ${log.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - ERROR - - ACCEPT - - DENY - - - - - - - - - - - - - - - - - - diff --git a/xhpc-modules/xhpc-data-big-screen/src/main/resources/mapper/XhpcAppUserMapper.xml b/xhpc-modules/xhpc-data-big-screen/src/main/resources/mapper/XhpcAppUserMapper.xml deleted file mode 100644 index 522bfe0b..00000000 --- a/xhpc-modules/xhpc-data-big-screen/src/main/resources/mapper/XhpcAppUserMapper.xml +++ /dev/null @@ -1,302 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - app_user_id - , phone, weixin_open_id, alipay_open_id, weixin_login, alipay_login, avatar, - balance, `password`, `status`, is_refund_application, del_flag, create_by, create_time, - update_by, update_time, remark, soc, is_refund, tenant_id, soc_protect - - - - - delete - from xhpc_app_user - where app_user_id = #{appUserId,jdbcType=BIGINT} - - - insert into xhpc_app_user (phone, weixin_open_id, alipay_open_id, - weixin_login, alipay_login, avatar, - balance, `password`, `status`, - is_refund_application, del_flag, create_by, - create_time, update_by, update_time, - remark, soc, is_refund, - tenant_id, soc_protect) - values (#{phone,jdbcType=VARCHAR}, #{weixinOpenId,jdbcType=VARCHAR}, #{alipayOpenId,jdbcType=VARCHAR}, - #{weixinLogin,jdbcType=INTEGER}, #{alipayLogin,jdbcType=INTEGER}, #{avatar,jdbcType=VARCHAR}, - #{balance,jdbcType=DECIMAL}, #{password,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, - #{isRefundApplication,jdbcType=INTEGER}, #{delFlag,jdbcType=CHAR}, #{createBy,jdbcType=VARCHAR}, - #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, - #{remark,jdbcType=VARCHAR}, #{soc,jdbcType=INTEGER}, #{isRefund,jdbcType=INTEGER}, - #{tenantId,jdbcType=VARCHAR}, #{socProtect,jdbcType=INTEGER}) - - - insert into xhpc_app_user - - - phone, - - - weixin_open_id, - - - alipay_open_id, - - - weixin_login, - - - alipay_login, - - - avatar, - - - balance, - - - `password`, - - - `status`, - - - is_refund_application, - - - del_flag, - - - create_by, - - - create_time, - - - update_by, - - - update_time, - - - remark, - - - soc, - - - is_refund, - - - tenant_id, - - - soc_protect, - - - - - #{phone,jdbcType=VARCHAR}, - - - #{weixinOpenId,jdbcType=VARCHAR}, - - - #{alipayOpenId,jdbcType=VARCHAR}, - - - #{weixinLogin,jdbcType=INTEGER}, - - - #{alipayLogin,jdbcType=INTEGER}, - - - #{avatar,jdbcType=VARCHAR}, - - - #{balance,jdbcType=DECIMAL}, - - - #{password,jdbcType=VARCHAR}, - - - #{status,jdbcType=INTEGER}, - - - #{isRefundApplication,jdbcType=INTEGER}, - - - #{delFlag,jdbcType=CHAR}, - - - #{createBy,jdbcType=VARCHAR}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateBy,jdbcType=VARCHAR}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - #{remark,jdbcType=VARCHAR}, - - - #{soc,jdbcType=INTEGER}, - - - #{isRefund,jdbcType=INTEGER}, - - - #{tenantId,jdbcType=VARCHAR}, - - - #{socProtect,jdbcType=INTEGER}, - - - - - update xhpc_app_user - - - phone = #{phone,jdbcType=VARCHAR}, - - - weixin_open_id = #{weixinOpenId,jdbcType=VARCHAR}, - - - alipay_open_id = #{alipayOpenId,jdbcType=VARCHAR}, - - - weixin_login = #{weixinLogin,jdbcType=INTEGER}, - - - alipay_login = #{alipayLogin,jdbcType=INTEGER}, - - - avatar = #{avatar,jdbcType=VARCHAR}, - - - balance = #{balance,jdbcType=DECIMAL}, - - - `password` = #{password,jdbcType=VARCHAR}, - - - `status` = #{status,jdbcType=INTEGER}, - - - is_refund_application = #{isRefundApplication,jdbcType=INTEGER}, - - - del_flag = #{delFlag,jdbcType=CHAR}, - - - create_by = #{createBy,jdbcType=VARCHAR}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_by = #{updateBy,jdbcType=VARCHAR}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - remark = #{remark,jdbcType=VARCHAR}, - - - soc = #{soc,jdbcType=INTEGER}, - - - is_refund = #{isRefund,jdbcType=INTEGER}, - - - tenant_id = #{tenantId,jdbcType=VARCHAR}, - - - soc_protect = #{socProtect,jdbcType=INTEGER}, - - - where app_user_id = #{appUserId,jdbcType=BIGINT} - - - update xhpc_app_user - set phone = #{phone,jdbcType=VARCHAR}, - weixin_open_id = #{weixinOpenId,jdbcType=VARCHAR}, - alipay_open_id = #{alipayOpenId,jdbcType=VARCHAR}, - weixin_login = #{weixinLogin,jdbcType=INTEGER}, - alipay_login = #{alipayLogin,jdbcType=INTEGER}, - avatar = #{avatar,jdbcType=VARCHAR}, - balance = #{balance,jdbcType=DECIMAL}, - `password` = #{password,jdbcType=VARCHAR}, - `status` = #{status,jdbcType=INTEGER}, - is_refund_application = #{isRefundApplication,jdbcType=INTEGER}, - del_flag = #{delFlag,jdbcType=CHAR}, - create_by = #{createBy,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_by = #{updateBy,jdbcType=VARCHAR}, - update_time = #{updateTime,jdbcType=TIMESTAMP}, - remark = #{remark,jdbcType=VARCHAR}, - soc = #{soc,jdbcType=INTEGER}, - is_refund = #{isRefund,jdbcType=INTEGER}, - tenant_id = #{tenantId,jdbcType=VARCHAR}, - soc_protect = #{socProtect,jdbcType=INTEGER} - where app_user_id = #{appUserId,jdbcType=BIGINT} - - \ No newline at end of file diff --git a/xhpc-modules/xhpc-message-board/pom.xml b/xhpc-modules/xhpc-message-board/pom.xml deleted file mode 100644 index efffedac..00000000 --- a/xhpc-modules/xhpc-message-board/pom.xml +++ /dev/null @@ -1,143 +0,0 @@ - - - - xhpc-modules - com.ruoyi - 3.0.0 - - 4.0.0 - - xhpc-message-board - - - 留言板服务 - - - - 8 - 8 - - - - - - - junit - junit - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-sentinel - - - - - org.springframework.boot - spring-boot-starter-actuator - - - - - io.springfox - springfox-swagger-ui - ${swagger.fox.version} - - - - - mysql - mysql-connector-java - - - - - com.ruoyi - ruoyi-common-datasource - - - - - com.ruoyi - ruoyi-common-datascope - - - - - com.ruoyi - ruoyi-common-log - - - - - com.ruoyi - ruoyi-common-swagger - - - com.ruoyi - ruoyi-common-core - - - com.squareup.okhttp3 - okhttp - - - com.ruoyi - xhpc-common - 3.0.0 - compile - - - com.aliyun.oss - aliyun-sdk-oss - 3.10.2 - compile - - - - - - ${project.artifactId} - - - src/main/resources - - - src/main/java - - **/*.xml - - - - - - org.springframework.boot - spring-boot-maven-plugin - 2.4.0 - - - - repackage - - - - - - - - \ No newline at end of file diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/XhpcMessageBoardApplication.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/XhpcMessageBoardApplication.java deleted file mode 100644 index e3264ebc..00000000 --- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/XhpcMessageBoardApplication.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.xhpc; - -import com.xhpc.common.security.annotation.EnableCustomConfig; -import com.xhpc.common.swagger.annotation.EnableCustomSwagger2; -import org.mybatis.spring.annotation.MapperScan; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.openfeign.EnableFeignClients; - -/** - * @author WH - * @date 2021/12/7 14:55 - * @since version-1.0 - */ -@EnableCustomConfig -@EnableCustomSwagger2 -@EnableFeignClients -@SpringBootApplication -@MapperScan("com.xhpc.board.mapper") -public class XhpcMessageBoardApplication { - - public static void main(String[] args) { - - SpringApplication.run(XhpcMessageBoardApplication.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ 留言板模块启动成功 ლ(´ڡ`ლ)ﾞ \n" + - " .-------. ____ __ \n" + - " | _ _ \\ \\ \\ / / \n" + - " | ( ' ) | \\ _. / ' \n" + - " |(_ o _) / _( )_ .' \n" + - " | (_,_).' __ ___(_ o _)' \n" + - " | |\\ \\ | || |(_,_)' \n" + - " | | \\ `' /| `-' / \n" + - " | | \\ / \\ / \n" + - " ''-' `'-' `-..-' "); - } - -} diff --git a/xhpc-modules/xhpc-message-board/src/main/resources/banner.txt b/xhpc-modules/xhpc-message-board/src/main/resources/banner.txt deleted file mode 100644 index 27cacb9c..00000000 --- a/xhpc-modules/xhpc-message-board/src/main/resources/banner.txt +++ /dev/null @@ -1,10 +0,0 @@ -Spring Boot Version: ${spring-boot.version} -Spring Application Name: ${spring.application.name} - _ __ _ _ - (_) / _|(_)| | - _ __ _ _ ___ _ _ _ ______ | |_ _ | | ___ -| '__|| | | | / _ \ | | | || ||______|| _|| || | / _ \ -| | | |_| || (_) || |_| || | | | | || || __/ -|_| \__,_| \___/ \__, ||_| |_| |_||_| \___| - __/ | - |___/ \ No newline at end of file diff --git a/xhpc-modules/xhpc-message-board/src/main/resources/bootstrap.yml b/xhpc-modules/xhpc-message-board/src/main/resources/bootstrap.yml deleted file mode 100644 index eacfd07b..00000000 --- a/xhpc-modules/xhpc-message-board/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,28 +0,0 @@ -# Tomcat -server: - port: 9805 - -# Spring -spring: - application: - # 应用名称 - name: xhpc-message-board - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: 172.31.183.135:8848 - config: - # 配置中心地址 - server-addr: 172.31.183.135:8848 - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} -#logging: -# level: -# com.xhpc.board.mapper: debug \ No newline at end of file diff --git a/xhpc-modules/xhpc-message-board/src/main/resources/logback.xml b/xhpc-modules/xhpc-message-board/src/main/resources/logback.xml deleted file mode 100644 index 66683df0..00000000 --- a/xhpc-modules/xhpc-message-board/src/main/resources/logback.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - ${log.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - ERROR - - ACCEPT - - DENY - - - - - - - - - - - - - - - - - -