From adb6ad94d8499fcaaca3a574f14764421861a601 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十月 2023 12:02:34 +0800
Subject: [PATCH] 接口整理
---
server/platform/src/main/java/com/doumee/api/business/LocksController.java | 2 +-
server/services/src/main/java/com/doumee/dao/business/model/Sites.java | 4 ----
server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java | 24 +++++-------------------
server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java | 5 -----
server/platform/src/main/java/com/doumee/api/business/SitesController.java | 7 +------
server/services/src/main/java/com/doumee/service/business/SitesService.java | 1 -
6 files changed, 7 insertions(+), 36 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/api/business/LocksController.java b/server/platform/src/main/java/com/doumee/api/business/LocksController.java
index 532d4ee..17b88e5 100644
--- a/server/platform/src/main/java/com/doumee/api/business/LocksController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/LocksController.java
@@ -70,7 +70,7 @@
return ApiResponse.success(null);
}
- @ApiOperation("鍒嗛〉鏌ヨ")
+ @ApiOperation("瀹炴椂杞︿綅淇℃伅_鍒嗛〉鏌ヨ")
@PostMapping("/page")
@RequiresPermissions("business:locks:query")
public ApiResponse<PageData<Locks>> findPage(@RequestBody PageWrap<Locks> pageWrap) {
diff --git a/server/platform/src/main/java/com/doumee/api/business/SitesController.java b/server/platform/src/main/java/com/doumee/api/business/SitesController.java
index 1270ac1..7d55909 100644
--- a/server/platform/src/main/java/com/doumee/api/business/SitesController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/SitesController.java
@@ -98,10 +98,5 @@
return ApiResponse.success(sitesService.findSitesMonitorDTOPage(pageWrap));
}
- @ApiOperation("瀹炴椂杞︿綅淇℃伅-鍒嗛〉鏌ヨ")
- @PostMapping("/findSitesMonitorBikePage")
- @RequiresPermissions("business:sites:query")
- public ApiResponse<PageData<SitesMonitorBikeDTO>> getSitesMonitorBikeDTO(@RequestBody PageWrap<SitesMonitorDTO> pageWrap){
- return ApiResponse.success(sitesService.getSitesMonitorBikeDTO(pageWrap));
- }
+
}
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Sites.java b/server/services/src/main/java/com/doumee/dao/business/model/Sites.java
index 5a9e7dc..bd30423 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Sites.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Sites.java
@@ -77,10 +77,6 @@
- @ApiModelProperty(value = "閿佹鍣ㄦ暟")
- @TableField(exist = false)
- private Integer localCount;
-
@ApiModelProperty(value = "鍦ㄦ灦杞﹁締鏁�")
@TableField(exist = false)
private Integer bikeCount;
diff --git a/server/services/src/main/java/com/doumee/service/business/SitesService.java b/server/services/src/main/java/com/doumee/service/business/SitesService.java
index 82d55bc..20d0712 100644
--- a/server/services/src/main/java/com/doumee/service/business/SitesService.java
+++ b/server/services/src/main/java/com/doumee/service/business/SitesService.java
@@ -118,6 +118,5 @@
PageData<Sites> findSitesMonitorDTOPage(PageWrap<SitesMonitorDTO> pageWrap);
- PageData<SitesMonitorBikeDTO> getSitesMonitorBikeDTO(PageWrap<SitesMonitorDTO> pageWrap);
}
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java
index 365c204..0294c49 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java
@@ -52,11 +52,6 @@
@Autowired
private MultifileMapper multifileMapper;
-<<<<<<< HEAD
-=======
-// @Autowired
-// private SystemDictDataBiz systemDictDataBiz;
->>>>>>> 05a9badaedf021d6b881de7cdb04c56cfd6d52cd
@Override
public String create(BikeRepair bikeRepair) {
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java
index b1ac1b2..f3f4186 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java
@@ -166,10 +166,10 @@
queryWrapper.lambda().eq(Sites::getInfo, pageWrap.getModel().getInfo());
}
if (pageWrap.getModel().getName() != null) {
- queryWrapper.lambda().eq(Sites::getName, pageWrap.getModel().getName());
+ queryWrapper.lambda().like(Sites::getName, pageWrap.getModel().getName());
}
if (pageWrap.getModel().getCode() != null) {
- queryWrapper.lambda().eq(Sites::getCode, pageWrap.getModel().getCode());
+ queryWrapper.lambda().like(Sites::getCode, pageWrap.getModel().getCode());
}
if (pageWrap.getModel().getStatus() != null) {
queryWrapper.lambda().eq(Sites::getStatus, pageWrap.getModel().getStatus());
@@ -201,13 +201,12 @@
@Override
public PageData<Sites> findSitesMonitorDTOPage(PageWrap<SitesMonitorDTO> pageWrap) {
-
// IPage page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
IPage<Sites> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
QueryWrapper<Sites> queryWrapper = new QueryWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
- queryWrapper.select("*,(select count(r.id) from locks r where r.site_id = sites.id) as localCount" +
- ",(select count(r.bike_code) from locks r where r.site_id = sites.id and r.bike_code is null and r.bike_code !='' ) as bikeCount");
+// queryWrapper.select("*,(select count(r.id) from locks r where r.site_id = sites.id) as localCount" +
+ queryWrapper.select( "*,(select count(r.bike_code) from locks r where r.site_id = sites.id and r.bike_code is null and r.bike_code !='' ) as bikeCount");
// Page<SitesMonitorDTO> sitesMonitorDTO = sitesMapper.getSitesMonitorDTO(page, pageWrap.getModel().getCode(), pageWrap.getModel().getName());
queryWrapper.lambda().like(StringUtils.isNotBlank(pageWrap.getModel().getCode()),Sites::getCode,pageWrap.getModel().getCode());
queryWrapper.lambda().like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Sites::getCode,pageWrap.getModel().getName());
@@ -216,7 +215,7 @@
if (!CollectionUtils.isEmpty(sitesMonitorDTO.getRecords())){
sitesMonitorDTO.getRecords().forEach(s->{
- s.setRate(new BigDecimal(s.getBikeCount()).divide(new BigDecimal(s.getLocalCount()).setScale(2)));
+ s.setRate(new BigDecimal(s.getBikeCount()).divide(new BigDecimal(s.getLockNum()).setScale(2)));
});
}
@@ -226,18 +225,5 @@
@Override
public void siteReservesNotice(String siteId) throws Exception {
- }
-
- @Override
- public PageData<SitesMonitorBikeDTO> getSitesMonitorBikeDTO(PageWrap<SitesMonitorDTO> pageWrap) {
- IPage page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- Page<SitesMonitorBikeDTO> sitesMonitorDTO = sitesMapper.getSitesMonitorBikeDTO(page,
- pageWrap.getModel().getCode(),
- pageWrap.getModel().getName(),
- pageWrap.getModel().getLockCode(),
- pageWrap.getModel().getHasBike());
-
-
- return PageData.from(sitesMonitorDTO);
}
}
--
Gitblit v1.9.3