ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/JianGuanAccountClient.java
@@ -16,12 +16,10 @@ */ @FeignClient(contextId = "JianGuanAccountClient", value = ServiceNameConstants.ACCOUNT_SERVICE, fallbackFactory = InviteUserFallbackFactory.class) public interface JianGuanAccountClient { /** * 政务云查询数据接口 * @return */ @PostMapping("/governmentCloud/listAll") @PostMapping("/governmentCloudAccount/listAll") R<GovernmentCloudAccountVO> listAll(); } ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/GovernmentCloudAccountVO.java
@@ -8,11 +8,11 @@ import java.util.List; @Data @ApiModel(value = "CarListVO对象",description = "政务云上传数据VO") @ApiModel(value = "GovernmentCloudAccountVO对象",description = "Account政务云上传数据VO") public class GovernmentCloudAccountVO { @ApiModelProperty(value = "优惠券") private List<TAppCoupon> reviewRate; private List<TAppCoupon> appCoupons; @ApiModelProperty(value = "用户") private List<TAppUser> appUsers; @ApiModelProperty(value = "用户地址") @@ -31,8 +31,7 @@ private List<TInviteUser> inviteUsers; @ApiModelProperty(value = "发票") private List<TInvoiceInformation> invoiceInformations; @ApiModelProperty(value = "会员") private List<TVip> vipList; ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/factory/JianGuanChargingPileFallbackFactory.java
New file @@ -0,0 +1,30 @@ package com.ruoyi.chargingPile.api.factory; import com.ruoyi.chargingPile.api.feignClient.JianGuanChargingPileClient; import com.ruoyi.chargingPile.api.vo.GovernmentCloudChargingPileVO; import com.ruoyi.common.core.domain.R; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; /** * * @author ruoyi */ @Component public class JianGuanChargingPileFallbackFactory implements org.springframework.cloud.openfeign.FallbackFactory<JianGuanChargingPileClient> { private static final Logger log = LoggerFactory.getLogger(JianGuanChargingPileFallbackFactory.class); @Override public JianGuanChargingPileClient create(Throwable throwable) { log.error("政务云查询数据接口:{}", throwable.getMessage()); return new JianGuanChargingPileClient() { @Override public R<GovernmentCloudChargingPileVO> listAll() { return R.fail("政务云查询数据接口ChargingPile:" + throwable.getMessage()); } }; } } ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/JianGuanChargingPileClient.java
New file @@ -0,0 +1,22 @@ package com.ruoyi.chargingPile.api.feignClient; import com.ruoyi.chargingPile.api.factory.JianGuanChargingPileFallbackFactory; import com.ruoyi.chargingPile.api.vo.GovernmentCloudChargingPileVO; import com.ruoyi.common.core.constant.ServiceNameConstants; import com.ruoyi.common.core.domain.R; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; /** * @author zhibing.pu * @Date 2024/9/4 17:54 */ @FeignClient(contextId = "JianGuanChargingPileClient", value = ServiceNameConstants.CHARGINGPILE_SERVICE, fallbackFactory = JianGuanChargingPileFallbackFactory.class) public interface JianGuanChargingPileClient { /** * 政务云查询数据接口 * @return */ @PostMapping("/governmentCloudChargingPile/listAll") R<GovernmentCloudChargingPileVO> listAll(); } ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TAccountingStrategyDetail.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.ruoyi.common.core.web.domain.BasePojo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -24,7 +25,7 @@ @EqualsAndHashCode(callSuper = false) @TableName("t_accounting_strategy_detail") @ApiModel(value="TAccountingStrategyDetail对象", description="计费策略明细") public class TAccountingStrategyDetail implements Serializable { public class TAccountingStrategyDetail extends BasePojo { private static final long serialVersionUID = 1L; ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/vo/GovernmentCloudChargingPileVO.java
New file @@ -0,0 +1,56 @@ package com.ruoyi.chargingPile.api.vo; import com.ruoyi.chargingPile.api.model.*; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; @Data @ApiModel(value = "GovernmentCloudChargingPileVO对象",description = "ChargingPile政务云上传数据VO") public class GovernmentCloudChargingPileVO { @ApiModelProperty(value = "合作商") private List<Partner> partners; @ApiModelProperty(value = "站点") private List<Site> sites; @ApiModelProperty(value = "计费策略") private List<TAccountingStrategy> accountingStrategies; @ApiModelProperty(value = "计费策略明细") private List<TAccountingStrategyDetail> accountingStrategyDetails; @ApiModelProperty(value = "申请充电桩") private List<TApplyChargingPile> applyChargingPiles; @ApiModelProperty(value = "车库") private List<TCarport> carports; @ApiModelProperty(value = "枪") private List<TChargingGun> chargingGuns; @ApiModelProperty(value = "桩") private List<TChargingPile> chargingPiles; @ApiModelProperty(value = "站点通知") private List<TChargingPileNotification> chargingPileNotifications; @ApiModelProperty(value = "故障内容") private List<TFaultMessage> faultMessages; @ApiModelProperty(value = "监控") private List<TMonitoringEquipment> monitoringEquipments; @ApiModelProperty(value = "停车场") private List<TParkingLot> parkingLots; @ApiModelProperty(value = "停车记录") private List<TParkingRecord> parkingRecords; @ApiModelProperty(value = "合作商站点") private List<TPartnerSite> partnerSites; @ApiModelProperty(value = "保修") private List<TRepair> repairs; @ApiModelProperty(value = "站点菜单那") private List<TSiteMenu> siteMenus; @ApiModelProperty(value = "车道") private List<TVehicleRamp> vehicleRamps; } ruoyi-api/ruoyi-api-chargingPile/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -6,4 +6,5 @@ com.ruoyi.chargingPile.api.factory.AccountingStrategyFallbackFactory com.ruoyi.chargingPile.api.factory.ParkingRecordFallbackFactory com.ruoyi.chargingPile.api.factory.FaultMessageFallbackFactory com.ruoyi.chargingPile.api.factory.PartnerFallbackFactory com.ruoyi.chargingPile.api.factory.PartnerFallbackFactory com.ruoyi.chargingPile.api.factory.JianGuanChargingPileFallbackFactory ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/JianGuanOrderFallbackFactory.java
New file @@ -0,0 +1,30 @@ package com.ruoyi.order.api.factory; import com.ruoyi.common.core.domain.R; import com.ruoyi.order.api.feignClient.JianGuanOrderClient; import com.ruoyi.order.api.vo.GovernmentCloudOrderVO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; /** * * @author ruoyi */ @Component public class JianGuanOrderFallbackFactory implements org.springframework.cloud.openfeign.FallbackFactory<JianGuanOrderClient> { private static final Logger log = LoggerFactory.getLogger(JianGuanOrderClient.class); @Override public JianGuanOrderClient create(Throwable throwable) { log.error("政务云查询数据接口:{}", throwable.getMessage()); return new JianGuanOrderClient() { @Override public R<GovernmentCloudOrderVO> listAll() { return R.fail("政务云查询数据接口Order:" + throwable.getMessage()); } }; } } ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/JianGuanOrderClient.java
New file @@ -0,0 +1,22 @@ package com.ruoyi.order.api.feignClient; import com.ruoyi.common.core.constant.ServiceNameConstants; import com.ruoyi.common.core.domain.R; import com.ruoyi.order.api.factory.JianGuanOrderFallbackFactory; import com.ruoyi.order.api.vo.GovernmentCloudOrderVO; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; /** * @author zhibing.pu * @Date 2024/9/4 17:54 */ @FeignClient(contextId = "JianGuanOrderClient", value = ServiceNameConstants.ORDER_SERVICE, fallbackFactory = JianGuanOrderFallbackFactory.class) public interface JianGuanOrderClient { /** * 政务云查询数据接口 * @return */ @PostMapping("/governmentCloudOrder/listAll") R<GovernmentCloudOrderVO> listAll(); } ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/AccountingStrategyDetailOrder.java
@@ -4,10 +4,12 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.ruoyi.common.core.web.domain.BasePojo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; import java.util.Base64; /** * @author zhibing.pu @@ -15,7 +17,7 @@ */ @Data @TableName("t_accounting_strategy_detail_order") public class AccountingStrategyDetailOrder { public class AccountingStrategyDetailOrder extends BasePojo { /** * 主键 */ ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrderRefund.java
@@ -7,6 +7,7 @@ import java.io.Serializable; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.web.domain.BasePojo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -24,7 +25,7 @@ @EqualsAndHashCode(callSuper = false) @TableName("t_charging_order_refund") @ApiModel(value="TChargingOrderRefund对象1", description="") public class TChargingOrderRefund implements Serializable { public class TChargingOrderRefund extends BasePojo { private static final long serialVersionUID = 1L; ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TOrderEvaluateTag.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.ruoyi.common.core.web.domain.BasePojo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -23,7 +24,7 @@ @EqualsAndHashCode(callSuper = false) @TableName("t_order_evaluate_tag") @ApiModel(value="TOrderEvaluateTag对象", description="") public class TOrderEvaluateTag implements Serializable { public class TOrderEvaluateTag extends BasePojo { private static final long serialVersionUID = 1L; ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TOrderInvoiceDetail.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.ruoyi.common.core.web.domain.BasePojo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -24,7 +25,7 @@ @EqualsAndHashCode(callSuper = false) @TableName("t_order_invoice_detail") @ApiModel(value="TOrderInvoiceDetail对象", description="") public class TOrderInvoiceDetail implements Serializable { public class TOrderInvoiceDetail extends BasePojo { private static final long serialVersionUID = 1L; ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TShoppingOrderRefund.java
@@ -7,6 +7,7 @@ import java.io.Serializable; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.web.domain.BasePojo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -24,7 +25,7 @@ @EqualsAndHashCode(callSuper = false) @TableName("t_shopping_order_refund") @ApiModel(value="TShoppingOrderRefund对象", description="") public class TShoppingOrderRefund implements Serializable { public class TShoppingOrderRefund extends BasePojo { private static final long serialVersionUID = 1L; ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TVipOrderRefund.java
@@ -7,6 +7,7 @@ import java.io.Serializable; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.web.domain.BasePojo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -24,7 +25,7 @@ @EqualsAndHashCode(callSuper = false) @TableName("t_vip_order_refund") @ApiModel(value="TVipOrderRefund对象", description="") public class TVipOrderRefund implements Serializable { public class TVipOrderRefund extends BasePojo { private static final long serialVersionUID = 1L; ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/GovernmentCloudOrderVO.java
New file @@ -0,0 +1,58 @@ package com.ruoyi.order.api.vo; import com.ruoyi.order.api.model.*; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; @Data @ApiModel(value = "GovernmentCloudOrderVO对象",description = "Order政务云上传数据VO") public class GovernmentCloudOrderVO { @ApiModelProperty(value = "计费策略明细") private List<AccountingStrategyDetailOrder> accountingStrategyDetailOrders; @ApiModelProperty(value = "策略申请") private List<AccountingStrategyOrder> accountingStrategyOrders; @ApiModelProperty(value = "账单") private List<TChargingBill> chargingBills; @ApiModelProperty(value = "充电订单") private List<TChargingOrder> chargingOrders; @ApiModelProperty(value = "充电明细") private List<TChargingOrderAccountingStrategy> chargingOrderAccountingStrategies; @ApiModelProperty(value = "充电订单退款") private List<TChargingOrderRefund> chargingOrderRefunds; @ApiModelProperty(value = "积分订单") private List<TExchangeOrder> exchangeOrders; @ApiModelProperty(value = "赠送会员") private List<TGrantVip> grantVips; @ApiModelProperty(value = "订单申诉") private List<TOrderAppeal> orderAppeals; @ApiModelProperty(value = "订单评价") private List<TOrderEvaluate> orderEvaluates; @ApiModelProperty(value = "订单评价标签") private List<TOrderEvaluateTag> orderEvaluateTags; @ApiModelProperty(value = "订单开票") private List<TOrderInvoice> orderInvoices; @ApiModelProperty(value = "订单开票明细") private List<TOrderInvoiceDetail> orderInvoiceDetails; @ApiModelProperty(value = "结算确认") private List<TSettlementConfirm> settlementConfirms; @ApiModelProperty(value = "购物订单") private List<TShoppingOrder> shoppingOrders; @ApiModelProperty(value = "购物订单退款") private List<TShoppingOrderRefund> shoppingOrderRefunds; @ApiModelProperty(value = "会员订单") private List<TVipOrder> vipOrders; @ApiModelProperty(value = "会员退款") private List<TVipOrderRefund> vipOrderRefunds; } ruoyi-api/ruoyi-api-order/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -4,4 +4,5 @@ com.ruoyi.order.api.factory.ChargingOrderAccountingStrategyFallbackFactory com.ruoyi.order.api.factory.AccountingStrategyDetailOrderFallbackFactory com.ruoyi.order.api.factory.AccountingStrategyOrderFallbackFactory com.ruoyi.order.api.factory.ShoppingOrderFallbackFactory com.ruoyi.order.api.factory.ShoppingOrderFallbackFactory com.ruoyi.order.api.factory.JianGuanOrderFallbackFactory ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/JianGuanOtherFallbackFactory.java
New file @@ -0,0 +1,30 @@ package com.ruoyi.other.api.factory; import com.ruoyi.common.core.domain.R; import com.ruoyi.other.api.feignClient.JianGuanOtherClient; import com.ruoyi.other.api.vo.GovernmentCloudOtherVO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; /** * * @author ruoyi */ @Component public class JianGuanOtherFallbackFactory implements org.springframework.cloud.openfeign.FallbackFactory<JianGuanOtherClient> { private static final Logger log = LoggerFactory.getLogger(JianGuanOtherClient.class); @Override public JianGuanOtherClient create(Throwable throwable) { log.error("政务云查询数据接口:{}", throwable.getMessage()); return new JianGuanOtherClient() { @Override public R<GovernmentCloudOtherVO> listAll() { return R.fail("政务云查询数据接口Other:" + throwable.getMessage()); } }; } } ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/JianGuanOtherClient.java
New file @@ -0,0 +1,22 @@ package com.ruoyi.other.api.feignClient; import com.ruoyi.common.core.constant.ServiceNameConstants; import com.ruoyi.common.core.domain.R; import com.ruoyi.other.api.factory.JianGuanOtherFallbackFactory; import com.ruoyi.other.api.vo.GovernmentCloudOtherVO; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; /** * @author zhibing.pu * @Date 2024/9/4 17:54 */ @FeignClient(contextId = "JianGuanOtherClient", value = ServiceNameConstants.OTHER_SERVICE, fallbackFactory = JianGuanOtherFallbackFactory.class) public interface JianGuanOtherClient { /** * 政务云查询数据接口 * @return */ @PostMapping("/governmentCloudOther/listAll") R<GovernmentCloudOtherVO> listAll(); } ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/vo/GovernmentCloudOtherVO.java
New file @@ -0,0 +1,53 @@ package com.ruoyi.other.api.vo; import com.ruoyi.other.api.domain.*; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; @Data @ApiModel(value = "GovernmentCloudOtherVO对象",description = "Other政务云上传数据VO") public class GovernmentCloudOtherVO { @ApiModelProperty(value = "合作商") private List<Operator> operators; @ApiModelProperty(value = "活动") private List<TActivity> activities; @ApiModelProperty(value = "广告") private List<TAdvertising> advertisings; @ApiModelProperty(value = "公司") private List<TCompany> companies; @ApiModelProperty(value = "优惠券") private List<TCoupon> coupons; @ApiModelProperty(value = "用户信息") private List<TEnterpriseUserApplication> enterpriseUserApplications; @ApiModelProperty(value = "评价标签") private List<TEvaluationTag> evaluationTags; @ApiModelProperty(value = "商品") private List<TGoods> goods; @ApiModelProperty(value = "协议") private List<THtml> htmls; @ApiModelProperty(value = "积分规则") private List<TIntegralRule> integralRules; @ApiModelProperty(value = "开票类型") private List<TInvoiceType> invoiceTypes; @ApiModelProperty(value = "消息") private List<TNotice> notices; @ApiModelProperty(value = "系统配置") private List<TSystemConfiguration> systemConfigurations; @ApiModelProperty(value = "用户标签") private List<TUserTag> userTags; @ApiModelProperty(value = "会员") private List<TVip> vips; } ruoyi-api/ruoyi-api-other/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -10,4 +10,5 @@ com.ruoyi.other.api.factory.WebSocketFallbackFactory com.ruoyi.other.api.factory.UserTagFallbackFactory com.ruoyi.other.api.factory.OperatorFallbackFactory com.ruoyi.other.api.factory.SystemConfigurationClientFallbackFactory com.ruoyi.other.api.factory.SystemConfigurationClientFallbackFactory com.ruoyi.other.api.factory.JianGuanOtherFallbackFactory ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/GovernmentCloudAccountController.java
New file @@ -0,0 +1,80 @@ package com.ruoyi.account.controller; import com.ruoyi.account.api.model.*; import com.ruoyi.account.api.vo.GovernmentCloudAccountVO; import com.ruoyi.account.service.*; import com.ruoyi.common.core.domain.R; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.time.LocalDateTime; import java.util.List; /** * <p> * 前端控制器 * </p> * * @author luodangjia * @since 2024-08-06 */ @RestController @RequestMapping("/governmentCloudAccount") public class GovernmentCloudAccountController { @Autowired private TAppCouponService tAppCouponService; @Autowired private TAppUserCarService appUserCarService; @Autowired private TAppUserTagService appUserTagService; @Autowired private TAppUserService appUserService; @Autowired private TAppUserAddressService appUserAddressService; @Autowired private TAppUserIntegralChangeService appUserIntegralChangeService; @Autowired private TAppUserSignService appUserSignService; @Autowired private TAppUserVipDetailService appUserVipDetailService; @Autowired private TInviteUserService inviteUserService; @Autowired private TInvoiceInformationService invoiceInformationService; /** * 政务云查询数据接口 * @return */ @PostMapping("/listAll") R<GovernmentCloudAccountVO> listAll() { LocalDateTime end = LocalDateTime.now(); LocalDateTime start = LocalDateTime.now().minusDays(1); GovernmentCloudAccountVO governmentCloudAccountVO = new GovernmentCloudAccountVO(); List<TAppCoupon> list1 = tAppCouponService.lambdaQuery().between(TAppCoupon::getCreateTime, start, end).list(); List<TAppUser> list2 = appUserService.lambdaQuery().between(TAppUser::getCreateTime, start, end).list(); List<TAppUserAddress> list3 = appUserAddressService.lambdaQuery().between(TAppUserAddress::getCreateTime, start, end).list(); List<TAppUserCar> list4 = appUserCarService.lambdaQuery().between(TAppUserCar::getCreateTime, start, end).list(); List<TAppUserIntegralChange> list5 = appUserIntegralChangeService.lambdaQuery().between(TAppUserIntegralChange::getCreateTime, start, end).list(); List<TAppUserSign> list6 = appUserSignService.lambdaQuery().between(TAppUserSign::getCreateTime, start, end).list(); List<TAppUserTag> list7 = appUserTagService.lambdaQuery().between(TAppUserTag::getCreateTime, start, end).list(); List<TAppUserVipDetail> list8 = appUserVipDetailService.lambdaQuery().between(TAppUserVipDetail::getCreateTime, start, end).list(); List<TInviteUser> list9 = inviteUserService.lambdaQuery().between(TInviteUser::getCreateTime, start, end).list(); List<TInvoiceInformation> list10 = invoiceInformationService.lambdaQuery().between(TInvoiceInformation::getCreateTime, start, end).list(); governmentCloudAccountVO.setAppCoupons(list1); governmentCloudAccountVO.setAppUsers(list2); governmentCloudAccountVO.setAppUserAddresses(list3); governmentCloudAccountVO.setAppUserCars(list4); governmentCloudAccountVO.setAppUserIntegralChanges(list5); governmentCloudAccountVO.setAppUserSigns(list6); governmentCloudAccountVO.setAppUserTags(list7); governmentCloudAccountVO.setAppUserVipDetails(list8); governmentCloudAccountVO.setInviteUsers(list9); governmentCloudAccountVO.setInvoiceInformations(list10); return R.ok(governmentCloudAccountVO); } } ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/GovernmentCloudController.java
File was deleted ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/GovernmentCloudChargingPileController.java
New file @@ -0,0 +1,114 @@ package com.ruoyi.chargingPile.controller; import com.ruoyi.account.api.model.*; import com.ruoyi.account.api.vo.GovernmentCloudAccountVO; import com.ruoyi.chargingPile.api.model.*; import com.ruoyi.chargingPile.api.vo.GovernmentCloudChargingPileVO; import com.ruoyi.chargingPile.service.*; import com.ruoyi.common.core.domain.R; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.time.LocalDateTime; import java.util.List; /** * <p> * 前端控制器 * </p> * * @author luodangjia * @since 2024-08-06 */ @RestController @RequestMapping("/governmentCloudChargingPile") public class GovernmentCloudChargingPileController { @Autowired private IPartnerService partnerService; @Autowired private ISiteService siteService; @Autowired private TAccountingStrategyDetailService accountingStrategyDetailService; @Autowired private TAccountingStrategyService accountingStrategyService; @Autowired private TApplyChargingPileService applyChargingPileService; @Autowired private TCarportService carportService; @Autowired private TChargingGunService chargingGunService; @Autowired private TChargingPileNotificationService chargingPileNotificationService; @Autowired private TChargingPileService chargingPileService; @Autowired private TFaultMessageService faultMessageService; @Autowired private TMonitoringEquipmentService monitoringEquipmentService; @Autowired private TParkingLotService parkingLotService; @Autowired private TParkingRecordService parkingRecordService; @Autowired private TPartnerSiteService partnerSiteService; @Autowired private TRepairService repairService; @Autowired private TSiteMenuService siteMenuService; @Autowired private TVehicleRampService vehicleRampService; /** * 政务云查询数据接口 * @return */ @PostMapping("/listAll") R<GovernmentCloudChargingPileVO> listAll() { LocalDateTime end = LocalDateTime.now(); LocalDateTime start = LocalDateTime.now().minusDays(1); GovernmentCloudChargingPileVO governmentCloudAccountVO = new GovernmentCloudChargingPileVO(); List<Partner> list1 = partnerService.lambdaQuery().between(Partner::getCreateTime, start, end).list(); List<Site> list2 = siteService.lambdaQuery().between(Site::getCreateTime, start, end).list(); List<TAccountingStrategyDetail> list3 = accountingStrategyDetailService.lambdaQuery().between(TAccountingStrategyDetail::getCreateTime, start, end).list(); List<TAccountingStrategy> list4 = accountingStrategyService.lambdaQuery().between(TAccountingStrategy::getCreateTime, start, end).list(); List<TApplyChargingPile> list5 = applyChargingPileService.lambdaQuery().between(TApplyChargingPile::getCreateTime, start, end).list(); List<TCarport> list6 = carportService.lambdaQuery().between(TCarport::getCreateTime, start, end).list(); List<TChargingGun> list7 = chargingGunService.lambdaQuery().between(TChargingGun::getCreateTime, start, end).list(); List<TChargingPile> list8 = chargingPileService.lambdaQuery().between(TChargingPile::getCreateTime, start, end).list(); List<TChargingPileNotification> list9 = chargingPileNotificationService.lambdaQuery().between(TChargingPileNotification::getCreateTime, start, end).list(); List<TFaultMessage> list10 = faultMessageService.lambdaQuery().between(TFaultMessage::getCreateTime, start, end).list(); List<TMonitoringEquipment> list11 = monitoringEquipmentService.lambdaQuery().between(TMonitoringEquipment::getCreateTime, start, end).list(); List<TParkingLot> list12 = parkingLotService.lambdaQuery().between(TParkingLot::getCreateTime, start, end).list(); List<TParkingRecord> list13 = parkingRecordService.lambdaQuery().between(TParkingRecord::getCreateTime, start, end).list(); // List<TPartnerSite> list14 = invoiceInformationService.lambdaQuery().between(TPartnerSite::getCreateTime, start, end).list(); List<TRepair> list15 = repairService.lambdaQuery().between(TRepair::getCreateTime, start, end).list(); List<TVehicleRamp> list16 = vehicleRampService.lambdaQuery().between(TVehicleRamp::getCreateTime, start, end).list(); // List<TSiteMenu> list17 = siteMenuService.lambdaQuery().between(TSiteMenu::getCreateTime, start, end).list(); governmentCloudAccountVO.setPartners(list1); governmentCloudAccountVO.setSites(list2); governmentCloudAccountVO.setAccountingStrategies(list4); governmentCloudAccountVO.setAccountingStrategyDetails(list3); governmentCloudAccountVO.setApplyChargingPiles(list5); governmentCloudAccountVO.setCarports(list6); governmentCloudAccountVO.setChargingGuns(list7); governmentCloudAccountVO.setChargingPiles(list8); governmentCloudAccountVO.setChargingPileNotifications(list9); governmentCloudAccountVO.setFaultMessages(list10); governmentCloudAccountVO.setMonitoringEquipments(list11); governmentCloudAccountVO.setParkingLots(list12); governmentCloudAccountVO.setParkingRecords(list13); // governmentCloudAccountVO.setPartnerSites(list14); governmentCloudAccountVO.setRepairs(list15); governmentCloudAccountVO.setVehicleRamps(list16); // governmentCloudAccountVO.setSiteMenus(list17); return R.ok(governmentCloudAccountVO); } } ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/util/GovernmentCloudTask.java
@@ -1,6 +1,81 @@ package com.ruoyi.jianguan.util; import com.ruoyi.other.api.domain.TEnterpriseUserApplication; import com.ruoyi.other.api.domain.THtml; import com.ruoyi.other.api.domain.TCoupon; import com.ruoyi.other.api.domain.TSystemConfiguration; import com.ruoyi.other.api.domain.TVip; import com.ruoyi.other.api.domain.Operator; import com.ruoyi.other.api.domain.TGoods; import com.ruoyi.other.api.domain.TInvoiceType; import com.ruoyi.other.api.domain.TIntegralRule; import com.ruoyi.other.api.domain.TActivity; import com.ruoyi.other.api.domain.TAdvertising; import com.ruoyi.other.api.domain.TCompany; import com.ruoyi.other.api.domain.TEvaluationTag; import com.ruoyi.other.api.domain.TNotice; import com.ruoyi.other.api.domain.TUserTag; import com.ruoyi.order.api.model.AccountingStrategyDetailOrder; import com.ruoyi.order.api.model.TOrderInvoice; import com.ruoyi.order.api.model.TChargingOrderAccountingStrategy; import com.ruoyi.order.api.model.TExchangeOrder; import com.ruoyi.order.api.model.TOrderEvaluate; import com.ruoyi.order.api.model.TSettlementConfirm; import com.ruoyi.order.api.model.TVipOrder; import com.ruoyi.order.api.model.TVipOrderRefund; import com.ruoyi.order.api.model.AccountingStrategyOrder; import com.ruoyi.order.api.model.TOrderInvoiceDetail; import com.ruoyi.order.api.model.TChargingOrder; import com.ruoyi.order.api.model.TChargingOrderRefund; import com.ruoyi.order.api.model.TGrantVip; import com.ruoyi.order.api.model.TOrderEvaluateTag; import com.ruoyi.order.api.model.TOrderAppeal; import com.ruoyi.order.api.model.TShoppingOrder; import com.ruoyi.order.api.model.TShoppingOrderRefund; import com.ruoyi.order.api.model.TChargingBill; import com.ruoyi.chargingPile.api.model.TVehicleRamp; import com.ruoyi.chargingPile.api.model.TParkingLot; import com.ruoyi.chargingPile.api.model.TSiteMenu; import com.ruoyi.chargingPile.api.model.TParkingRecord; import com.ruoyi.chargingPile.api.model.TAccountingStrategy; import com.ruoyi.chargingPile.api.model.TFaultMessage; import com.ruoyi.chargingPile.api.model.TAccountingStrategyDetail; import com.ruoyi.chargingPile.api.model.TPartnerSite; import com.ruoyi.chargingPile.api.model.TApplyChargingPile; import com.ruoyi.chargingPile.api.model.TChargingPileNotification; import com.ruoyi.chargingPile.api.model.TMonitoringEquipment; import com.ruoyi.chargingPile.api.model.Site; import com.ruoyi.chargingPile.api.model.TRepair; import com.ruoyi.chargingPile.api.model.Partner; import com.ruoyi.chargingPile.api.model.TCarport; import com.ruoyi.chargingPile.api.model.TChargingGun; import com.ruoyi.account.api.model.TAppUserSign; import java.util.List; import com.ruoyi.account.api.model.TAppUserVipDetail; import com.ruoyi.account.api.model.TInvoiceInformation; import com.ruoyi.account.api.model.TAppCoupon; import com.ruoyi.account.api.model.TAppUserCar; import com.ruoyi.account.api.model.TAppUser; import com.ruoyi.account.api.model.TInviteUser; import com.ruoyi.account.api.model.TAppUserAddress; import com.ruoyi.account.api.model.TAppUserIntegralChange; import com.ruoyi.account.api.model.TAppUserTag; import com.ruoyi.account.api.feignClient.JianGuanAccountClient; import com.ruoyi.account.api.vo.GovernmentCloudAccountVO; import com.ruoyi.chargingPile.api.feignClient.JianGuanChargingPileClient; import com.ruoyi.chargingPile.api.model.TChargingPile; import com.ruoyi.chargingPile.api.vo.GovernmentCloudChargingPileVO; import com.ruoyi.jianguan.service.*; import com.ruoyi.order.api.feignClient.JianGuanOrderClient; import com.ruoyi.order.api.vo.GovernmentCloudOrderVO; import com.ruoyi.other.api.feignClient.JianGuanOtherClient; import com.ruoyi.other.api.vo.GovernmentCloudOtherVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -17,175 +92,446 @@ @Resource private AccountingStrategyDetailOrderService accountingStrategyDetailOrderService; private AccountingStrategyDetailOrderService accountingStrategyDetailOrderService; @Resource private AccountingStrategyOrderService accountingStrategyOrderService; private AccountingStrategyOrderService accountingStrategyOrderService; @Resource private GenTableColumnService genTableColumnService; private GenTableColumnService genTableColumnService; @Resource private GenTableService genTableService; private GenTableService genTableService; @Resource private IPartnerService partnerService; private IPartnerService partnerService; @Resource private IRegionService regionService; private IRegionService regionService; @Resource private ISiteService siteService; private ISiteService siteService; @Resource private ISysConfigService sysConfigService; private ISysConfigService sysConfigService; @Resource private ISysDeptService deptService; private ISysDeptService deptService; @Resource private ISysDictDataService sysDictDataService; private ISysDictDataService sysDictDataService; @Resource private ISysDictTypeService sysDictTypeService; private ISysDictTypeService sysDictTypeService; @Resource private ISysLoginLogService sysLoginLogService; private ISysLoginLogService sysLoginLogService; @Resource private ISysMenuService sysMenuService; private ISysMenuService sysMenuService; @Resource private ISysNoticeService sysNoticeService; private ISysNoticeService sysNoticeService; @Resource private ISysOperLogService sysOperLogService; private ISysOperLogService sysOperLogService; @Resource private ISysPermissionService sysPermissionService; private ISysPermissionService sysPermissionService; @Resource private ISysPostService sysPostService; private ISysPostService sysPostService; @Resource private ISysRoleService sysRoleService; private ISysRoleService sysRoleService; @Resource private ISysUserOnlineService sysUserOnlineService; private ISysUserOnlineService sysUserOnlineService; @Resource private ISysUserRoleService sysUserRoleService; private ISysUserRoleService sysUserRoleService; @Resource private ISysUserService sysUserService; private ISysUserService sysUserService; @Resource private OperatorService operatorService; private OperatorService operatorService; @Resource private TAccountingStrategyDetailService accountingStrategyDetailService; private TAccountingStrategyDetailService accountingStrategyDetailService; @Resource private TAccountingStrategyService accountingStrategyService; private TAccountingStrategyService accountingStrategyService; @Resource private TActivityService activityService; private TActivityService activityService; @Resource private TAdvertisingService advertisingService; private TAdvertisingService advertisingService; @Resource private TAppCouponService appCouponService; private TAppCouponService appCouponService; @Resource private TApplyChargingPileService applyChargingPileService; private TApplyChargingPileService applyChargingPileService; @Resource private TAppUserAddressService appUserAddressService; private TAppUserAddressService appUserAddressService; @Resource private TAppUserCarService appUserCarService; private TAppUserCarService appUserCarService; @Resource private TAppUserIntegralChangeService appUserIntegralChangeService; private TAppUserIntegralChangeService appUserIntegralChangeService; @Resource private TAppUserService appUserService; private TAppUserService appUserService; @Resource private TAppUserSignService appUserSignService; private TAppUserSignService appUserSignService; @Resource private TAppUserTagService appUserTagService; private TAppUserTagService appUserTagService; @Resource private TAppUserVipDetailService appUserVipDetailService; private TAppUserVipDetailService appUserVipDetailService; @Resource private TCarportService carportService; private TCarportService carportService; @Resource private TChargingBillService chargingBillService; private TChargingBillService chargingBillService; @Resource private TChargingGunService chargingGunService; private TChargingGunService chargingGunService; @Resource private TChargingOrderAccountingStrategyService chargingOrderAccountingStrategyService; @Resource private TChargingOrderRefundService chargingOrderRefundService; private TChargingOrderRefundService chargingOrderRefundService; @Resource private TChargingOrderService chargingOrderService; private TChargingOrderService chargingOrderService; @Resource private TChargingPileNotificationService chargingPileNotificationService; private TChargingPileNotificationService chargingPileNotificationService; @Resource private TChargingPileService chargingPileService; private TChargingPileService chargingPileService; @Resource private TCompanyService companyService; private TCompanyService companyService; @Resource private TCouponService couponService; private TCouponService couponService; @Resource private TEnterpriseUserApplicationService enterpriseUserApplicationService; private TEnterpriseUserApplicationService enterpriseUserApplicationService; @Resource private TEvaluationTagService evaluationTagService; private TEvaluationTagService evaluationTagService; @Resource private TExchangeOrderService exchangeOrderService; private TExchangeOrderService exchangeOrderService; @Resource private TFaultMessageService faultMessageService; private TFaultMessageService faultMessageService; @Resource private TGoodsService goodsService; private TGoodsService goodsService; @Resource private TGrantVipService grantVipService; private TGrantVipService grantVipService; @Resource private THtmlService htmlService; private THtmlService htmlService; @Resource private TIntegralRuleService integralRuleService; private TIntegralRuleService integralRuleService; @Resource private TInviteUserService inviteUserService; private TInviteUserService inviteUserService; @Resource private TInvoiceInformationService tInvoiceInformationService; private TInvoiceInformationService tInvoiceInformationService; @Resource private TInvoiceTypeService invoiceTypeService; private TInvoiceTypeService invoiceTypeService; @Resource private TMonitoringEquipmentService monitoringEquipmentService; private TMonitoringEquipmentService monitoringEquipmentService; @Resource private TNoticeService noticeService; private TNoticeService noticeService; @Resource private TOrderAppealService orderAppealService; private TOrderAppealService orderAppealService; @Resource private TOrderEvaluateService orderEvaluateService; private TOrderEvaluateService orderEvaluateService; @Resource private TOrderEvaluateTagService orderEvaluateTagService; private TOrderEvaluateTagService orderEvaluateTagService; @Resource private TOrderInvoiceDetailService orderInvoiceDetailService; private TOrderInvoiceDetailService orderInvoiceDetailService; @Resource private TOrderInvoiceService orderInvoiceService; private TOrderInvoiceService orderInvoiceService; @Resource private TParkingLotService parkingLotService; private TParkingLotService parkingLotService; @Resource private TParkingRecordService parkingRecordService; private TParkingRecordService parkingRecordService; @Resource private TPartnerSiteService partnerSiteService; private TPartnerSiteService partnerSiteService; @Resource private TRepairService repairService; private TRepairService repairService; @Resource private TRoleSiteService roleSiteService; private TRoleSiteService roleSiteService; @Resource private TSettlementConfirmService settlementConfirmService; private TSettlementConfirmService settlementConfirmService; @Resource private TShoppingOrderRefundService shoppingOrderRefundService; private TShoppingOrderRefundService shoppingOrderRefundService; @Resource private TShoppingOrderService shoppingOrderService; private TShoppingOrderService shoppingOrderService; @Resource private TSiteMenuService siteMenuService; private TSiteMenuService siteMenuService; @Resource private TSystemConfigurationService systemConfigurationService; private TSystemConfigurationService systemConfigurationService; @Resource private TUserSiteService userSiteService; private TUserSiteService userSiteService; @Resource private TUserTagService userTagService; private TUserTagService userTagService; @Resource private TVehicleRampService vehicleRampService; private TVehicleRampService vehicleRampService; @Resource private TVipOrderRefundService vipOrderRefundService; private TVipOrderRefundService vipOrderRefundService; @Resource private TVipOrderService vipOrderService; private TVipOrderService vipOrderService; @Resource private TVipService vipService; private TVipService vipService; @Resource private JianGuanAccountClient jianGuanAccountClient; @Resource private JianGuanChargingPileClient jianGuanChargingPileClient; @Resource private JianGuanOrderClient jianGuanOrderClient; @Resource private JianGuanOtherClient jianGuanOtherClient; // 每天早上9点执行的定时任务 @Scheduled(cron = "0 0 9 * * ?") public void taskMonth() { LocalDateTime start = LocalDateTime.now(); LocalDateTime end = LocalDateTime.now().minusDays(1); // account服务 GovernmentCloudAccountVO data = jianGuanAccountClient.listAll().getData(); if (data != null) { List<TAppCoupon> appCoupons = data.getAppCoupons(); if (!appCoupons.isEmpty()) { appCouponService.saveBatch(appCoupons); } List<TAppUser> appUsers = data.getAppUsers(); if (!appUsers.isEmpty()) { appUserService.saveBatch(appUsers); } List<TAppUserAddress> appUserAddresses = data.getAppUserAddresses(); if (!appUserAddresses.isEmpty()) { appUserAddressService.saveBatch(appUserAddresses); } List<TAppUserCar> appUserCars = data.getAppUserCars(); if (!appUserCars.isEmpty()) { appUserCarService.saveBatch(appUserCars); } List<TAppUserIntegralChange> appUserIntegralChanges = data.getAppUserIntegralChanges(); if (!appUserIntegralChanges.isEmpty()) { appUserIntegralChangeService.saveBatch(appUserIntegralChanges); } List<TAppUserSign> appUserSigns = data.getAppUserSigns(); if (!appUserSigns.isEmpty()) { appUserSignService.saveBatch(appUserSigns); } List<TAppUserTag> appUserTags = data.getAppUserTags(); if (!appUserTags.isEmpty()) { appUserTagService.saveBatch(appUserTags); } List<TAppUserVipDetail> appUserVipDetails = data.getAppUserVipDetails(); if (!appUserVipDetails.isEmpty()) { appUserVipDetailService.saveBatch(appUserVipDetails); } List<TInviteUser> inviteUsers = data.getInviteUsers(); if (!inviteUsers.isEmpty()) { inviteUserService.saveBatch(inviteUsers); } List<TInvoiceInformation> invoiceInformations = data.getInvoiceInformations(); if (!invoiceInformations.isEmpty()) { tInvoiceInformationService.saveBatch(invoiceInformations); } } // chargingPile服务 GovernmentCloudChargingPileVO data1 = jianGuanChargingPileClient.listAll().getData(); if (data1 != null) { List<Partner> partners = data1.getPartners(); if (!partners.isEmpty()) { partnerService.saveBatch(partners); } List<Site> sites = data1.getSites(); if (!sites.isEmpty()) { siteService.saveBatch(sites); } List<TAccountingStrategy> accountingStrategies = data1.getAccountingStrategies(); if (!accountingStrategies.isEmpty()) { accountingStrategyService.saveBatch(accountingStrategies); } List<TAccountingStrategyDetail> accountingStrategyDetails = data1.getAccountingStrategyDetails(); if (!accountingStrategyDetails.isEmpty()) { accountingStrategyDetailService.saveBatch(accountingStrategyDetails); } List<TApplyChargingPile> applyChargingPiles = data1.getApplyChargingPiles(); if (!applyChargingPiles.isEmpty()) { applyChargingPileService.saveBatch(applyChargingPiles); } List<TCarport> carports = data1.getCarports(); if (!carports.isEmpty()) { carportService.saveBatch(carports); } List<TChargingGun> chargingGuns = data1.getChargingGuns(); if (!chargingGuns.isEmpty()) { chargingGunService.saveBatch(chargingGuns); } List<TChargingPile> chargingPiles = data1.getChargingPiles(); if (!chargingPiles.isEmpty()) { chargingPileService.saveBatch(chargingPiles); } List<TChargingPileNotification> chargingPileNotifications = data1.getChargingPileNotifications(); if (!chargingPileNotifications.isEmpty()) { chargingPileNotificationService.saveBatch(chargingPileNotifications); } List<TFaultMessage> faultMessages = data1.getFaultMessages(); if (!faultMessages.isEmpty()) { faultMessageService.saveBatch(faultMessages); } List<TMonitoringEquipment> monitoringEquipments = data1.getMonitoringEquipments(); if (!monitoringEquipments.isEmpty()) { monitoringEquipmentService.saveBatch(monitoringEquipments); } List<TParkingLot> parkingLots = data1.getParkingLots(); if (!parkingLots.isEmpty()) { parkingLotService.saveBatch(parkingLots); } List<TParkingRecord> parkingRecords = data1.getParkingRecords(); if (!parkingRecords.isEmpty()) { parkingRecordService.saveBatch(parkingRecords); } // List<TPartnerSite> partnerSites = data1.getPartnerSites(); // if (!partnerSites.isEmpty()) { // partnerSiteService.saveBatch(partnerSites); // } List<TRepair> repairs = data1.getRepairs(); if (!repairs.isEmpty()) { repairService.saveBatch(repairs); } // List<TSiteMenu> siteMenus = data1.getSiteMenus(); // if (!siteMenus.isEmpty()) { // siteMenuService.saveBatch(siteMenus); // } List<TVehicleRamp> vehicleRamps = data1.getVehicleRamps(); if (!vehicleRamps.isEmpty()) { vehicleRampService.saveBatch(vehicleRamps); } } //order服务 GovernmentCloudOrderVO data2 = jianGuanOrderClient.listAll().getData(); if (data2 != null) { List<AccountingStrategyDetailOrder> accountingStrategyDetailOrders = data2.getAccountingStrategyDetailOrders(); if (!accountingStrategyDetailOrders.isEmpty()) { accountingStrategyDetailOrderService.saveBatch(accountingStrategyDetailOrders); } List<AccountingStrategyOrder> accountingStrategyOrders = data2.getAccountingStrategyOrders(); if (!accountingStrategyOrders.isEmpty()) { accountingStrategyOrderService.saveBatch(accountingStrategyOrders); } List<TChargingBill> chargingBills = data2.getChargingBills(); if (!chargingBills.isEmpty()) { chargingBillService.saveBatch(chargingBills); } List<TChargingOrder> chargingOrders = data2.getChargingOrders(); if (!chargingOrders.isEmpty()) { chargingOrderService.saveBatch(chargingOrders); } List<TChargingOrderAccountingStrategy> chargingOrderAccountingStrategies = data2.getChargingOrderAccountingStrategies(); if (!chargingOrderAccountingStrategies.isEmpty()) { chargingOrderAccountingStrategyService.saveBatch(chargingOrderAccountingStrategies); } List<TChargingOrderRefund> chargingOrderRefunds = data2.getChargingOrderRefunds(); if (!chargingOrderRefunds.isEmpty()) { chargingOrderRefundService.saveBatch(chargingOrderRefunds); } List<TExchangeOrder> exchangeOrders = data2.getExchangeOrders(); if (!exchangeOrders.isEmpty()) { exchangeOrderService.saveBatch(exchangeOrders); } List<TGrantVip> grantVips = data2.getGrantVips(); if (!grantVips.isEmpty()) { grantVipService.saveBatch(grantVips); } List<TOrderAppeal> orderAppeals = data2.getOrderAppeals(); if (!orderAppeals.isEmpty()) { orderAppealService.saveBatch(orderAppeals); } List<TOrderEvaluate> orderEvaluates = data2.getOrderEvaluates(); if (!orderEvaluates.isEmpty()) { orderEvaluateService.saveBatch(orderEvaluates); } List<TOrderEvaluateTag> orderEvaluateTags = data2.getOrderEvaluateTags(); if (!orderEvaluateTags.isEmpty()) { orderEvaluateTagService.saveBatch(orderEvaluateTags); } List<TOrderInvoice> orderInvoices = data2.getOrderInvoices(); if (!orderInvoices.isEmpty()) { orderInvoiceService.saveBatch(orderInvoices); } List<TOrderInvoiceDetail> orderInvoiceDetails = data2.getOrderInvoiceDetails(); if (!orderInvoiceDetails.isEmpty()) { orderInvoiceDetailService.saveBatch(orderInvoiceDetails); } List<TSettlementConfirm> settlementConfirms = data2.getSettlementConfirms(); if (!settlementConfirms.isEmpty()) { settlementConfirmService.saveBatch(settlementConfirms); } List<TShoppingOrder> shoppingOrders = data2.getShoppingOrders(); if (!shoppingOrders.isEmpty()) { shoppingOrderService.saveBatch(shoppingOrders); } List<TShoppingOrderRefund> shoppingOrderRefunds = data2.getShoppingOrderRefunds(); if (!shoppingOrderRefunds.isEmpty()) { shoppingOrderRefundService.saveBatch(shoppingOrderRefunds); } List<TVipOrder> vipOrders = data2.getVipOrders(); if (!vipOrders.isEmpty()) { vipOrderService.saveBatch(vipOrders); } List<TVipOrderRefund> vipOrderRefunds = data2.getVipOrderRefunds(); if (!vipOrderRefunds.isEmpty()) { vipOrderRefundService.saveBatch(vipOrderRefunds); } } // other服务 GovernmentCloudOtherVO data3 = jianGuanOtherClient.listAll().getData(); if (data3 != null) { List<Operator> operators = data3.getOperators(); if (!operators.isEmpty()) { try { operatorService.saveBatch(operators); }catch (Exception e){ } } List<TActivity> activities = data3.getActivities(); if (!activities.isEmpty()) { activityService.saveBatch(activities); } List<TAdvertising> advertisings = data3.getAdvertisings(); if (!advertisings.isEmpty()) { advertisingService.saveBatch(advertisings); } List<TCompany> companies = data3.getCompanies(); if (!companies.isEmpty()) { companyService.saveBatch(companies); } List<TCoupon> coupons = data3.getCoupons(); if (!coupons.isEmpty()) { couponService.saveBatch(coupons); } List<TEnterpriseUserApplication> enterpriseUserApplications = data3.getEnterpriseUserApplications(); if (!enterpriseUserApplications.isEmpty()) { enterpriseUserApplicationService.saveBatch(enterpriseUserApplications); } List<TEvaluationTag> evaluationTags = data3.getEvaluationTags(); if (!evaluationTags.isEmpty()) { evaluationTagService.saveBatch(evaluationTags); } List<TGoods> goods = data3.getGoods(); if (!goods.isEmpty()) { goodsService.saveBatch(goods); } List<THtml> htmls = data3.getHtmls(); if (!htmls.isEmpty()) { htmlService.saveBatch(htmls); } List<TIntegralRule> integralRules = data3.getIntegralRules(); if (!integralRules.isEmpty()) { integralRuleService.saveBatch(integralRules); } List<TInvoiceType> invoiceTypes = data3.getInvoiceTypes(); if (!invoiceTypes.isEmpty()) { invoiceTypeService.saveBatch(invoiceTypes); } List<TNotice> notices = data3.getNotices(); if (!notices.isEmpty()) { noticeService.saveBatch(notices); } List<TSystemConfiguration> systemConfigurations = data3.getSystemConfigurations(); if (!systemConfigurations.isEmpty()) { systemConfigurationService.saveBatch(systemConfigurations); } List<TUserTag> userTags = data3.getUserTags(); if (!userTags.isEmpty()) { userTagService.saveBatch(userTags); } List<TVip> vips = data3.getVips(); if (!vips.isEmpty()) { vipService.saveBatch(vips); } } // accountingStrategyDetailOrderService // accountingStrategyOrderService // genTableColumnService @@ -267,7 +613,6 @@ // vipService } } ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/GovernmentCloudOrderController.java
New file @@ -0,0 +1,118 @@ package com.ruoyi.order.controller; import com.ruoyi.chargingPile.api.model.*; import com.ruoyi.chargingPile.api.vo.GovernmentCloudChargingPileVO; import com.ruoyi.common.core.domain.R; import com.ruoyi.order.api.model.*; import com.ruoyi.order.api.vo.GovernmentCloudOrderVO; import com.ruoyi.order.service.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.time.LocalDateTime; import java.util.List; /** * <p> * 前端控制器 * </p> * * @author luodangjia * @since 2024-08-06 */ @RestController @RequestMapping("/governmentCloudOrder") public class GovernmentCloudOrderController { @Autowired private AccountingStrategyDetailOrderService accountingStrategyDetailOrderService; @Autowired private AccountingStrategyOrderService accountingStrategyOrderService; @Autowired private TChargingBillService chargingBillService; @Autowired private TChargingOrderAccountingStrategyService chargingOrderAccountingStrategyService; @Autowired private TChargingOrderRefundService chargingOrderRefundService; @Autowired private TChargingOrderService chargingOrderService; @Autowired private TExchangeOrderService exchangeOrderService; @Autowired private TGrantVipService grantVipService; @Autowired private TOrderAppealService orderAppealService; @Autowired private TOrderEvaluateService orderEvaluateService; @Autowired private TOrderEvaluateTagService orderEvaluateTagService; @Autowired private TOrderInvoiceDetailService orderInvoiceDetailService; @Autowired private TOrderInvoiceService orderInvoiceService; @Autowired private TSettlementConfirmService settlementConfirmService; @Autowired private TShoppingOrderRefundService shoppingOrderRefundService; @Autowired private TShoppingOrderService shoppingOrderService; @Autowired private TVipOrderRefundService vipOrderRefundService; @Autowired private TVipOrderService vipOrderService; /** * 政务云查询数据接口 * @return */ @PostMapping("/listAll") R<GovernmentCloudOrderVO> listAll() { LocalDateTime end = LocalDateTime.now(); LocalDateTime start = LocalDateTime.now().minusDays(1); GovernmentCloudOrderVO governmentCloudAccountVO = new GovernmentCloudOrderVO(); List<AccountingStrategyDetailOrder> list1 = accountingStrategyDetailOrderService.lambdaQuery().between(AccountingStrategyDetailOrder::getCreateTime, start, end).list(); List<AccountingStrategyOrder> list2 = accountingStrategyOrderService.lambdaQuery().between(AccountingStrategyOrder::getCreateTime, start, end).list(); List<TChargingBill> list3 = chargingBillService.lambdaQuery().between(TChargingBill::getCreateTime, start, end).list(); List<TChargingOrderAccountingStrategy> list4 = chargingOrderAccountingStrategyService.lambdaQuery().between(TChargingOrderAccountingStrategy::getCreateTime, start, end).list(); List<TChargingOrderRefund> list5 = chargingOrderRefundService.lambdaQuery().between(TChargingOrderRefund::getCreateTime, start, end).list(); List<TChargingOrder> list6 = chargingOrderService.lambdaQuery().between(TChargingOrder::getCreateTime, start, end).list(); List<TExchangeOrder> list7 = exchangeOrderService.lambdaQuery().between(TExchangeOrder::getCreateTime, start, end).list(); List<TGrantVip> list8 = grantVipService.lambdaQuery().between(TGrantVip::getCreateTime, start, end).list(); List<TOrderAppeal> list9 = orderAppealService.lambdaQuery().between(TOrderAppeal::getCreateTime, start, end).list(); List<TOrderEvaluate> list10 = orderEvaluateService.lambdaQuery().between(TOrderEvaluate::getCreateTime, start, end).list(); List<TOrderEvaluateTag> list11 = orderEvaluateTagService.lambdaQuery().between(TOrderEvaluateTag::getCreateTime, start, end).list(); List<TOrderInvoiceDetail> list12 = orderInvoiceDetailService.lambdaQuery().between(TOrderInvoiceDetail::getCreateTime, start, end).list(); List<TOrderInvoice> list13 = orderInvoiceService.lambdaQuery().between(TOrderInvoice::getCreateTime, start, end).list(); List<TSettlementConfirm> list14 = settlementConfirmService.lambdaQuery().between(TSettlementConfirm::getCreateTime, start, end).list(); List<TShoppingOrderRefund> list15 = shoppingOrderRefundService.lambdaQuery().between(TShoppingOrderRefund::getCreateTime, start, end).list(); List<TVipOrderRefund> list16 = vipOrderRefundService.lambdaQuery().between(TVipOrderRefund::getCreateTime, start, end).list(); List<TVipOrder> list17 = vipOrderService.lambdaQuery().between(TVipOrder::getCreateTime, start, end).list(); List<TShoppingOrder> list18 = shoppingOrderService.lambdaQuery().between(TShoppingOrder::getCreateTime, start, end).list(); governmentCloudAccountVO.setAccountingStrategyDetailOrders(list1); governmentCloudAccountVO.setAccountingStrategyOrders(list2); governmentCloudAccountVO.setChargingBills(list3); governmentCloudAccountVO.setChargingOrderAccountingStrategies(list4); governmentCloudAccountVO.setChargingOrderRefunds(list5); governmentCloudAccountVO.setChargingOrders(list6); governmentCloudAccountVO.setExchangeOrders(list7); governmentCloudAccountVO.setGrantVips(list8); governmentCloudAccountVO.setOrderAppeals(list9); governmentCloudAccountVO.setOrderEvaluates(list10); governmentCloudAccountVO.setOrderEvaluateTags(list11); governmentCloudAccountVO.setOrderInvoiceDetails(list12); governmentCloudAccountVO.setOrderInvoices(list13); governmentCloudAccountVO.setSettlementConfirms(list14); governmentCloudAccountVO.setShoppingOrderRefunds(list15); governmentCloudAccountVO.setShoppingOrders(list18); governmentCloudAccountVO.setVipOrders(list17); governmentCloudAccountVO.setVipOrderRefunds(list16); return R.ok(governmentCloudAccountVO); } } ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GovernmentCloudOtherController.java
New file @@ -0,0 +1,115 @@ package com.ruoyi.other.controller; import com.ruoyi.common.core.domain.R; import com.ruoyi.order.api.model.*; import com.ruoyi.order.api.vo.GovernmentCloudOrderVO; import com.ruoyi.other.api.domain.*; import com.ruoyi.other.api.vo.GovernmentCloudOtherVO; import com.ruoyi.other.service.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.time.LocalDateTime; import java.util.List; /** * <p> * 前端控制器 * </p> * * @author luodangjia * @since 2024-08-06 */ @RestController @RequestMapping("/governmentCloudOther") public class GovernmentCloudOtherController { @Autowired private OperatorService operatorService; @Autowired private TActivityService activityService; @Autowired private TAdvertisingService advertisingService; @Autowired private TCompanyService companyService; @Autowired private TCouponService couponService; @Autowired private TEnterpriseUserApplicationService enterpriseUserApplicationService; @Autowired private TEvaluationTagService evaluationTagService; @Autowired private TGoodsService goodsService; @Autowired private THtmlService htmlService; @Autowired private TIntegralRuleService integralRuleService; @Autowired private TInvoiceTypeService invoiceTypeService; @Autowired private TNoticeService noticeService; @Autowired private TRoleSiteService roleSiteService; @Autowired private TSystemConfigurationService systemConfigurationService; @Autowired private TUserSiteService userSiteService; @Autowired private TUserTagService userTagService; @Autowired private TVipService vipService; /** * 政务云查询数据接口 * @return */ @PostMapping("/listAll") R<GovernmentCloudOtherVO> listAll() { LocalDateTime end = LocalDateTime.now(); LocalDateTime start = LocalDateTime.now().minusDays(1); GovernmentCloudOtherVO governmentCloudAccountVO = new GovernmentCloudOtherVO(); // List<Operator> list1 = operatorService.lambdaQuery().between(Operator::getCreateTime, start, end).list(); // List<TActivity> list2 = activityService.lambdaQuery().between(TActivity::getCreateTime, start, end).list(); // List<TAdvertising> list3 = advertisingService.lambdaQuery().between(TAdvertising::getCreateTime, start, end).list(); // List<TCompany> list4 = companyService.lambdaQuery().between(TCompany::getCreateTime, start, end).list(); // List<TCoupon> list5 = couponService.lambdaQuery().between(TCoupon::getCreateTime, start, end).list(); // List<TEnterpriseUserApplication> list6 = enterpriseUserApplicationService.lambdaQuery().between(TEnterpriseUserApplication::getCreateTime, start, end).list(); // List<TEvaluationTag> list7 = evaluationTagService.lambdaQuery().between(TEvaluationTag::getCreateTime, start, end).list(); // List<TGoods> list8 = goodsService.lambdaQuery().between(TGoods::getCreateTime, start, end).list(); // List<THtml> list9 = htmlService.lambdaQuery().between(THtml::getCreateTime, start, end).list(); // List<TIntegralRule> list10 = integralRuleService.lambdaQuery().between(TIntegralRule::getCreateTime, start, end).list(); // List<TInvoiceType> list11 = invoiceTypeService.lambdaQuery().between(TInvoiceType::getCreateTime, start, end).list(); // List<TNotice> list12 = noticeService.lambdaQuery().between(TNotice::getCreateTime, start, end).list(); //// List<TRoleSite> list13 = roleSiteService.lambdaQuery().between(TRoleSite::getCreateTime, start, end).list(); // List<TSystemConfiguration> list14 = systemConfigurationService.lambdaQuery().between(TSystemConfiguration::getCreateTime, start, end).list(); //// List<TUserSite> list15 = userSiteService.lambdaQuery().between(TUserSite::getCreateTime, start, end).list(); // List<TUserTag> list16 = userTagService.lambdaQuery().between(TUserTag::getCreateTime, start, end).list(); // List<TVip> list17 = vipService.lambdaQuery().between(TVip::getCreateTime, start, end).list(); // governmentCloudAccountVO.setOperators(list1); // governmentCloudAccountVO.setActivities(list2); // governmentCloudAccountVO.setAdvertisings(list3); // governmentCloudAccountVO.setCompanies(list4); // governmentCloudAccountVO.setCoupons(list5); // governmentCloudAccountVO.setEnterpriseUserApplications(list6); // governmentCloudAccountVO.setEvaluationTags(list7); // governmentCloudAccountVO.setGoods(list8); // governmentCloudAccountVO.setHtmls(list9); // governmentCloudAccountVO.setIntegralRules(list10); // governmentCloudAccountVO.setInvoiceTypes(list11); // governmentCloudAccountVO.setNotices(list12); // governmentCloudAccountVO.setSystemConfigurations(list14); // governmentCloudAccountVO.setUserTags(list16); // governmentCloudAccountVO.setVips(list17); return R.ok(governmentCloudAccountVO); } }