From 04a319eb80c1556af1aa726b6b89a882b14641e0 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十月 2023 15:15:01 +0800
Subject: [PATCH] 接口整理
---
server/services/src/main/java/com/doumee/dao/business/join/BikesJoinMapper.java | 12 ++++++
server/services/src/main/java/com/doumee/dao/business/model/Sites.java | 2 -
server/platform/src/main/java/com/doumee/api/system/SystemDictDataController.java | 7 +--
server/services/src/main/java/com/doumee/dao/business/model/Bikes.java | 10 +++++
server/services/src/main/java/com/doumee/service/system/impl/SystemDictDataServiceImpl.java | 7 ++-
server/services/src/main/java/com/doumee/service/business/BikesService.java | 2 +
server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java | 28 +++++++++++++
server/platform/src/main/java/com/doumee/api/business/BikesController.java | 6 +++
server/platform/src/main/java/com/doumee/api/business/MemberController.java | 2
server/services/src/main/java/com/doumee/dao/business/web/response/MiniProgrammeDTO.java | 2
10 files changed, 67 insertions(+), 11 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/api/business/BikesController.java b/server/platform/src/main/java/com/doumee/api/business/BikesController.java
index 89649b8..cbe067b 100644
--- a/server/platform/src/main/java/com/doumee/api/business/BikesController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/BikesController.java
@@ -73,6 +73,12 @@
public ApiResponse<PageData<Bikes>> findPage (@RequestBody PageWrap<Bikes> pageWrap) {
return ApiResponse.success(bikesService.findPage(pageWrap));
}
+ @ApiOperation("瀹炴椂杞︿綅淇℃伅-鍒嗛〉鏌ヨ")
+ @PostMapping("/pageCurrent")
+ @RequiresPermissions("business:bikes:query")
+ public ApiResponse<PageData<Bikes>> pageCurrent (@RequestBody PageWrap<Bikes> pageWrap) {
+ return ApiResponse.success(bikesService.findJoinPage(pageWrap));
+ }
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
diff --git a/server/platform/src/main/java/com/doumee/api/business/MemberController.java b/server/platform/src/main/java/com/doumee/api/business/MemberController.java
index 113a8c3..890f607 100644
--- a/server/platform/src/main/java/com/doumee/api/business/MemberController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/MemberController.java
@@ -83,7 +83,7 @@
return ApiResponse.success(null);
}
- @ApiOperation("鍒嗛〉鏌ヨ")
+ @ApiOperation("浼氬憳/绠＄悊鍛橀厤缃垪琛╛鍒嗛〉鏌ヨ")
@PostMapping("/page")
@RequiresPermissions("business:member:query")
public ApiResponse<PageData<Member>> findPage (@RequestBody PageWrap<Member> pageWrap) {
diff --git a/server/platform/src/main/java/com/doumee/api/system/SystemDictDataController.java b/server/platform/src/main/java/com/doumee/api/system/SystemDictDataController.java
index e93063b..3726261 100644
--- a/server/platform/src/main/java/com/doumee/api/system/SystemDictDataController.java
+++ b/server/platform/src/main/java/com/doumee/api/system/SystemDictDataController.java
@@ -81,16 +81,15 @@
return ApiResponse.success(systemDictDataService.findPage(pageWrap));
}
- @ApiOperation("鍒嗛〉鏌ヨ灏忕▼搴忓熀纭�閰嶇疆")
+ @ApiOperation("灏忕▼搴忛厤缃�斺�旀煡瑭�")
@PostMapping("/getMiniProgrammeDTO")
-// @RequiresPermissions("system:dict:update")
public ApiResponse<MiniProgrammeDTO> getMiniProgrammeDTO(){
return ApiResponse.success(systemDictDataService.getMiniProgrammeDTO());
}
- @ApiOperation("淇敼灏忕▼搴忓熀纭�閰嶇疆")
+ @ApiOperation("灏忕▼搴忛厤缃�斺�旀洿鏂�")
@PostMapping("/updateMiniProgrammeDTO")
-// @RequiresPermissions("system:dict:update")
+// @RequiresPermissions("system:dict:updateMiniProgrammeDTO")
public ApiResponse updateMiniProgrammeDTO(@RequestBody MiniProgrammeDTO miniProgrammeDTO){
systemDictDataService.updateMiniProgrammeDTO(miniProgrammeDTO);
return ApiResponse.success(null);
diff --git a/server/services/src/main/java/com/doumee/dao/business/join/BikesJoinMapper.java b/server/services/src/main/java/com/doumee/dao/business/join/BikesJoinMapper.java
new file mode 100644
index 0000000..586ea98
--- /dev/null
+++ b/server/services/src/main/java/com/doumee/dao/business/join/BikesJoinMapper.java
@@ -0,0 +1,12 @@
+package com.doumee.dao.business.join;
+
+import com.doumee.dao.business.model.Bikes;
+import com.github.yulichang.base.mapper.MPJJoinMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author T14
+ */
+@Repository
+public interface BikesJoinMapper extends MPJJoinMapper<Bikes> {
+}
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Bikes.java b/server/services/src/main/java/com/doumee/dao/business/model/Bikes.java
index 422aa82..d13a64e 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Bikes.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Bikes.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -57,6 +58,12 @@
@ApiModelProperty(value = "杞﹁締绫诲瀷缂栫爜锛堝叧鑱攂ase_param)")
@ExcelColumn(name="杞﹁締绫诲瀷缂栫爜锛堝叧鑱攂ase_param)")
private String paramId;
+ @ApiModelProperty(value = "杞﹁締绫诲瀷")
+ @TableField(exist = false)
+ private String paramName;
+ @ApiModelProperty(value = "绔欑偣鍚嶇О")
+ @TableField(exist = false)
+ private String siteName;
@ApiModelProperty(value = "缂栧彿")
@ExcelColumn(name="缂栧彿")
@@ -65,6 +72,9 @@
@ApiModelProperty(value = "鐘舵�� 0鍋滆溅鍙嚭鍊� 1鍑哄�熶腑 3绂佺敤 ", example = "1")
@ExcelColumn(name="鐘舵�� 0鍋滆溅鍙嚭鍊� 1鍑哄�熶腑 3绂佺敤 ")
private Integer status;
+ @ApiModelProperty(value = "鏄惁鏈夎溅 0鍏ㄩ儴 1鏃犺溅 2鏈夎溅 null涓哄叏閮�", example = "1")
+ @TableField(exist = false)
+ private Integer hasBike;
@ApiModelProperty(value = "褰撳墠绔欑偣缂栫爜锛堝叧鑱攕ites)")
@ExcelColumn(name="褰撳墠绔欑偣缂栫爜锛堝叧鑱攕ites)")
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 bd30423..bedc1a3 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
@@ -75,8 +75,6 @@
@ExcelColumn(name="鐗堟湰鍙�")
private String clientVersion;
-
-
@ApiModelProperty(value = "鍦ㄦ灦杞﹁締鏁�")
@TableField(exist = false)
private Integer bikeCount;
diff --git a/server/services/src/main/java/com/doumee/dao/business/web/response/MiniProgrammeDTO.java b/server/services/src/main/java/com/doumee/dao/business/web/response/MiniProgrammeDTO.java
index fa51b26..36fabe4 100644
--- a/server/services/src/main/java/com/doumee/dao/business/web/response/MiniProgrammeDTO.java
+++ b/server/services/src/main/java/com/doumee/dao/business/web/response/MiniProgrammeDTO.java
@@ -21,7 +21,7 @@
@ApiModelProperty("鏈嶅姟鐢佃瘽")
private String serverPhone = "";
- @ApiModelProperty("鎶奸噾閲戦")
+ @ApiModelProperty("鎶奸噾閲戦(鍏冿級")
private String rentDeposit = "";
@ApiModelProperty("钀ヤ笟鏃堕棿璧峰")
diff --git a/server/services/src/main/java/com/doumee/service/business/BikesService.java b/server/services/src/main/java/com/doumee/service/business/BikesService.java
index 881b386..716c4ba 100644
--- a/server/services/src/main/java/com/doumee/service/business/BikesService.java
+++ b/server/services/src/main/java/com/doumee/service/business/BikesService.java
@@ -94,4 +94,6 @@
* @return long
*/
long count(Bikes bikes);
+
+ PageData<Bikes> findJoinPage(PageWrap<Bikes> pageWrap);
}
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java
index dd8115f..547c405 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java
@@ -1,15 +1,21 @@
package com.doumee.service.business.impl;
+import com.doumee.core.constants.Constants;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.BikesMapper;
-import com.doumee.dao.business.model.Bikes;
+import com.doumee.dao.business.join.BikesJoinMapper;
+import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.web.response.BikeLogDTO;
+import com.doumee.dao.business.web.response.MemberRidesDTO;
import com.doumee.service.business.BikesService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -26,6 +32,8 @@
@Autowired
private BikesMapper bikesMapper;
+ @Autowired
+ private BikesJoinMapper bikesJoinMapper;
@Override
public String create(Bikes bikes) {
@@ -85,6 +93,24 @@
}
@Override
+ public PageData<Bikes> findJoinPage(PageWrap<Bikes> pageWrap) {
+ IPage<Bikes> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ MPJLambdaWrapper<Bikes> queryWrapper = new MPJLambdaWrapper<>();
+ Utils.MP.blankToNull(pageWrap.getModel());
+ queryWrapper.orderByAsc(Bikes::getSiteId,Bikes::getLockId);
+ queryWrapper.leftJoin(BaseParam.class,BaseParam::getId,Bikes::getParamId)
+ .leftJoin(Sites.class,Sites::getId,Bikes::getSiteId)
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getSiteId()),Bikes::getSiteId,pageWrap.getModel().getSiteId())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getSiteName()), Sites::getName,pageWrap.getModel().getSiteName())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getLockId()),Bikes::getLockId,pageWrap.getModel().getLockId())
+ .isNull(Constants.formatIntegerNum(pageWrap.getModel().getHasBike()) == Constants.ONE,Bikes::getCode)
+ .isNotNull(Constants.formatIntegerNum(pageWrap.getModel().getHasBike()) == Constants.TWO,Bikes::getCode);
+ queryWrapper.selectAll(Bikes.class)
+ .selectAs(BaseParam::getName,Bikes::getParamName)
+ .selectAs(Sites::getName,Bikes::getSiteName) ;
+ return PageData.from(bikesJoinMapper.selectJoinPage(page, Bikes.class, queryWrapper));
+ }
+ @Override
public PageData<Bikes> findPage(PageWrap<Bikes> pageWrap) {
IPage<Bikes> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
QueryWrapper<Bikes> queryWrapper = new QueryWrapper<>();
diff --git a/server/services/src/main/java/com/doumee/service/system/impl/SystemDictDataServiceImpl.java b/server/services/src/main/java/com/doumee/service/system/impl/SystemDictDataServiceImpl.java
index ce54721..b895426 100644
--- a/server/services/src/main/java/com/doumee/service/system/impl/SystemDictDataServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/system/impl/SystemDictDataServiceImpl.java
@@ -5,6 +5,8 @@
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.dao.business.web.response.MiniProgrammeDTO;
+import com.doumee.dao.system.SystemDictMapper;
+import com.doumee.dao.system.model.SystemDict;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
@@ -39,6 +41,8 @@
@Autowired
private SystemDictDataMapper systemDictDataMapper;
+ @Autowired
+ private SystemDictMapper systemDictMapper;
@Override
public String create(SystemDictData systemDictData) {
@@ -110,7 +114,6 @@
@Override
public MiniProgrammeDTO getMiniProgrammeDTO() {
try {
-
String jasonStr = MiniProgrammeDTO.toUnderlineJSONString(new MiniProgrammeDTO());
JSONObject parse = (JSONObject) JSONObject.parse(jasonStr);
List<String> collect = parse.entrySet().stream().map(s -> s.getKey().toUpperCase()).collect(Collectors.toList());
@@ -139,7 +142,7 @@
String jasonStr = MiniProgrammeDTO.toUnderlineJSONString(miniProgrammeDTO);
JSONObject parse = (JSONObject) JSONObject.parse(jasonStr);
parse.entrySet().forEach(s->{
- if (StringUtils.isEmpty((String)s.getValue())){
+ if (StringUtils.isNotBlank((String)s.getValue())){
UpdateWrapper<SystemDictData> wrapper = new UpdateWrapper<>();
wrapper.lambda()
.eq(SystemDictData::getLabel,s.getKey().toUpperCase())
--
Gitblit v1.9.3