From d95c4537ad861e25f4371fc62feb16122dc4ac2d Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 17 五月 2024 09:03:20 +0800
Subject: [PATCH] 代码提交
---
ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/model/TGoodsVO.java | 143 ------------
ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java | 7
ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TSysSetController.java | 17
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TIntegralRecordServiceImpl.java | 23 ++
ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/feignClient/GoodsClient.java | 2
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/ITIntegralRecordService.java | 17 +
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/mapper/TIntegralRecordMapper.java | 17 +
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/TPage.java | 71 ++++++
/dev/null | 21 -
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TSubjectController.java | 2
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java | 30 ++
ruoyi-api/ruoyi-api-management/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports | 9
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/factory/TManagementFallbackFactory.java | 34 +++
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/feignClient/ManagementClient.java | 21 +
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TIntegralRecord.java | 43 +++
ruoyi-service/ruoyi-study/src/main/resources/mapper/sutdy/TIntegralRecordMapper.xml | 7
ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/vo/TGoodsVO.java | 140 ------------
17 files changed, 281 insertions(+), 323 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/feignClient/GoodsClient.java b/ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/feignClient/GoodsClient.java
index cef6665..53a5168 100644
--- a/ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/feignClient/GoodsClient.java
+++ b/ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/feignClient/GoodsClient.java
@@ -26,7 +26,7 @@
@PostMapping("/base/goods/deleteGoodsType/{id}")
R deleteGoodsType(@PathVariable("id") Integer id);
- @GetMapping("/base/goods/listAll")
+ @PostMapping("/base/goods/listAll")
R<PageInfo<TGoods>> listAll(@RequestBody GoodsTypeQuery query);
@PostMapping("/base/goods/addGoods")
R addGoods(@RequestBody TGoods dto);
diff --git a/ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/model/TGoodsVO.java b/ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/model/TGoodsVO.java
index 9285f64..374fdf5 100644
--- a/ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/model/TGoodsVO.java
+++ b/ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/model/TGoodsVO.java
@@ -36,7 +36,7 @@
* 所需积分
*/
@ApiModelProperty(value = "所需积分")
- private String integral;
+ private Integer integral;
/**
* 商品原价
*/
@@ -61,7 +61,10 @@
* 商品类型id
*/
@ApiModelProperty(value = "商品类型id")
- private Integer typeId;
+ private String typeIds;
+
+ @ApiModelProperty(value = "基础已兑换数量")
+ private Integer basicCount;
/**
* 商品封面图
*/
@@ -94,140 +97,4 @@
private Integer type;
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getintegral() {
- return
-integral;
- }
-
- public void setintegral(String
-integral) {
- this.
-integral =
-integral;
- }
-
- public BigDecimal getPrice() {
- return price;
- }
-
- public void setPrice(BigDecimal price) {
- this.price = price;
- }
-
- public Integer getTotal() {
- return total;
- }
-
- public void setTotal(Integer total) {
- this.total = total;
- }
-
- public Integer getSurplus() {
- return surplus;
- }
-
- public void setSurplus(Integer surplus) {
- this.surplus = surplus;
- }
-
- public Integer getUserCount() {
- return userCount;
- }
-
- public void setUserCount(Integer userCount) {
- this.userCount = userCount;
- }
-
- public Integer getTypeId() {
- return typeId;
- }
-
- public void setTypeId(Integer typeId) {
- this.typeId = typeId;
- }
-
- public String getCoverImg() {
- return coverImg;
- }
-
- public void setCoverImg(String coverImg) {
- this.coverImg = coverImg;
- }
-
- public String getDetailImg() {
- return detailImg;
- }
-
- public void setDetailImg(String detailImg) {
- this.detailImg = detailImg;
- }
-
- public String getDetail() {
- return detail;
- }
-
- public void setDetail(String detail) {
- this.detail = detail;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public Integer getIsDelete() {
- return isDelete;
- }
-
- public void setIsDelete(Integer isDelete) {
- this.isDelete = isDelete;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- @Override
- public String toString() {
- return "TGoods{" +
- ", id=" + id +
- ", name=" + name +
- ", integral=" +
-integral +
- ", price=" + price +
- ", total=" + total +
- ", surplus=" + surplus +
- ", userCount=" + userCount +
- ", typeId=" + typeId +
- ", coverImg=" + coverImg +
- ", detailImg=" + detailImg +
- ", detail=" + detail +
- ", insertTime=" + insertTime +
- ", isDelete=" + isDelete +
- ", type=" + type +
- "}";
- }
}
diff --git a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/factory/TApproveConfigFallbackFactory.java b/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/factory/TApproveConfigFallbackFactory.java
deleted file mode 100644
index ca21e83..0000000
--- a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/factory/TApproveConfigFallbackFactory.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.ruoyi.management.api.factory;
-
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.management.api.feignClient.TApproveConfigClient;
-import com.ruoyi.management.api.vo.ApproveConfigClientVO;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * 门店服务降级处理
- *
- * @author ruoyi
- */
-@Component
-public class TApproveConfigFallbackFactory implements FallbackFactory<TApproveConfigClient>
-{
- private static final Logger log = LoggerFactory.getLogger(TApproveConfigFallbackFactory.class);
-
- @Override
- public TApproveConfigClient create(Throwable throwable)
- {
- log.error("审批服务调用失败:{}", throwable.getMessage());
- return new TApproveConfigClient()
- {
- @Override
- public R<Boolean> add(Integer companyId) {
- return R.fail("默认添加审批流配置失败:" + throwable.getMessage());
- }
-
- @Override
- public R<List<ApproveConfigClientVO>> queryConfigByCompanyId(Integer companyId) {
- return R.fail("查询公司审批流配置通过公司id失败:" + throwable.getMessage());
- }
- };
- }
-}
diff --git a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/factory/TCompanyRepairShopFallbackFactory.java b/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/factory/TCompanyRepairShopFallbackFactory.java
deleted file mode 100644
index d08af5e..0000000
--- a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/factory/TCompanyRepairShopFallbackFactory.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.ruoyi.management.api.factory;
-
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.management.api.feignClient.TCompanyRepairShopClient;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * 门店服务降级处理
- */
-@Component
-public class TCompanyRepairShopFallbackFactory implements FallbackFactory<TCompanyRepairShopClient>
-{
- private static final Logger log = LoggerFactory.getLogger(TCompanyRepairShopFallbackFactory.class);
- @Override
- public TCompanyRepairShopClient create(Throwable cause) {
- log.error("门店服务调用失败:{}", cause.getMessage());
- return new TCompanyRepairShopClient(){
- @Override
- public R<List<Integer>> companyQueryRepairShopList(Long id) {
- return R.fail("通过公司id查询修理厂id集合失败" + cause.getMessage());
- }
- };
-
- }
-}
diff --git a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/factory/TCompanyShopFallbackFactory.java b/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/factory/TCompanyShopFallbackFactory.java
deleted file mode 100644
index 8d4b65d..0000000
--- a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/factory/TCompanyShopFallbackFactory.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package com.ruoyi.management.api.factory;
-
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.management.api.feignClient.TCompanyShopClient;
-import com.ruoyi.management.api.model.CompanyShopNameAndIdQuery;
-import com.ruoyi.management.api.model.TCompany;
-import com.ruoyi.management.api.model.TCompanyShop;
-import com.ruoyi.management.api.query.ShopByShopNameAndCompanyNameQuery;
-import com.ruoyi.management.api.vo.TCompanyShopElectronicClientVO;
-import com.ruoyi.management.api.vo.TRepairShopByNameVO;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * 门店服务降级处理
- *
- * @author ruoyi
- */
-@Component
-public class TCompanyShopFallbackFactory implements FallbackFactory<TCompanyShopClient>
-{
- private static final Logger log = LoggerFactory.getLogger(TCompanyShopFallbackFactory.class);
-
- @Override
- public TCompanyShopClient create(Throwable throwable)
- {
- log.error("门店服务调用失败:{}", throwable.getMessage());
- return new TCompanyShopClient()
- {
- @Override
- public R<List<TCompanyShop>> queryShopByShopId(List<Integer> shopIds)
- {
- return R.fail("通过门店id集合获取门店集合失败:" + throwable.getMessage());
- }
-
- @Override
- public R<TCompanyShop> getInfo(Integer id) {
- return R.fail("获取门店详情失败:" + throwable.getMessage());
- }
-
- @Override
- public R<TCompanyShop> queryShopByShopName(String shopName) {
- return R.fail("通过门店名称获取门店失败:" + throwable.getMessage());
- }
-
- @Override
- public R<TCompany> queryCompanyByCompanyName(String companyName) {
- return R.fail("通过门店名称获取公司失败:" + throwable.getMessage());
- }
-
- @Override
- public R<TCompanyShop> queryShopByShopNameOne(CompanyShopNameAndIdQuery query) {
- return R.fail("通过门店名称获取门店失败:" + throwable.getMessage());
- }
-
- @Override
- public R<List<TCompanyShopElectronicClientVO>> queryElectronic(Integer shopId) {
- return R.fail("通过门店id获取门店电子围栏信息失败:" + throwable.getMessage());
- }
-
- @Override
- public R<List<TCompanyShop>> queryShopByCompany(Integer companyId) {
- return R.fail("通过公司id查询门店失败:" + throwable.getMessage());
- }
-
- @Override
- public R<TCompany> queryCompanyByCompany(Integer companyId) {
- return R.fail("通过公司id查询公司失败:" + throwable.getMessage());
- }
-
- @Override
- public R<TCompanyShop> queryShopByShopNameAndCompanyName(ShopByShopNameAndCompanyNameQuery query) {
- return R.fail("通过门店名称和公司名称查询门店失败:" + throwable.getMessage());
- }
-
- @Override
- public R<TCompanyShop> queryShopById(Integer id) {
- return R.fail("通过门店id查询门店失败:" + throwable.getMessage());
- }
-
- @Override
- public R<List<TRepairShopByNameVO>> queryRepairShopByName(String repairShopName) {
- return R.fail("通过修理厂名称查询修理厂失败:" + throwable.getMessage());
- }
-
- @Override
- public R<List<TRepairShopByNameVO>> queryRepairShopAll() {
- return R.fail("查询所有修理厂失败:" + throwable.getMessage());
- }
-
- @Override
- public R<List<TRepairShopByNameVO>> queryRepairShopByCompanyId(Integer companyId) {
- return R.fail("通过公司id查询修理厂失败:" + throwable.getMessage());
- }
-
- @Override
- public R<TCompany> queryCompanyByCompanyId(Integer companyId) {
- return R.fail("通过公司id查询公司失败:" + throwable.getMessage());
- }
- };
- }
-}
diff --git a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/factory/TCompanyShopToUserFallbackFactory.java b/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/factory/TCompanyShopToUserFallbackFactory.java
deleted file mode 100644
index ca198e6..0000000
--- a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/factory/TCompanyShopToUserFallbackFactory.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.ruoyi.management.api.factory;
-
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.management.api.feignClient.TCompanyShopClient;
-import com.ruoyi.management.api.feignClient.TCompanyShopToUserClient;
-import com.ruoyi.management.api.model.AddUserShopClientDto;
-import com.ruoyi.management.api.model.TCompanyShop;
-import com.ruoyi.management.api.model.TCompanyShopToUser;
-import com.ruoyi.management.api.model.TCompanyToUser;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * 门店服务降级处理
- *
- * @author ruoyi
- */
-@Component
-public class TCompanyShopToUserFallbackFactory implements FallbackFactory<TCompanyShopToUserClient>
-{
- private static final Logger log = LoggerFactory.getLogger(TCompanyShopToUserFallbackFactory.class);
-
- @Override
- public TCompanyShopToUserClient create(Throwable throwable)
- {
- log.error("门店用户关系服务调用失败:{}", throwable.getMessage());
- return new TCompanyShopToUserClient()
- {
- @Override
- public R<List<TCompanyShopToUser>> getCompanyToUser(Long companyId) {
- return R.fail("获取门店用户关系失败:" + throwable.getMessage());
- }
-
- @Override
- public R<Boolean> addUserShop(AddUserShopClientDto addUserShopClientDto) {
- return R.fail("添加门店账户失败:" + throwable.getMessage());
- }
-
- @Override
- public R<List<Integer>> getShopIdsFromUserId(Long userId) {
- return R.fail("根据用户id获取门店id失败:" + throwable.getMessage());
- }
-
- @Override
- public R<Boolean> updateUserShop(AddUserShopClientDto addUserShopClientDto) {
- return R.fail("更新门店账户失败:" + throwable.getMessage());
- }
-
- @Override
- public R<List<TCompanyToUser>> getCompanyToUserFromCompanyId(Long companyId) {
- return R.fail("通过公司id查询公司账户失败:" + throwable.getMessage());
- }
-
- @Override
- public R<Boolean> addUserCompany(AddUserShopClientDto addUserShopClientDto) {
- return R.fail("添加公司账户中间表失败:" + throwable.getMessage());
- }
-
- @Override
- public R<String> getRepairNameFromId(Integer repairShopId) {
- return R.fail("通过修理厂id查询修理厂失败:" + throwable.getMessage());
- }
-
- };
- }
-}
diff --git a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/factory/TCompanyToUserFallbackFactory.java b/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/factory/TCompanyToUserFallbackFactory.java
deleted file mode 100644
index 988aae6..0000000
--- a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/factory/TCompanyToUserFallbackFactory.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.ruoyi.management.api.factory;
-
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.management.api.feignClient.TCompanyToUserClient;
-import com.ruoyi.management.api.feignClient.TRepairShopClient;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-@Component
-public class TCompanyToUserFallbackFactory implements FallbackFactory<TCompanyToUserClient> {
- private static final Logger log = LoggerFactory.getLogger(TCompanyToUserFallbackFactory.class);
-
-
- @Override
- public TCompanyToUserClient create(Throwable cause) {
- return new TCompanyToUserClient() {
- @Override
- public R<Integer> queryCompanyIdByUserId(Long id) {
- return R.fail("通过用户ID查询公司ID失败" + cause.getMessage());
- }
-
- @Override
- public R<List<Integer>> queryUserIdByCompanyId(Integer companyId) {
- return R.fail("通过公司id查询用户id失败" + cause.getMessage());
- }
- };
- }
-}
diff --git a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/factory/TManagementFallbackFactory.java b/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/factory/TManagementFallbackFactory.java
new file mode 100644
index 0000000..8ac3df0
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/factory/TManagementFallbackFactory.java
@@ -0,0 +1,34 @@
+package com.ruoyi.management.api.factory;
+
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.management.api.feignClient.ManagementClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 门店服务降级处理
+ *
+ * @author ruoyi
+ */
+@Component
+public class TManagementFallbackFactory implements FallbackFactory<ManagementClient>
+{
+ private static final Logger log = LoggerFactory.getLogger(TManagementFallbackFactory.class);
+
+ @Override
+ public ManagementClient create(Throwable cause)
+ {
+ return new ManagementClient() {
+ @Override
+ public R getPage1() {
+ return R.fail("获取注意事项失败"+cause.getMessage());
+ }
+ };
+ }
+}
diff --git a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/factory/TRepairShopFallbackFactory.java b/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/factory/TRepairShopFallbackFactory.java
deleted file mode 100644
index 915fc1a..0000000
--- a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/factory/TRepairShopFallbackFactory.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.ruoyi.management.api.factory;
-
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.management.api.feignClient.TRepairShopClient;
-import com.ruoyi.management.api.vo.TRepairShopClientVO;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-@Component
-public class TRepairShopFallbackFactory implements FallbackFactory<TRepairShopClient> {
- private static final Logger log = LoggerFactory.getLogger(TRepairShopFallbackFactory.class);
-
- @Override
- public TRepairShopClient create(Throwable cause) {
- return new TRepairShopClient() {
- @Override
- public R<String> getRepairById(Integer id) {
- return R.fail("通过id获取修理厂获取详细信息失败:" + cause.getMessage());
- }
-
- @Override
- public R<List<TRepairShopClientVO>> getRepairByCompanyId(Integer id) {
- return R.fail("通过公司id获取修理厂列表失败:" + cause.getMessage());
- }
- };
- }
-}
diff --git a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/factory/TRepairShopToUserFallbackFactory.java b/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/factory/TRepairShopToUserFallbackFactory.java
deleted file mode 100644
index eaf65bb..0000000
--- a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/factory/TRepairShopToUserFallbackFactory.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.ruoyi.management.api.factory;
-
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.management.api.feignClient.TCompanyRepairShopClient;
-import com.ruoyi.management.api.feignClient.TRepairShopToUserClient;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-@Component
-public class TRepairShopToUserFallbackFactory implements FallbackFactory<TRepairShopToUserClient> {
- private static final Logger log = LoggerFactory.getLogger(TRepairShopToUserFallbackFactory.class);
-
-
- @Override
- public TRepairShopToUserClient create(Throwable cause) {
- log.error("门店服务调用失败:{}", cause.getMessage());
- return new TRepairShopToUserClient(){
- @Override
- public R<Integer> selectByUserId(Long userId) {
- return R.fail("通过userId获取修理厂id失败:" + cause.getMessage());
- }
- };
- }
-}
diff --git a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/factory/ViolationShopFallbackFactory.java b/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/factory/ViolationShopFallbackFactory.java
deleted file mode 100644
index b67f601..0000000
--- a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/factory/ViolationShopFallbackFactory.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.ruoyi.management.api.factory;
-
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.web.page.PageInfo;
-import com.ruoyi.management.api.feignClient.TCompanyShopClient;
-import com.ruoyi.management.api.feignClient.ViolationClient;
-import com.ruoyi.management.api.model.*;
-import com.ruoyi.management.api.query.CarInfoQuery;
-import com.ruoyi.management.api.query.VehicleViolationCountQuery;
-import com.ruoyi.management.api.query.ViolationByCarIdAndTimeQuery;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * 门店服务降级处理
- *
- * @author ruoyi
- */
-@Component
-public class ViolationShopFallbackFactory implements FallbackFactory<ViolationClient>
-{
- private static final Logger log = LoggerFactory.getLogger(ViolationShopFallbackFactory.class);
-
- @Override
- public ViolationClient create(Throwable throwable)
- {
- return new ViolationClient()
- {
- @Override
- public R<Integer> index(List<Integer> ids) {
- return R.fail("违章管理调用失败" + throwable.getMessage());
- }
-
- @Override
- public R<Integer> isViolation(Integer id) {
- return R.fail("违章管理调用失败" + throwable.getMessage());
- }
-
- @Override
- public R<PageInfo<TViolationManageInfo>> carInfoRecord(CarInfoRecordQuery query) {
- return R.fail("违章管理调用失败" + throwable.getMessage());
- }
-
- @Override
- public R<List<TViolationManage>> queryViolationByCarId(Integer carId) {
- return R.fail("通过车辆id查询车辆的违章数据失败" + throwable.getMessage());
- }
-
- @Override
- public R<TSystemConfig> querySystemConfigByType(CarInfoQuery query) {
- return R.fail("通过类型查询系统规则配置失败" + throwable.getMessage());
- }
-
- @Override
- public R<Integer> vehicleViolation(VehicleViolationCountQuery violationCountQuery) {
- return R.fail("查询车辆违章数量失败" + throwable.getMessage());
- }
-
- @Override
- public R<List<TViolationManage>> queryViolationByCarIdAndTime(ViolationByCarIdAndTimeQuery query) {
- return R.fail("通过车辆id和开始结束时间查询车辆的违章数据失败" + throwable.getMessage());
- }
- };
- }
-}
diff --git a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/feignClient/ManagementClient.java b/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/feignClient/ManagementClient.java
new file mode 100644
index 0000000..09dbab5
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/feignClient/ManagementClient.java
@@ -0,0 +1,21 @@
+package com.ruoyi.management.api.feignClient;
+
+import com.ruoyi.common.core.constant.ServiceNameConstants;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.management.api.factory.TManagementFallbackFactory;
+import com.ruoyi.management.api.model.TPage;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+
+@FeignClient(contextId = "managementClient", value = ServiceNameConstants.MANAGEMENT_SERVICE, fallbackFactory = TManagementFallbackFactory.class)
+public interface ManagementClient {
+
+ @PostMapping(value = "/tSysSet/getPage1")
+ R<List<TPage>> getPage1();
+
+}
diff --git a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/feignClient/TApproveConfigClient.java b/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/feignClient/TApproveConfigClient.java
deleted file mode 100644
index 7fdfa27..0000000
--- a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/feignClient/TApproveConfigClient.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.ruoyi.management.api.feignClient;
-
-import com.ruoyi.common.core.constant.ServiceNameConstants;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.management.api.factory.TApproveConfigFallbackFactory;
-import com.ruoyi.management.api.factory.TCompanyShopFallbackFactory;
-import com.ruoyi.management.api.model.CompanyShopNameAndIdQuery;
-import com.ruoyi.management.api.model.TCompany;
-import com.ruoyi.management.api.model.TCompanyShop;
-import com.ruoyi.management.api.vo.ApproveConfigClientVO;
-import com.ruoyi.management.api.vo.TCompanyShopElectronicClientVO;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
-
-/**
- * 门店服务
- *
- * @author ruoyi
- */
-@FeignClient(contextId = "tApproveConfigClient", value = ServiceNameConstants.MANAGEMENT_SERVICE, fallbackFactory = TApproveConfigFallbackFactory.class)
-public interface TApproveConfigClient
-{
- /**
- * 默认添加审批流配置
- *
- * @param companyId 公司id
- * @return 结果
- */
- @PostMapping("/approveConfig/add/{companyId}")
- public R<Boolean> add(@PathVariable("companyId") Integer companyId);
-
- /**
- * 查询公司审批流配置通过公司id
- *
- * @param companyId 公司id
- * @return 结果
- */
- @GetMapping("/approveConfig/queryConfigByCompanyId/{companyId}")
- public R<List<ApproveConfigClientVO>> queryConfigByCompanyId(@PathVariable("companyId") Integer companyId);
-
-}
diff --git a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/feignClient/TCompanyRepairShopClient.java b/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/feignClient/TCompanyRepairShopClient.java
deleted file mode 100644
index bec8a6c..0000000
--- a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/feignClient/TCompanyRepairShopClient.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.ruoyi.management.api.feignClient;
-
-
-import com.ruoyi.common.core.constant.ServiceNameConstants;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.management.api.factory.TCompanyRepairShopFallbackFactory;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-
-import java.util.List;
-
-/**
- * 门店服务
- */
-@FeignClient(contextId = "tCompanyRepairShopClient", value = ServiceNameConstants.MANAGEMENT_SERVICE, fallbackFactory = TCompanyRepairShopFallbackFactory.class)
-public interface TCompanyRepairShopClient {
- /**
- * 通过公司id查询修理厂id集合
- * @param id
- * @return
- */
- @PostMapping("/repairShop/companyQueryRepairShopList/{id}")
- R<List<Integer>> companyQueryRepairShopList(@PathVariable("id") Long id);
-}
diff --git a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/feignClient/TCompanyShopClient.java b/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/feignClient/TCompanyShopClient.java
deleted file mode 100644
index b3e58e7..0000000
--- a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/feignClient/TCompanyShopClient.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package com.ruoyi.management.api.feignClient;
-
-import com.ruoyi.common.core.constant.ServiceNameConstants;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.management.api.factory.TCompanyShopFallbackFactory;
-import com.ruoyi.management.api.model.CompanyShopNameAndIdQuery;
-import com.ruoyi.management.api.model.TCompany;
-import com.ruoyi.management.api.model.TCompanyShop;
-import com.ruoyi.management.api.model.TCompanyShopToUser;
-import com.ruoyi.management.api.query.ShopByShopNameAndCompanyNameQuery;
-import com.ruoyi.management.api.vo.TCompanyShopElectronicClientVO;
-import com.ruoyi.management.api.vo.TRepairShopByNameVO;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
-
-/**
- * 门店服务
- *
- * @author ruoyi
- */
-@FeignClient(contextId = "tCompanyShopClient", value = ServiceNameConstants.MANAGEMENT_SERVICE, fallbackFactory = TCompanyShopFallbackFactory.class)
-public interface TCompanyShopClient
-{
- /**
- * 通过门店id集合查询门店
- *
- * @param shopIds 门店id集合
- * @return 结果
- */
- @PostMapping("/companyShop/queryShopByShopId")
- public R<List<TCompanyShop>> queryShopByShopId(@RequestBody List<Integer> shopIds);
-
- /**
- * 通过门店id查询门店
- *
- * @param id 门店id
- * @return 结果
- */
- @GetMapping(value = "/companyShop/{id}")
- public R<TCompanyShop> getInfo(@PathVariable("id") Integer id);
-
- /**
- * 通过门店名称查询门店
- *
- * @param shopName 门店名称
- * @return 结果
- */
- @PostMapping(value = "/companyShop/queryShopByShopName")
- public R<TCompanyShop> queryShopByShopName(@RequestBody String shopName);
-
- /**
- * 通过公司名称查询公司
- * @param companyName
- * @return
- */
- @PostMapping(value = "/companyShop/queryCompanyByCompanyName")
- R<TCompany> queryCompanyByCompanyName(String companyName);
-
- /**
- * 通过门店名称获取门店
- * @param query
- * @return
- */
- @PostMapping(value = "/companyShop/queryShopByShopNameOne")
- R<TCompanyShop> queryShopByShopNameOne(@RequestBody CompanyShopNameAndIdQuery query);
-
- /**
- * 通过门店id获取门店电子围栏信息
- * @param shopId
- * @return
- */
- @GetMapping(value = "/companyShop/queryElectronic/{shopId}")
- R<List<TCompanyShopElectronicClientVO>> queryElectronic(@PathVariable("shopId") Integer shopId);
-
- /**
- * 通过公司id查询门店
- *
- * @param companyId 公司id
- * @return 结果
- */
- @PostMapping("/companyShop/queryShopByCompany/{companyId}")
- R<List<TCompanyShop>> queryShopByCompany(@PathVariable("companyId") Integer companyId);
-
-
- /**
- * 通过公司id查询公司
- *
- * @param companyId 公司id
- * @return 结果
- */
- @PostMapping("/companyShop/queryCompanyByCompany/{companyId}")
- R<TCompany> queryCompanyByCompany(@PathVariable("companyId") Integer companyId);
-
-
- /**
- * 通过门店名称和公司名称查询门店
- *
- * @param query
- * @return 结果
- */
- @PostMapping(value = "/companyShop/queryShopByShopNameAndCompanyName")
- R<TCompanyShop> queryShopByShopNameAndCompanyName(@RequestBody ShopByShopNameAndCompanyNameQuery query);
-
- /**
- * 通过门店id查询门店
- *
- * @param id 门店id
- * @return 结果
- */
- @GetMapping(value = "/companyShop/queryShopById/{id}")
- R<TCompanyShop> queryShopById(@PathVariable("id") Integer id);
-
- /**
- * 通过修理厂名称查询修理厂
- *
- * @param repairShopName 修理厂名称
- * @return 结果
- */
- @PostMapping(value = "/companyShop/queryRepairShopByName")
- R<List<TRepairShopByNameVO>> queryRepairShopByName(@RequestBody String repairShopName);
-
- /**
- * 查询所有修理厂
- *
- * @return 结果
- */
- @PostMapping(value = "/companyShop/queryRepairShopAll")
- R<List<TRepairShopByNameVO>> queryRepairShopAll();
-
- /**
- * 通过修理厂名称查询修理厂
- *
- * @param companyId
- * @return 结果
- */
- @GetMapping(value = "/companyShop/queryRepairShopByCompanyId/{companyId}")
- R<List<TRepairShopByNameVO>> queryRepairShopByCompanyId(@PathVariable("companyId") Integer companyId);
-
-
- /**
- * 通过公司id查询公司
- */
- @GetMapping("/companyShop/queryCompanyByCompanyId/{companyId}")
- R<TCompany> queryCompanyByCompanyId(@PathVariable("companyId") Integer companyId);
-}
diff --git a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/feignClient/TCompanyShopToUserClient.java b/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/feignClient/TCompanyShopToUserClient.java
deleted file mode 100644
index 103b2d5..0000000
--- a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/feignClient/TCompanyShopToUserClient.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.ruoyi.management.api.feignClient;
-
-import com.ruoyi.common.core.constant.ServiceNameConstants;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.management.api.factory.TCompanyShopFallbackFactory;
-import com.ruoyi.management.api.model.AddUserShopClientDto;
-import com.ruoyi.management.api.model.TCompanyShopToUser;
-import com.ruoyi.management.api.model.TCompanyToUser;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
-
-/**
- * 门店服务
- *
- * @author ruoyi
- */
-@FeignClient(contextId = "tCompanyShopToUserClient", value = ServiceNameConstants.MANAGEMENT_SERVICE, fallbackFactory = TCompanyShopFallbackFactory.class)
-public interface TCompanyShopToUserClient {
-
- /**
- * 通过公司id获取门店的中间表集合
- *
- * @param companyId
- * @return
- */
- @PostMapping(value = "/companyShopToUser/getCompanyToUser")
- R<List<TCompanyShopToUser>> getCompanyToUser(@RequestBody Long companyId);
-
- @PostMapping(value = "/companyShopToUser/addUserShop")
- R<Boolean> addUserShop(@RequestBody AddUserShopClientDto addUserShopClientDto);
-
- @PostMapping(value = "/companyShopToUser/getShopIdsFromUserId")
- R<List<Integer>> getShopIdsFromUserId(@RequestBody Long userId);
-
- @PostMapping(value = "/companyShopToUser/updateUserShop")
- R<Boolean> updateUserShop(@RequestBody AddUserShopClientDto addUserShopClientDto);
-
- @PostMapping(value = "/companyShopToUser/getCompanyToUserFromCompanyId")
- R<List<TCompanyToUser>> getCompanyToUserFromCompanyId(@RequestBody Long companyId);
- @PostMapping(value = "/companyShopToUser/addUserCompany")
- R<Boolean> addUserCompany(@RequestBody AddUserShopClientDto addUserShopClientDto);
-
-
- @PostMapping(value = "/companyShopToUser/getRepairNameFromId")
- R<String> getRepairNameFromId(Integer repairShopId);
-
-}
\ No newline at end of file
diff --git a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/feignClient/TCompanyToUserClient.java b/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/feignClient/TCompanyToUserClient.java
deleted file mode 100644
index 903d125..0000000
--- a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/feignClient/TCompanyToUserClient.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.ruoyi.management.api.feignClient;
-
-import com.ruoyi.common.core.constant.ServiceNameConstants;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.management.api.factory.TCompanyShopFallbackFactory;
-import com.ruoyi.management.api.factory.TCompanyToUserFallbackFactory;
-import com.ruoyi.management.api.model.CompanyShopNameAndIdQuery;
-import com.ruoyi.management.api.model.TCompany;
-import com.ruoyi.management.api.model.TCompanyShop;
-import com.ruoyi.management.api.query.ShopByShopNameAndCompanyNameQuery;
-import com.ruoyi.management.api.vo.TCompanyShopElectronicClientVO;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
-
-/**
- * 门店服务
- *
- * @author ruoyi
- */
-@FeignClient(contextId = "tCompanyToUserClient", value = ServiceNameConstants.MANAGEMENT_SERVICE, fallbackFactory = TCompanyToUserFallbackFactory.class)
-public interface TCompanyToUserClient
-{
-
- /**
- * 通过用户id查询公司id
- */
- @GetMapping("/companyToUser/queryCompanyIdByUserId/{id}")
- public R<Integer> queryCompanyIdByUserId(@PathVariable("id") Long id);
-
- /**
- * 通过公司id查询用户id
- */
- @GetMapping("/companyToUser/queryUserIdByCompanyId/{companyId}")
- public R<List<Integer>> queryUserIdByCompanyId(@PathVariable("companyId") Integer companyId);
-
-}
diff --git a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/feignClient/TRepairShopClient.java b/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/feignClient/TRepairShopClient.java
deleted file mode 100644
index c20f208..0000000
--- a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/feignClient/TRepairShopClient.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.ruoyi.management.api.feignClient;
-
-import com.ruoyi.common.core.constant.ServiceNameConstants;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.management.api.factory.TRepairShopFallbackFactory;
-import com.ruoyi.management.api.vo.TRepairShopClientVO;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-
-import java.util.List;
-
-@FeignClient(contextId = "tRepairShopClient", value = ServiceNameConstants.MANAGEMENT_SERVICE, fallbackFactory = TRepairShopFallbackFactory.class)
-public interface TRepairShopClient {
- /**
- * 通过id获取修理厂详细信息
- */
- @ApiOperation(value = "获取修理厂管理详细信息")
- @GetMapping(value = "/repairShop/getRepairById/{id}")
- public R<String> getRepairById(@PathVariable("id") Integer id);
-
- /**
- * 根据公司id获取修理厂列表
- */
- @GetMapping(value = "/repairShop/getRepairByCompanyId/{id}")
- public R<List<TRepairShopClientVO>> getRepairByCompanyId(@PathVariable("id") Integer id);
-
-
-}
diff --git a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/feignClient/TRepairShopToUserClient.java b/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/feignClient/TRepairShopToUserClient.java
deleted file mode 100644
index 7703d89..0000000
--- a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/feignClient/TRepairShopToUserClient.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ruoyi.management.api.feignClient;
-
-import com.ruoyi.common.core.constant.ServiceNameConstants;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.management.api.factory.TRepairShopToUserFallbackFactory;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-
-@FeignClient(contextId = "tRepairShopToUserClient", value = ServiceNameConstants.MANAGEMENT_SERVICE, fallbackFactory = TRepairShopToUserFallbackFactory.class)
-
-public interface TRepairShopToUserClient {
- /**
- * 根据用户id获取修理厂id
- */
- @ApiOperation(value = "通过userId查询对应修理厂Id")
- @GetMapping("/repairShopToUser/selectByUserId/{userId}")
- public R<Integer> selectByUserId(@PathVariable("userId") Long userId);
-}
diff --git a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/feignClient/ViolationClient.java b/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/feignClient/ViolationClient.java
deleted file mode 100644
index 81ebc01..0000000
--- a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/feignClient/ViolationClient.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.ruoyi.management.api.feignClient;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.common.core.constant.ServiceNameConstants;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.web.page.PageInfo;
-import com.ruoyi.management.api.factory.TCompanyShopFallbackFactory;
-import com.ruoyi.management.api.factory.ViolationShopFallbackFactory;
-import com.ruoyi.management.api.model.CarInfoRecordQuery;
-import com.ruoyi.management.api.model.TSystemConfig;
-import com.ruoyi.management.api.model.TViolationManage;
-import com.ruoyi.management.api.model.TViolationManageInfo;
-import com.ruoyi.management.api.query.CarInfoQuery;
-import com.ruoyi.management.api.query.VehicleViolationCountQuery;
-import com.ruoyi.management.api.query.ViolationByCarIdAndTimeQuery;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
-
-@FeignClient(contextId = "violationClient", value = ServiceNameConstants.MANAGEMENT_SERVICE, fallbackFactory = ViolationShopFallbackFactory.class)
-public interface ViolationClient {
-
- @PostMapping("/violationManage/index")
- R<Integer> index(@RequestBody List<Integer> ids);
-
- @PostMapping("/violationManage/isViolation")
- R<Integer> isViolation(Integer id);
-
- @PostMapping("/violationManage/carInfoRecord")
- R<PageInfo<TViolationManageInfo>> carInfoRecord(@RequestBody CarInfoRecordQuery query);
-
- /**
- * 通过车辆id查询车辆的违章数据
- * @param carId
- * @return
- */
- @GetMapping("/violationManage/queryViolationByCarId/{carId}")
- R<List<TViolationManage>> queryViolationByCarId(@PathVariable("carId") Integer carId);
-
- /**
- * 通过类型查询系统规则配置
- * @param query
- * @return
- */
- @GetMapping("/violationManage/querySystemConfigByType")
- R<TSystemConfig> querySystemConfigByType(@RequestBody CarInfoQuery query);
-
- /**
- * 查询车辆违章数量
- * @param violationCountQuery
- * @return
- */
- @PostMapping("/violationManage/vehicleViolation")
- R<Integer> vehicleViolation(@RequestBody VehicleViolationCountQuery violationCountQuery);
-
- /**
- * 通过车辆id和开始结束时间查询车辆的违章数据
- * @param query
- * @return
- */
- @PostMapping("/violationManage/queryViolationByCarIdAndTime")
- R<List<TViolationManage>> queryViolationByCarIdAndTime(@RequestBody ViolationByCarIdAndTimeQuery query);
-
-}
diff --git a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/AddUserShopClientDto.java b/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/AddUserShopClientDto.java
deleted file mode 100644
index bcc7948..0000000
--- a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/AddUserShopClientDto.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.management.api.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.List;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class AddUserShopClientDto {
- private Long userId;
-
- private List<Integer> shopIds;
-}
diff --git a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/CarInfoRecordQuery.java b/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/CarInfoRecordQuery.java
deleted file mode 100644
index 5e86b5c..0000000
--- a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/CarInfoRecordQuery.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.management.api.model;
-
-import com.ruoyi.common.core.web.page.BasePage;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.context.annotation.Bean;
-
-@Data
-@ApiModel(value = "车辆详情model")
-public class CarInfoRecordQuery extends BasePage {
- @ApiModelProperty("车辆id")
- private Integer carId;
- @ApiModelProperty("type 1合同 2违章 3保养 4年检 5维修 6出险 7保单")
- private Integer type;
-}
diff --git a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/CompanyShopNameAndIdQuery.java b/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/CompanyShopNameAndIdQuery.java
deleted file mode 100644
index 07c80ca..0000000
--- a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/CompanyShopNameAndIdQuery.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.ruoyi.management.api.model;
-
-import lombok.Data;
-
-@Data
-public class CompanyShopNameAndIdQuery {
- private String shopName;
- private Integer id;
-}
diff --git a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/TCompany.java b/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/TCompany.java
deleted file mode 100644
index 4915f41..0000000
--- a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/TCompany.java
+++ /dev/null
@@ -1,215 +0,0 @@
-package com.ruoyi.management.api.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.web.domain.BaseModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * 客户管理对象 t_company
- *
- * @author xiaochen
- * @date 2023-06-07
- */
-public class TCompany extends BaseModel
-{
- private static final long serialVersionUID = 1L;
-
- /** $column.columnComment */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /** 客户名称 */
- @Excel(name = "客户名称")
- private String companyName;
-
- /** 省份 */
- @Excel(name = "省份")
- private String province;
-
- /** 省份编码 */
- @Excel(name = "省份编码")
- private String provinceCode;
-
- /** 城市 */
- @Excel(name = "城市")
- private String city;
-
- /** 城市编码 */
- @Excel(name = "城市编码")
- private String cityCode;
-
- /** 区县 */
- @Excel(name = "区县")
- private String district;
-
- /** 区县编码 */
- @Excel(name = "区县编码")
- private String districtCode;
-
- /** 负责人名称 */
- @Excel(name = "负责人名称")
- private String headName;
-
- /** 负责人手机号 */
- @Excel(name = "负责人手机号")
- private String headPhone;
-
- /** 详细地址 */
- @Excel(name = "详细地址")
- private String address;
-
- /** 状态 1启用 0停用 */
- @Excel(name = "状态 1启用 0停用")
- private Integer state;
-
-
-
- public void setId(Integer id)
- {
- this.id = id;
- }
-
- public Integer getId()
- {
- return id;
- }
- public void setCompanyName(String companyName)
- {
- this.companyName = companyName;
- }
-
- public String getCompanyName()
- {
- return companyName;
- }
- public void setProvince(String province)
- {
- this.province = province;
- }
-
- public String getProvince()
- {
- return province;
- }
- public void setProvinceCode(String provinceCode)
- {
- this.provinceCode = provinceCode;
- }
-
- public String getProvinceCode()
- {
- return provinceCode;
- }
- public void setCity(String city)
- {
- this.city = city;
- }
-
- public String getCity()
- {
- return city;
- }
- public void setCityCode(String cityCode)
- {
- this.cityCode = cityCode;
- }
-
- public String getCityCode()
- {
- return cityCode;
- }
- public void setDistrict(String district)
- {
- this.district = district;
- }
-
- public String getDistrict()
- {
- return district;
- }
- public void setDistrictCode(String districtCode)
- {
- this.districtCode = districtCode;
- }
-
- public String getDistrictCode()
- {
- return districtCode;
- }
- public void setHeadName(String headName)
- {
- this.headName = headName;
- }
-
- public String getHeadName()
- {
- return headName;
- }
- public void setHeadPhone(String headPhone)
- {
- this.headPhone = headPhone;
- }
-
- public String getHeadPhone()
- {
- return headPhone;
- }
- public void setAddress(String address)
- {
- this.address = address;
- }
-
- public String getAddress()
- {
- return address;
- }
- public void setState(Integer state)
- {
- this.state = state;
- }
-
- public Integer getState()
- {
- return state;
- }
-
- @ApiModelProperty(value = "备注说明")
- @Excel(name = "备注说明")
- private String remark;
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("companyName", getCompanyName())
- .append("province", getProvince())
- .append("provinceCode", getProvinceCode())
- .append("city", getCity())
- .append("cityCode", getCityCode())
- .append("district", getDistrict())
- .append("districtCode", getDistrictCode())
- .append("headName", getHeadName())
- .append("headPhone", getHeadPhone())
- .append("address", getAddress())
- .append("remark", getRemark())
- .append("state", getState())
- .append("createBy", getCreateBy())
- .append("updateBy", getUpdateBy())
- .append("createTime", getCreateTime())
- .append("updateTime", getUpdateTime())
- .append("disabled", getDisabled())
- .toString();
- }
-}
diff --git a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/TCompanyShop.java b/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/TCompanyShop.java
deleted file mode 100644
index 653939b..0000000
--- a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/TCompanyShop.java
+++ /dev/null
@@ -1,225 +0,0 @@
-package com.ruoyi.management.api.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.web.domain.BaseEntity;
-import com.ruoyi.common.core.web.domain.BaseModel;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * 公司门店对象 t_company_shop
- *
- * @author xiaochen
- * @date 2023-06-07
- */
-public class TCompanyShop extends BaseModel
-{
- private static final long serialVersionUID = 1L;
-
- /** $column.columnComment */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /** 公司id */
- @Excel(name = "公司id")
- private Integer companyId;
-
- /** 门店名称 */
- @Excel(name = "门店名称")
- private String shopName;
-
- /** 负责人名称 */
- @Excel(name = "负责人名称")
- private String headName;
-
- /** 负责人电话 */
- @Excel(name = "负责人电话")
- private String headPhone;
-
- /** 省份 */
- @Excel(name = "省份")
- private String province;
-
- /** 省份编码 */
- @Excel(name = "省份编码")
- private String provinceCode;
-
- /** 城市 */
- @Excel(name = "城市")
- private String city;
-
- /** 城市编码 */
- @Excel(name = "城市编码")
- private String cityCode;
-
- /** 区县 */
- @Excel(name = "区县")
- private String district;
-
- /** 区县编码 */
- @Excel(name = "区县编码")
- private String districtCode;
-
- /** 详细地址 */
- @Excel(name = "详细地址")
- private String address;
-
- /** 状态 1启用 0停用 */
- @Excel(name = "状态 1启用 0停用")
- private Integer state;
-
-
- private String remark;
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- public void setId(Integer id)
- {
- this.id = id;
- }
-
- public Integer getId()
- {
- return id;
- }
- public void setCompanyId(Integer companyId)
- {
- this.companyId = companyId;
- }
-
- public Integer getCompanyId()
- {
- return companyId;
- }
- public void setShopName(String shopName)
- {
- this.shopName = shopName;
- }
-
- public String getShopName()
- {
- return shopName;
- }
- public void setHeadName(String headName)
- {
- this.headName = headName;
- }
-
- public String getHeadName()
- {
- return headName;
- }
- public void setHeadPhone(String headPhone)
- {
- this.headPhone = headPhone;
- }
-
- public String getHeadPhone()
- {
- return headPhone;
- }
- public void setProvince(String province)
- {
- this.province = province;
- }
-
- public String getProvince()
- {
- return province;
- }
- public void setProvinceCode(String provinceCode)
- {
- this.provinceCode = provinceCode;
- }
-
- public String getProvinceCode()
- {
- return provinceCode;
- }
- public void setCity(String city)
- {
- this.city = city;
- }
-
- public String getCity()
- {
- return city;
- }
- public void setCityCode(String cityCode)
- {
- this.cityCode = cityCode;
- }
-
- public String getCityCode()
- {
- return cityCode;
- }
- public void setDistrict(String district)
- {
- this.district = district;
- }
-
- public String getDistrict()
- {
- return district;
- }
- public void setDistrictCode(String districtCode)
- {
- this.districtCode = districtCode;
- }
-
- public String getDistrictCode()
- {
- return districtCode;
- }
- public void setAddress(String address)
- {
- this.address = address;
- }
-
- public String getAddress()
- {
- return address;
- }
- public void setState(Integer state)
- {
- this.state = state;
- }
-
- public Integer getState()
- {
- return state;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("companyId", getCompanyId())
- .append("shopName", getShopName())
- .append("headName", getHeadName())
- .append("headPhone", getHeadPhone())
- .append("province", getProvince())
- .append("provinceCode", getProvinceCode())
- .append("city", getCity())
- .append("cityCode", getCityCode())
- .append("district", getDistrict())
- .append("districtCode", getDistrictCode())
- .append("address", getAddress())
- .append("state", getState())
- .append("createBy", getCreateBy())
- .append("updateBy", getUpdateBy())
- .append("createTime", getCreateTime())
- .append("updateTime", getUpdateTime())
- .append("disabled", getDisabled())
- .toString();
- }
-}
diff --git a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/TCompanyShopToUser.java b/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/TCompanyShopToUser.java
deleted file mode 100644
index b9f74e1..0000000
--- a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/TCompanyShopToUser.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.ruoyi.management.api.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.web.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * 门店-用户关联对象 t_company_shop_to_user
- *
- * @author xiaochen
- * @date 2023-06-07
- */
-@TableName("t_company_shop_to_user")
-@ApiModel(value="t_company_shop_to_user对象", description="门店-用户关联对象")
-public class TCompanyShopToUser
-{
- private static final long serialVersionUID = 1L;
-
- /** $column.columnComment */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /** 门店id */
- @Excel(name = "门店id")
- private Integer shopId;
-
- /** 用户id */
- @Excel(name = "用户id")
- private Integer userId;
-
- public void setId(Integer id)
- {
- this.id = id;
- }
-
- public Integer getId()
- {
- return id;
- }
- public void setShopId(Integer shopId)
- {
- this.shopId = shopId;
- }
-
- public Integer getShopId()
- {
- return shopId;
- }
- public void setUserId(Integer userId)
- {
- this.userId = userId;
- }
-
- public Integer getUserId()
- {
- return userId;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("shopId", getShopId())
- .append("userId", getUserId())
- .toString();
- }
-}
diff --git a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/TCompanyToUser.java b/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/TCompanyToUser.java
deleted file mode 100644
index 3193a8f..0000000
--- a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/TCompanyToUser.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.ruoyi.management.api.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.web.domain.BaseEntity;
-
-/**
- * 客户（公司）-用户关联对象 t_company_to_user
- *
- * @author xiaochen
- * @date 2023-06-07
- */
-public class TCompanyToUser
-{
- private static final long serialVersionUID = 1L;
-
- /** $column.columnComment */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /** 公司id */
- @Excel(name = "公司id")
- private Integer companyId;
-
- /** 用户id */
- @Excel(name = "用户id")
- private Integer userId;
-
- public void setId(Integer id)
- {
- this.id = id;
- }
-
- public Integer getId()
- {
- return id;
- }
- public void setCompanyId(Integer companyId)
- {
- this.companyId = companyId;
- }
-
- public Integer getCompanyId()
- {
- return companyId;
- }
- public void setUserId(Integer userId)
- {
- this.userId = userId;
- }
-
- public Integer getUserId()
- {
- return userId;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("companyId", getCompanyId())
- .append("userId", getUserId())
- .toString();
- }
-}
diff --git a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/TPage.java b/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/TPage.java
new file mode 100644
index 0000000..9531450
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/TPage.java
@@ -0,0 +1,71 @@
+package com.ruoyi.management.api.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.web.domain.BaseModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * <p>
+ * 启动页 注意事项
+ * </p>
+ *
+ * @author 无关风月
+ * @since 2024-04-26
+ */
+@TableName("t_page")
+public class TPage extends BaseModel {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 图片或视频链接 只有注意事项是视频链接
+ */
+ @ApiModelProperty(value = "图片地址/或者注意事项视频连接")
+ private String img;
+ /**
+ * 1学习 2家长手机 3家长平板 4注意事项
+ */
+ @ApiModelProperty(value = "类型 1学习 2家长手机 3家长平板 4注意事项")
+ private Integer type;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public String getImg() {
+ return img;
+ }
+
+ public void setImg(String img) {
+ this.img = img;
+ }
+
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
+ @Override
+ public String toString() {
+ return "TPage{" +
+ ", id=" + id +
+ ", img=" + img +
+ ", type=" + type +
+ "}";
+ }
+}
diff --git a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/TSystemConfig.java b/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/TSystemConfig.java
deleted file mode 100644
index 050c836..0000000
--- a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/TSystemConfig.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.ruoyi.management.api.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.ruoyi.common.core.web.domain.BaseModel;
-import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.web.domain.BaseEntity;
-
-/**
- * 系统规则配置对象 t_system_config
- *
- * @author xiaochen
- * @date 2023-06-07
- */
-@Data
-public class TSystemConfig
-{
- private static final long serialVersionUID = 1L;
-
- /** $column.columnComment */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /** 类型 1保养规则 */
- @Excel(name = "公司id")
- private Integer companyId;
-
- /** 类型 1保养规则 */
- @Excel(name = "类型 1保养规则")
- private Integer type;
-
- /** 规则内容 */
- @Excel(name = "规则内容")
- private String content;
-
- public void setId(Integer id)
- {
- this.id = id;
- }
-
- public Integer getId()
- {
- return id;
- }
- public void setType(Integer type)
- {
- this.type = type;
- }
-
- public Integer getType()
- {
- return type;
- }
- public void setContent(String content)
- {
- this.content = content;
- }
-
- public String getContent()
- {
- return content;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("type", getType())
- .append("content", getContent())
- .toString();
- }
-}
diff --git a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/TViolationManage.java b/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/TViolationManage.java
deleted file mode 100644
index 4592cfe..0000000
--- a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/TViolationManage.java
+++ /dev/null
@@ -1,273 +0,0 @@
-package com.ruoyi.management.api.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.web.domain.BaseModel;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 违章管理对象 t_violation_manage
- *
- * @author xiaochen
- * @date 2023-06-07
- */
-public class TViolationManage extends BaseModel
-{
- private static final long serialVersionUID = 1L;
-
- /** $column.columnComment */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /** 车辆id */
- @Excel(name = "车辆id")
- private Integer carId;
-
- /** 司机id */
- @Excel(name = "司机id")
- private Integer driverId;
-
- /** 承租人 */
- @Excel(name = "承租人")
- private String driverName;
-
- /** 承租人手机号 */
- @Excel(name = "承租人手机号")
- private String driverPhone;
-
- /** 违章时间 */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "违章时间", width = 30, dateFormat = "yyyy-MM-dd")
- private Date violationTime;
-
- /** 违章地点 */
- @Excel(name = "违章地点")
- private String violationAddress;
-
- /** 违章行为 */
- @Excel(name = "违章行为")
- private String violationBehavior;
-
- /** 是否处理 1是 0否 */
- @Excel(name = "是否处理 1是 0否")
- private Integer ifHandle;
-
- /** 处理时间 */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "处理时间", width = 30, dateFormat = "yyyy-MM-dd")
- private Date handleTime;
-
- /** 是否交款 1是 0否 */
- @Excel(name = "是否交款 1是 0否")
- private Integer ifPayment;
-
- /** 采集单位 */
- @Excel(name = "采集单位")
- private String collectionUnit;
-
- /** 违章罚款 */
- @Excel(name = "违章罚款")
- private BigDecimal violationFines;
-
- /** 违章扣分 */
- @Excel(name = "违章扣分")
- private Integer violationDeductPoints;
-
- /** 更新时间 */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
- private Date renewTime;
-
- /** 违章图片 */
- @Excel(name = "违章图片")
- private String violationPicture;
-
- private BigDecimal overMoney;
-
-
- public BigDecimal getOverMoney() {
- return overMoney;
- }
-
- public void setOverMoney(BigDecimal overMoney) {
- this.overMoney = overMoney;
- }
-
- public void setId(Integer id)
- {
- this.id = id;
- }
-
- public Integer getId()
- {
- return id;
- }
- public void setCarId(Integer carId)
- {
- this.carId = carId;
- }
-
- public Integer getCarId()
- {
- return carId;
- }
- public void setDriverId(Integer driverId)
- {
- this.driverId = driverId;
- }
-
- public Integer getDriverId()
- {
- return driverId;
- }
- public void setDriverName(String driverName)
- {
- this.driverName = driverName;
- }
-
- public String getDriverName()
- {
- return driverName;
- }
- public void setDriverPhone(String driverPhone)
- {
- this.driverPhone = driverPhone;
- }
-
- public String getDriverPhone()
- {
- return driverPhone;
- }
- public void setViolationTime(Date violationTime)
- {
- this.violationTime = violationTime;
- }
-
- public Date getViolationTime()
- {
- return violationTime;
- }
- public void setViolationAddress(String violationAddress)
- {
- this.violationAddress = violationAddress;
- }
-
- public String getViolationAddress()
- {
- return violationAddress;
- }
- public void setViolationBehavior(String violationBehavior)
- {
- this.violationBehavior = violationBehavior;
- }
-
- public String getViolationBehavior()
- {
- return violationBehavior;
- }
- public void setIfHandle(Integer ifHandle)
- {
- this.ifHandle = ifHandle;
- }
-
- public Integer getIfHandle()
- {
- return ifHandle;
- }
- public void setHandleTime(Date handleTime)
- {
- this.handleTime = handleTime;
- }
-
- public Date getHandleTime()
- {
- return handleTime;
- }
- public void setIfPayment(Integer ifPayment)
- {
- this.ifPayment = ifPayment;
- }
-
- public Integer getIfPayment()
- {
- return ifPayment;
- }
- public void setCollectionUnit(String collectionUnit)
- {
- this.collectionUnit = collectionUnit;
- }
-
- public String getCollectionUnit()
- {
- return collectionUnit;
- }
- public void setViolationFines(BigDecimal violationFines)
- {
- this.violationFines = violationFines;
- }
-
- public BigDecimal getViolationFines()
- {
- return violationFines;
- }
- public void setViolationDeductPoints(Integer violationDeductPoints)
- {
- this.violationDeductPoints = violationDeductPoints;
- }
-
- public Integer getViolationDeductPoints()
- {
- return violationDeductPoints;
- }
- public void setRenewTime(Date renewTime)
- {
- this.renewTime = renewTime;
- }
-
- public Date getRenewTime()
- {
- return renewTime;
- }
- public void setViolationPicture(String violationPicture)
- {
- this.violationPicture = violationPicture;
- }
-
- public String getViolationPicture()
- {
- return violationPicture;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("carId", getCarId())
- .append("driverId", getDriverId())
- .append("driverName", getDriverName())
- .append("driverPhone", getDriverPhone())
- .append("violationTime", getViolationTime())
- .append("violationAddress", getViolationAddress())
- .append("violationBehavior", getViolationBehavior())
- .append("ifHandle", getIfHandle())
- .append("handleTime", getHandleTime())
- .append("ifPayment", getIfPayment())
- .append("collectionUnit", getCollectionUnit())
- .append("violationFines", getViolationFines())
- .append("violationDeductPoints", getViolationDeductPoints())
- .append("renewTime", getRenewTime())
- .append("violationPicture", getViolationPicture())
- .append("createBy", getCreateBy())
- .append("updateBy", getUpdateBy())
- .append("createTime", getCreateTime())
- .append("updateTime", getUpdateTime())
- .append("disabled", getDisabled())
- .toString();
- }
-}
diff --git a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/TViolationManageInfo.java b/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/TViolationManageInfo.java
deleted file mode 100644
index f13ee2a..0000000
--- a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/TViolationManageInfo.java
+++ /dev/null
@@ -1,298 +0,0 @@
-package com.ruoyi.management.api.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.web.domain.BaseModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 违章管理对象 t_violation_manage
- *
- * @author xiaochen
- * @date 2023-06-07
- */
-public class TViolationManageInfo extends BaseModel
-{
- private static final long serialVersionUID = 1L;
-
- /** $column.columnComment */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /** 车辆id */
- @Excel(name = "车辆id")
- private Integer carId;
-
- /** 司机id */
- @Excel(name = "司机id")
- private Integer driverId;
-
- /** 承租人 */
- @Excel(name = "承租人")
- @ApiModelProperty("承租人")
- private String driverName;
-
- /** 承租人手机号 */
- @Excel(name = "承租人手机号")
- @ApiModelProperty("承租人手机号")
- private String driverPhone;
-
- /** 违章时间 */
- @ApiModelProperty("违章时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
- @Excel(name = "违章时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm")
- private Date violationTime;
-
- /** 违章地点 */
- @Excel(name = "违章地点")
- @ApiModelProperty("违章地点")
- private String violationAddress;
-
- /** 违章行为 */
- @ApiModelProperty("违章行为")
- @Excel(name = "违章行为")
- private String violationBehavior;
-
- /** 是否处理 1是 0否 */
- @ApiModelProperty("是否处理 1是 0否")
- @Excel(name = "是否处理 1是 0否")
- private Integer ifHandle;
-
- /** 处理时间 */
- @ApiModelProperty("处理时间")
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "处理时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm")
- private Date handleTime;
-
- /** 是否交款 1是 0否 */
- @ApiModelProperty("是否交款 1是 0否")
- @Excel(name = "是否交款 1是 0否")
- private Integer ifPayment;
-
- /** 采集单位 */
- @Excel(name = "采集单位")
- @ApiModelProperty("采集单位")
- private String collectionUnit;
-
- /** 违章罚款 */
- @Excel(name = "违章罚款")
- @ApiModelProperty("违章罚款")
- private BigDecimal violationFines;
-
- /** 违章扣分 */
- @Excel(name = "违章扣分")
- @ApiModelProperty("违章扣分")
- private Integer violationDeductPoints;
-
- /** 更新时间 */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @ApiModelProperty("更新时间")
- @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
- private Date renewTime;
-
- /** 违章图片 */
- @Excel(name = "违章图片")
- @ApiModelProperty("违章图片")
- private String violationPicture;
- @ApiModelProperty("滞纳金")
- private BigDecimal overMoney;
- @ApiModelProperty("车架号")
- private String carVinNumber;
-
-
-
- public String getCarVinNumber() {
- return carVinNumber;
- }
-
- public void setCarVinNumber(String carVinNumber) {
- this.carVinNumber = carVinNumber;
- }
-
- public BigDecimal getOverMoney() {
- return overMoney;
- }
-
- public void setOverMoney(BigDecimal overMoney) {
- this.overMoney = overMoney;
- }
-
- public void setId(Integer id)
- {
- this.id = id;
- }
-
- public Integer getId()
- {
- return id;
- }
- public void setCarId(Integer carId)
- {
- this.carId = carId;
- }
-
- public Integer getCarId()
- {
- return carId;
- }
- public void setDriverId(Integer driverId)
- {
- this.driverId = driverId;
- }
-
- public Integer getDriverId()
- {
- return driverId;
- }
- public void setDriverName(String driverName)
- {
- this.driverName = driverName;
- }
-
- public String getDriverName()
- {
- return driverName;
- }
- public void setDriverPhone(String driverPhone)
- {
- this.driverPhone = driverPhone;
- }
-
- public String getDriverPhone()
- {
- return driverPhone;
- }
- public void setViolationTime(Date violationTime)
- {
- this.violationTime = violationTime;
- }
-
- public Date getViolationTime()
- {
- return violationTime;
- }
- public void setViolationAddress(String violationAddress)
- {
- this.violationAddress = violationAddress;
- }
-
- public String getViolationAddress()
- {
- return violationAddress;
- }
- public void setViolationBehavior(String violationBehavior)
- {
- this.violationBehavior = violationBehavior;
- }
-
- public String getViolationBehavior()
- {
- return violationBehavior;
- }
- public void setIfHandle(Integer ifHandle)
- {
- this.ifHandle = ifHandle;
- }
-
- public Integer getIfHandle()
- {
- return ifHandle;
- }
- public void setHandleTime(Date handleTime)
- {
- this.handleTime = handleTime;
- }
-
- public Date getHandleTime()
- {
- return handleTime;
- }
- public void setIfPayment(Integer ifPayment)
- {
- this.ifPayment = ifPayment;
- }
-
- public Integer getIfPayment()
- {
- return ifPayment;
- }
- public void setCollectionUnit(String collectionUnit)
- {
- this.collectionUnit = collectionUnit;
- }
-
- public String getCollectionUnit()
- {
- return collectionUnit;
- }
- public void setViolationFines(BigDecimal violationFines)
- {
- this.violationFines = violationFines;
- }
-
- public BigDecimal getViolationFines()
- {
- return violationFines;
- }
- public void setViolationDeductPoints(Integer violationDeductPoints)
- {
- this.violationDeductPoints = violationDeductPoints;
- }
-
- public Integer getViolationDeductPoints()
- {
- return violationDeductPoints;
- }
- public void setRenewTime(Date renewTime)
- {
- this.renewTime = renewTime;
- }
-
- public Date getRenewTime()
- {
- return renewTime;
- }
- public void setViolationPicture(String violationPicture)
- {
- this.violationPicture = violationPicture;
- }
-
- public String getViolationPicture()
- {
- return violationPicture;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("carId", getCarId())
- .append("driverId", getDriverId())
- .append("driverName", getDriverName())
- .append("driverPhone", getDriverPhone())
- .append("violationTime", getViolationTime())
- .append("violationAddress", getViolationAddress())
- .append("violationBehavior", getViolationBehavior())
- .append("ifHandle", getIfHandle())
- .append("handleTime", getHandleTime())
- .append("ifPayment", getIfPayment())
- .append("collectionUnit", getCollectionUnit())
- .append("violationFines", getViolationFines())
- .append("violationDeductPoints", getViolationDeductPoints())
- .append("renewTime", getRenewTime())
- .append("violationPicture", getViolationPicture())
- .append("createBy", getCreateBy())
- .append("updateBy", getUpdateBy())
- .append("createTime", getCreateTime())
- .append("updateTime", getUpdateTime())
- .append("disabled", getDisabled())
- .toString();
- }
-}
diff --git a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/query/CarInfoQuery.java b/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/query/CarInfoQuery.java
deleted file mode 100644
index 35b6011..0000000
--- a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/query/CarInfoQuery.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.ruoyi.management.api.query;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-@ApiModel(value = "合同详情查询Query")
-public class CarInfoQuery implements Serializable {
-
- @ApiModelProperty(value = "公司id",required = true)
- private Integer companyId;
-
- @ApiModelProperty(value = "合同id",required = true)
- private Integer contractId;
-
- @ApiModelProperty(value = "类型，前端忽略")
- private Integer type;
-
-}
diff --git a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/query/ShopByShopNameAndCompanyNameQuery.java b/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/query/ShopByShopNameAndCompanyNameQuery.java
deleted file mode 100644
index ac7932a..0000000
--- a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/query/ShopByShopNameAndCompanyNameQuery.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.ruoyi.management.api.query;
-
-import com.ruoyi.common.core.web.page.BasePage;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@Data
-@ApiModel(value = "通过门店名称和公司名称Query")
-public class ShopByShopNameAndCompanyNameQuery extends BasePage {
- @ApiModelProperty("门店名称")
- private String shopName;
- @ApiModelProperty("公司名称")
- private String companyName;
-}
diff --git a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/query/VehicleViolationCountQuery.java b/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/query/VehicleViolationCountQuery.java
deleted file mode 100644
index aa1a4db..0000000
--- a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/query/VehicleViolationCountQuery.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ruoyi.management.api.query;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-
-@Data
-@ApiModel(value = "查询车辆违章数量Query")
-public class VehicleViolationCountQuery implements Serializable {
-
- @ApiModelProperty(value = "车辆id集合")
- private List<Integer> carIds;
-
- @ApiModelProperty(value = "状态")
- private Integer state;
-
-}
diff --git a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/query/ViolationByCarIdAndTimeQuery.java b/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/query/ViolationByCarIdAndTimeQuery.java
deleted file mode 100644
index 901cfba..0000000
--- a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/query/ViolationByCarIdAndTimeQuery.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.ruoyi.management.api.query;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-public class ViolationByCarIdAndTimeQuery implements Serializable {
-
- @ApiModelProperty(value = "车辆id")
- private Integer carId;
-
- @ApiModelProperty(value = "开始时间")
- private Date startTime;
-
- @ApiModelProperty(value = "结束时间")
- private Date endTime;
-
-}
diff --git a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/vo/ApproveConfigClientVO.java b/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/vo/ApproveConfigClientVO.java
deleted file mode 100644
index b811e4b..0000000
--- a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/vo/ApproveConfigClientVO.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.ruoyi.management.api.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-public class ApproveConfigClientVO implements Serializable {
- private Integer id;
-
- /** 公司id */
- @ApiModelProperty(value = "公司id")
- private Integer companyId;
-
- /** 审批类型 1=交车审批、2=续约审批、3=退车审批 */
- @ApiModelProperty(value = "审批类型 1=交车审批、2=续约审批、3=退车审批")
- private Integer approveType;
-
- /** 状态 1开启 0关闭 */
- @ApiModelProperty(value = "状态 1开启 0关闭")
- private Integer state;
-
- /** 审批节点 */
- @ApiModelProperty(value = "审批节点,逗号分隔")
- private String approveNode;
-
- /** 审批节点id（逗号分隔） */
- @ApiModelProperty(value = "审批节点id,逗号分隔")
- private String approveNodeId;
-
-}
diff --git a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/vo/TCompanyShopElectronicClientVO.java b/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/vo/TCompanyShopElectronicClientVO.java
deleted file mode 100644
index 32d8eba..0000000
--- a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/vo/TCompanyShopElectronicClientVO.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.ruoyi.management.api.vo;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.web.domain.BaseModel;
-import lombok.Data;
-import lombok.ToString;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * 门店电子围栏对象 t_company_shop_electronic
- *
- * @author xiaochen
- * @date 2023-06-07
- */
-@Data
-@ToString
-public class TCompanyShopElectronicClientVO
-{
- private static final long serialVersionUID = 1L;
-
- /** $column.columnComment */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /** 电子围栏名称 */
- @Excel(name = "电子围栏名称")
- private String electronicFenceName;
-
- /** 电子围栏信息 */
- @Excel(name = "电子围栏信息")
- private String content;
-
- /** 省份 */
- @Excel(name = "省份")
- private String province;
-
- /** 省份编码 */
- @Excel(name = "省份编码")
- private String provinceCode;
-
- /** 城市 */
- @Excel(name = "城市")
- private String city;
-
- /** 城市编码 */
- @Excel(name = "城市编码")
- private String cityCode;
-
- /** 行政区域 */
- @Excel(name = "行政区域")
- private String district;
-
- /** 行政区域编码 */
- @Excel(name = "行政区域编码")
- private String districtCode;
-
- /** 地址名称 */
- @Excel(name = "地址名称")
- private String address;
-
- /** 围栏类型 1=全部 2=多边形围栏 3=行政区围栏 */
- @Excel(name = "围栏类型 1=全部 2=多边形围栏 3=行政区围栏")
- private Integer fenceType;
-
- /** 报警类型 1=驶出报警 2=驶入报警 */
- @Excel(name = "报警类型 1=驶出报警 2=驶入报警")
- private Integer policeType;
-
- /** 受控车辆 1= 待上户、2=待办证、3=待整备、4=待租、5=已租，逗号分隔 */
- @Excel(name = "受控车辆 1= 待上户、2=待办证、3=待整备、4=待租、5=已租，逗号分隔")
- private String controlCar;
-
-}
diff --git a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/vo/TRepairShopByNameVO.java b/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/vo/TRepairShopByNameVO.java
deleted file mode 100644
index 6a097f3..0000000
--- a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/vo/TRepairShopByNameVO.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.ruoyi.management.api.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-@ApiModel(value = "通过名称查询修理厂列表VO")
-public class TRepairShopByNameVO implements Serializable {
-
- @ApiModelProperty(value = "修理厂id")
- private Integer id;
-
- @ApiModelProperty(value = "公司id")
- private Integer companyId;
-
- @ApiModelProperty(value = "修理厂名称")
- private String repairShopName;
-
-}
diff --git a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/vo/TRepairShopClientVO.java b/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/vo/TRepairShopClientVO.java
deleted file mode 100644
index b0b2419..0000000
--- a/ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/vo/TRepairShopClientVO.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.ruoyi.management.api.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-public class TRepairShopClientVO implements Serializable {
- private Integer id;
-
- /** 公司id */
- @ApiModelProperty(value = "公司id")
- private Integer companyId;
- /** 修理厂名称 */
- @ApiModelProperty(value = "修理厂名称")
- private String repairShopName;
-
-}
diff --git a/ruoyi-api/ruoyi-api-management/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-api/ruoyi-api-management/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index abb96f7..920fb23 100644
--- a/ruoyi-api/ruoyi-api-management/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/ruoyi-api/ruoyi-api-management/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1,8 +1 @@
-com.ruoyi.management.api.factory.TCompanyShopFallbackFactory
-com.ruoyi.management.api.factory.ViolationShopFallbackFactory
-com.ruoyi.management.api.factory.TCompanyShopToUserFallbackFactory
-com.ruoyi.management.api.factory.TApproveConfigFallbackFactory
-com.ruoyi.management.api.factory.TCompanyRepairShopFallbackFactory
-com.ruoyi.management.api.factory.TRepairShopToUserFallbackFactory
-com.ruoyi.management.api.factory.TRepairShopFallbackFactory
-com.ruoyi.management.api.factory.TCompanyToUserFallbackFactory
\ No newline at end of file
+com.ruoyi.management.api.factory.TManagementFallbackFactory
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompanyUserVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompanyUserVo.java
deleted file mode 100644
index f09fe52..0000000
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompanyUserVo.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.ruoyi.system.domain.vo;
-
-import com.ruoyi.management.api.model.TCompanyShop;
-import com.ruoyi.system.api.domain.SysUser;
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import java.util.List;
-
-@Data
-public class CompanyUserVo {
- private SysUser sysUser;
-
- @NotBlank(message = "请选择角色")
- private Long roleId;
- @NotBlank(message = "请选择关联门店")
- private List<Integer> shopIds;
-
- @NotBlank(message = "关联门店")
- private List<TCompanyShop> shopList;
-}
diff --git a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java
index 22f61dc..ac65535 100644
--- a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java
+++ b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java
@@ -71,9 +71,8 @@
goodsTypeService.removeById(byId);
return R.ok("删除成功");
}
- @GetMapping("/listAll")
+ @PostMapping("/listAll")
@ApiOperation(value = "列表查询", tags = {"后台-商品管理"})
-
public R<PageInfo<TGoods>> listAll(@RequestBody GoodsTypeQuery query){
QueryWrapper<TGoods> wrapper = new QueryWrapper<>();
if (StringUtils.hasLength(query.getName())){
@@ -116,13 +115,13 @@
BeanUtils.copyProperties(byId,tGoodsVO);
long goodsId = orderService.count(new QueryWrapper<TOrder>().eq("goodsId", id));
tGoodsVO.setInventory(goodsId);
+ tGoodsVO.setIntegral(byId.getIntegral());
return R.ok(tGoodsVO);
}
@PostMapping("/getGoodsTypeList")
@ApiOperation(value = "获取商品类型列表", tags = {"后台-商品管理"})
public R<List<TGoodsType>> getGoodsInfo() {
- List<TGoodsType> res = goodsTypeService.list(new QueryWrapper<TGoodsType>()
- .ne("isDelete", 1));
+ List<TGoodsType> res = goodsTypeService.list(new QueryWrapper<TGoodsType>());
return R.ok(res);
}
diff --git a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/vo/TGoodsVO.java b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/vo/TGoodsVO.java
index 2e3319d..0b2dd8d 100644
--- a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/vo/TGoodsVO.java
+++ b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/vo/TGoodsVO.java
@@ -38,7 +38,7 @@
* 所需积分
*/
@ApiModelProperty(value = "所需积分")
- private String integral;
+ private Integer integral;
/**
* 商品原价
*/
@@ -63,7 +63,7 @@
* 商品类型id
*/
@ApiModelProperty(value = "商品类型id")
- private Integer typeId;
+ private String typeIds;
/**
* 商品封面图
*/
@@ -96,140 +96,4 @@
private Integer type;
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getintegral() {
- return
-integral;
- }
-
- public void setintegral(String
-integral) {
- this.
-integral =
-integral;
- }
-
- public BigDecimal getPrice() {
- return price;
- }
-
- public void setPrice(BigDecimal price) {
- this.price = price;
- }
-
- public Integer getTotal() {
- return total;
- }
-
- public void setTotal(Integer total) {
- this.total = total;
- }
-
- public Integer getSurplus() {
- return surplus;
- }
-
- public void setSurplus(Integer surplus) {
- this.surplus = surplus;
- }
-
- public Integer getUserCount() {
- return userCount;
- }
-
- public void setUserCount(Integer userCount) {
- this.userCount = userCount;
- }
-
- public Integer getTypeId() {
- return typeId;
- }
-
- public void setTypeId(Integer typeId) {
- this.typeId = typeId;
- }
-
- public String getCoverImg() {
- return coverImg;
- }
-
- public void setCoverImg(String coverImg) {
- this.coverImg = coverImg;
- }
-
- public String getDetailImg() {
- return detailImg;
- }
-
- public void setDetailImg(String detailImg) {
- this.detailImg = detailImg;
- }
-
- public String getDetail() {
- return detail;
- }
-
- public void setDetail(String detail) {
- this.detail = detail;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public Integer getIsDelete() {
- return isDelete;
- }
-
- public void setIsDelete(Integer isDelete) {
- this.isDelete = isDelete;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- @Override
- public String toString() {
- return "TGoods{" +
- ", id=" + id +
- ", name=" + name +
- ", integral=" +
-integral +
- ", price=" + price +
- ", total=" + total +
- ", surplus=" + surplus +
- ", userCount=" + userCount +
- ", typeId=" + typeId +
- ", coverImg=" + coverImg +
- ", detailImg=" + detailImg +
- ", detail=" + detail +
- ", insertTime=" + insertTime +
- ", isDelete=" + isDelete +
- ", type=" + type +
- "}";
- }
}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TSysSetController.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TSysSetController.java
index 51db76c..6187c6c 100644
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TSysSetController.java
+++ b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TSysSetController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.management.domain.TPage;
@@ -35,7 +36,7 @@
* @author 无关风月
* @since 2024-04-26
*/
-@Controller
+@RestController
@RequestMapping("/tSysSet")
public class TSysSetController {
@Autowired
@@ -49,7 +50,6 @@
@ApiOperation(value = "获取系统设置", tags = {"后台-系统设置"})
@PostMapping(value = "/getSysSet")
- @ResponseBody
public AjaxResult getSysSet() {
TSysSet byId = sysSetService.getById(1);
SysSetVO sysSetVO = new SysSetVO();
@@ -58,7 +58,6 @@
}
@ApiOperation(value = "保存系统设置", tags = {"后台-系统设置"})
@PostMapping(value = "/saveSysSet")
- @ResponseBody
public AjaxResult saveSysSet(SysSetVO vo) {
TSysSet byId = sysSetService.getById(1);
BeanUtils.copyProperties(vo,byId);
@@ -68,14 +67,18 @@
}
@ApiOperation(value = "获取启动页", tags = {"后台-启动页管理"})
@PostMapping(value = "/getPage")
- @ResponseBody
public AjaxResult getPage() {
List<TPage> list = pageService.list();
return AjaxResult.success(list);
}
+ @ApiOperation(value = "获取注意事项、启动页", tags = {"家长端-获取注意事项、启动页"})
+ @PostMapping(value = "/getPage1")
+ public R<List<TPage>> getPage1() {
+ List<TPage> list = pageService.list();
+ return R.ok(list);
+ }
@ApiOperation(value = "保存启动页", tags = {"后台-启动页管理"})
@PostMapping(value = "/setPage")
- @ResponseBody
public AjaxResult setPage(PageVO vo) {
for (TPage tPage : vo.getList()) {
if (tPage.getId() == null){
@@ -86,7 +89,6 @@
}
return AjaxResult.success("保存成功");
}
- @ResponseBody
@PostMapping("/agreement")
@ApiOperation(value = "协议", tags = {"后台-协议管理"})
public AjaxResult agreement(@RequestBody AggrementDTO dto) {
@@ -99,7 +101,6 @@
return AjaxResult.success(protocol.getContent());
}
}
- @ResponseBody
@PostMapping("/useGuide")
@ApiOperation(value = "使用指南-列表查询", tags = {"后台-使用指南"})
public AjaxResult<PageInfo<TUseGuide>> agreement(String title, Integer pageNumber, Integer pageSize) {
@@ -117,7 +118,6 @@
res.setTotal(useGuides.size());
return AjaxResult.success(res);
}
- @ResponseBody
@PostMapping("/updateUseGuide")
@ApiOperation(value = "使用指南-添加/编辑/查看详情", tags = {"使用指南"})
public AjaxResult<TUseGuide> updateUseGuide(@RequestBody UseGuidDTO dto) {
@@ -145,7 +145,6 @@
}
return AjaxResult.success(new TUseGuide());
}
- @ResponseBody
@DeleteMapping("/delete{id}")
@ApiOperation(value = "使用指南-删除", tags = {"使用指南"})
public AjaxResult updateUseGuide(@PathVariable Integer id) {
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TSubjectController.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TSubjectController.java
index 5ac03e0..a5d637e 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TSubjectController.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TSubjectController.java
@@ -3,6 +3,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.management.api.feignClient.ManagementClient;
import com.ruoyi.study.domain.*;
import com.ruoyi.study.dto.SubjectDTO;
import com.ruoyi.study.dto.SubjectQuery;
@@ -49,6 +50,7 @@
@Autowired
private ITStudyService studyService;
+
@PostMapping("/subjectList")
@ApiOperation(value = "列表查询", tags = {"题目管理"})
public R<PageInfo<SubjectVO>> subjectList(@RequestBody SubjectQuery query) {
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java
index d477903..433086e 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java
@@ -5,6 +5,8 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.management.api.feignClient.ManagementClient;
+import com.ruoyi.management.api.model.TPage;
import com.ruoyi.study.domain.TUser;
import com.ruoyi.study.dto.AppUserQuery;
import com.ruoyi.study.dto.UserInfoQuery;
@@ -42,8 +44,28 @@
@Autowired
private IVipOrderService vipOrderService;
+ @Autowired
+ private ManagementClient managementClient;
+ @PostMapping("/getPage")
+ @ApiOperation(value = "获取注意事项", tags = {"家长端-注意事项"})
+ public AjaxResult<TPage> getPage() {
+ List<TPage> data = managementClient.getPage1().getData();
+ for (TPage datum : data) {
+ if (datum.getType() == 4){
+ return AjaxResult.success(datum);
+ }
+ }
+ return AjaxResult.success();
+ }
+ @PostMapping("/updateUserInfo")
+ @ApiOperation(value = "修改个人资料", tags = {"家长端-个人中心"})
+
+ public AjaxResult updateUserInfo() {
+
+ return AjaxResult.success("修改成功");
+ }
@PostMapping("/userList")
- @ApiOperation(value = "用户列表", tags = {"用户管理"})
+ @ApiOperation(value = "用户列表", tags = {"管理后台-用户管理"})
public R<PageInfo<AppUserVO>> couponReceive(AppUserQuery query) {
PageInfo<AppUserVO> res = new PageInfo<>(query.getPageNumber(), query.getPageSize());
List<AppUserVO> list = userService.listAll(query);
@@ -64,7 +86,7 @@
}
@PostMapping("/getUserInfo")
- @ApiOperation(value = "查看用户详情", tags = {"用户管理"})
+ @ApiOperation(value = "查看用户详情", tags = {"管理后台-用户管理"})
public R<UserInfoVO> getUserInfo(UserInfoQuery dto) {
SimpleDateFormat format = new SimpleDateFormat("yyyy.MM.dd");
UserInfoVO res = new UserInfoVO();
@@ -109,7 +131,7 @@
return R.ok(res);
}
@PostMapping("/freeze")
- @ApiOperation(value = "冻结/解冻", tags = {"用户管理"})
+ @ApiOperation(value = "冻结/解冻", tags = {"管理后台-用户管理"})
public R freeze(Integer id) {
TUser byId = userService.getById(id);
if (byId.getState() == 1) {
@@ -123,7 +145,7 @@
@PostMapping("/vipOrderList")
- @ApiOperation(value = "列表查询", tags = {"会员管理"})
+ @ApiOperation(value = "列表查询", tags = {"管理后台-会员管理"})
public R<PageInfo<VipOrderVO>> vipOrderList(AppUserQuery query) {
PageInfo<VipOrderVO> res = new PageInfo<>(query.getPageNumber(), query.getPageSize());
List<VipOrderVO> list = vipOrderService.listAll(query);
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TIntegralRecord.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TIntegralRecord.java
new file mode 100644
index 0000000..c1989ef
--- /dev/null
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TIntegralRecord.java
@@ -0,0 +1,43 @@
+package com.ruoyi.study.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.web.domain.BaseModel;
+import lombok.Data;
+
+/**
+ * <p>
+ * 用户积分明细
+ * </p>
+ *
+ * @author 无关风月
+ * @since 2024-04-26
+ */
+@Data
+@TableName("t_integral_record")
+public class TIntegralRecord extends BaseModel {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 积分数量 带有负号为减少
+ */
+ private String integral;
+ /**
+ * 方式：完成题目 完成游戏 每日学习时长 商城消费
+ */
+ private String method;
+
+ /**
+ * 用户id
+ */
+ private Integer userId;
+
+
+}
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/mapper/TIntegralRecordMapper.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/mapper/TIntegralRecordMapper.java
new file mode 100644
index 0000000..ee66b7b
--- /dev/null
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/mapper/TIntegralRecordMapper.java
@@ -0,0 +1,17 @@
+package com.ruoyi.study.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.study.domain.TGameRecord;
+import com.ruoyi.study.domain.TIntegralRecord;
+
+/**
+ * <p>
+ * 自主游戏 Mapper 接口
+ * </p>
+ *
+ * @author 无关风月
+ * @since 2024-04-26
+ */
+public interface TIntegralRecordMapper extends BaseMapper<TIntegralRecord> {
+
+}
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/ITIntegralRecordService.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/ITIntegralRecordService.java
new file mode 100644
index 0000000..b2d4b7b
--- /dev/null
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/ITIntegralRecordService.java
@@ -0,0 +1,17 @@
+package com.ruoyi.study.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.study.domain.TGameRecord;
+import com.ruoyi.study.domain.TIntegralRecord;
+
+/**
+ * <p>
+ * 自主游戏 服务类
+ * </p>
+ *
+ * @author 无关风月
+ * @since 2024-04-26
+ */
+public interface ITIntegralRecordService extends IService<TIntegralRecord> {
+
+}
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TIntegralRecordServiceImpl.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TIntegralRecordServiceImpl.java
new file mode 100644
index 0000000..e2dd428
--- /dev/null
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TIntegralRecordServiceImpl.java
@@ -0,0 +1,23 @@
+package com.ruoyi.study.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.study.domain.TGameRecord;
+import com.ruoyi.study.domain.TIntegralRecord;
+import com.ruoyi.study.mapper.TGameRecordMapper;
+import com.ruoyi.study.mapper.TIntegralRecordMapper;
+import com.ruoyi.study.service.ITGameRecordService;
+import com.ruoyi.study.service.ITIntegralRecordService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 自主游戏 服务实现类
+ * </p>
+ *
+ * @author 无关风月
+ * @since 2024-04-26
+ */
+@Service
+public class TIntegralRecordServiceImpl extends ServiceImpl<TIntegralRecordMapper, TIntegralRecord> implements ITIntegralRecordService {
+
+}
diff --git a/ruoyi-service/ruoyi-study/src/main/resources/mapper/sutdy/TIntegralRecordMapper.xml b/ruoyi-service/ruoyi-study/src/main/resources/mapper/sutdy/TIntegralRecordMapper.xml
new file mode 100644
index 0000000..c6d7f75
--- /dev/null
+++ b/ruoyi-service/ruoyi-study/src/main/resources/mapper/sutdy/TIntegralRecordMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.study.mapper.TIntegralRecordMapper">
+
+
+
+</mapper>
--
Gitblit v1.7.1