From a1188a66f0549522068adde2fee430015077410c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十月 2023 15:48:14 +0800
Subject: [PATCH] 接口整理
---
server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java | 2
server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java | 2
server/services/src/main/java/com/doumee/service/business/impl/HolidaysServiceImpl.java | 41 ++++++++-
server/services/src/main/java/com/doumee/service/business/impl/RefundServiceImpl.java | 2
server/services/src/main/java/com/doumee/service/business/HolidaysService.java | 2
server/services/src/main/java/com/doumee/service/system/impl/SystemPositionUserServiceImpl.java | 2
server/services/src/main/java/com/doumee/service/system/impl/SystemDataPermissionServiceImpl.java | 2
server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java | 2
server/services/src/main/java/com/doumee/service/system/impl/SystemDictServiceImpl.java | 2
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 2
server/services/src/main/java/com/doumee/service/system/impl/SystemUserRoleServiceImpl.java | 2
server/services/src/main/java/com/doumee/dao/business/model/Holidays.java | 9 -
server/services/src/main/java/com/doumee/service/system/impl/SystemRoleServiceImpl.java | 2
server/services/src/main/java/com/doumee/service/business/impl/ActionLogServiceImpl.java | 2
server/services/src/main/java/com/doumee/service/system/impl/SystemDictDataServiceImpl.java | 2
server/services/src/main/java/com/doumee/service/system/impl/SystemPermissionServiceImpl.java | 2
server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java | 2
server/services/src/main/java/com/doumee/service/system/impl/SystemDepartmentUserServiceImpl.java | 4
server/services/src/main/java/com/doumee/service/system/impl/SystemRolePermissionServiceImpl.java | 2
server/services/src/main/java/com/doumee/service/business/impl/AdServiceImpl.java | 2
server/services/src/main/java/com/doumee/service/business/impl/MultifileServiceImpl.java | 2
server/services/src/main/java/com/doumee/service/system/impl/SystemDepartmentServiceImpl.java | 2
server/services/src/main/java/com/doumee/service/business/impl/TransactionsServiceImpl.java | 2
server/services/src/main/java/com/doumee/service/business/impl/BaseParamServiceImpl.java | 19 ++--
server/services/src/main/java/com/doumee/service/system/impl/SystemLoginLogServiceImpl.java | 2
server/services/src/main/java/com/doumee/service/business/impl/WxBillDetailServiceImpl.java | 2
server/services/src/main/java/com/doumee/service/system/impl/SystemMenuServiceImpl.java | 2
server/services/src/main/java/com/doumee/dao/business/model/RentSite.java | 2
server/services/src/main/java/com/doumee/service/system/impl/SystemTraceLogServiceImpl.java | 2
server/services/src/main/java/com/doumee/service/business/impl/AliBillServiceImpl.java | 2
server/services/src/main/java/com/doumee/service/business/impl/AliBillDetailServiceImpl.java | 2
server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 2
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 8 +-
server/services/src/main/java/com/doumee/service/system/impl/SystemRoleMenuServiceImpl.java | 2
server/services/src/main/java/com/doumee/service/business/impl/PricingParamServiceImpl.java | 19 ++--
server/services/src/main/java/com/doumee/service/business/impl/RentSiteServiceImpl.java | 30 +++++--
server/services/src/main/java/com/doumee/service/business/impl/LocksServiceImpl.java | 2
server/services/src/main/java/com/doumee/service/business/impl/WxBillServiceImpl.java | 2
38 files changed, 111 insertions(+), 81 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Holidays.java b/server/services/src/main/java/com/doumee/dao/business/model/Holidays.java
index cfc85f2..65e411f 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Holidays.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Holidays.java
@@ -19,14 +19,12 @@
@ApiModel("鑺傚亣鏃ラ厤缃〃")
@TableName("\"holidays\"")
public class Holidays {
-
@ApiModelProperty(value = "缂栫爜")
@ExcelColumn(name="缂栫爜")
private String id;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- //@JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鍒涘缓浜�")
@@ -35,7 +33,6 @@
@ApiModelProperty(value = "缂栬緫鏃堕棿")
@ExcelColumn(name="缂栬緫鏃堕棿")
- //@JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "缂栬緫浜�")
@@ -50,9 +47,7 @@
@ExcelColumn(name="澶囨敞")
private String info;
- @ApiModelProperty(value = "鏃ユ湡")
+ @ApiModelProperty(value = "鏃ユ湡,鏍煎紡yyyy-MM-DD")
@ExcelColumn(name="鏃ユ湡")
- //@JsonFormat(pattern = "yyyy-MM-dd")
- private Date holiday;
-
+ private String holiday;
}
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/RentSite.java b/server/services/src/main/java/com/doumee/dao/business/model/RentSite.java
index 93af9b8..1503066 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/RentSite.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/RentSite.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableLogic;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -45,6 +46,7 @@
@ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�", example = "1")
@ExcelColumn(name="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�")
+ @TableLogic
private Integer isdeleted;
@ApiModelProperty(value = "鍚嶇О")
diff --git a/server/services/src/main/java/com/doumee/service/business/HolidaysService.java b/server/services/src/main/java/com/doumee/service/business/HolidaysService.java
index 077338b..d4aa970 100644
--- a/server/services/src/main/java/com/doumee/service/business/HolidaysService.java
+++ b/server/services/src/main/java/com/doumee/service/business/HolidaysService.java
@@ -19,7 +19,7 @@
* @return String
*/
String create(Holidays holidays);
-
+ Holidays isHolidayCreated(String date);
/**
* 涓婚敭鍒犻櫎
*
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/ActionLogServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/ActionLogServiceImpl.java
index ed45c40..b55f6d9 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/ActionLogServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/ActionLogServiceImpl.java
@@ -88,7 +88,7 @@
@Override
public ActionLog findOne(ActionLog actionLog) {
QueryWrapper<ActionLog> wrapper = new QueryWrapper<>(actionLog);
- return actionLogMapper.selectOne(wrapper);
+ return actionLogMapper.selectOne(wrapper.last(" limit 1"));
}
@Override
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/AdServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/AdServiceImpl.java
index c63f58f..0c6d52a 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/AdServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/AdServiceImpl.java
@@ -75,7 +75,7 @@
@Override
public Ad findOne(Ad ad) {
QueryWrapper<Ad> wrapper = new QueryWrapper<>(ad);
- return adMapper.selectOne(wrapper);
+ return adMapper.selectOne(wrapper.last(" limit 1"));
}
@Override
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/AliBillDetailServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/AliBillDetailServiceImpl.java
index 76cbc4f..63b5fd0 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/AliBillDetailServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/AliBillDetailServiceImpl.java
@@ -75,7 +75,7 @@
@Override
public AliBillDetail findOne(AliBillDetail aliBillDetail) {
QueryWrapper<AliBillDetail> wrapper = new QueryWrapper<>(aliBillDetail);
- return aliBillDetailMapper.selectOne(wrapper);
+ return aliBillDetailMapper.selectOne(wrapper.last(" limit 1"));
}
@Override
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/AliBillServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/AliBillServiceImpl.java
index 6322e7b..e12ffe0 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/AliBillServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/AliBillServiceImpl.java
@@ -75,7 +75,7 @@
@Override
public AliBill findOne(AliBill aliBill) {
QueryWrapper<AliBill> wrapper = new QueryWrapper<>(aliBill);
- return aliBillMapper.selectOne(wrapper);
+ return aliBillMapper.selectOne(wrapper.last(" limit 1"));
}
@Override
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/BaseParamServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/BaseParamServiceImpl.java
index e2eff99..dfba448 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/BaseParamServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/BaseParamServiceImpl.java
@@ -41,6 +41,7 @@
QueryWrapper<BaseParam> wrapper = new QueryWrapper<>();
wrapper.lambda()
.eq(BaseParam::getType,baseParam.getType())
+ .eq(BaseParam::getIsdeleted,Constants.ZERO)
.eq(BaseParam::getType,baseParam.getName());
Integer count = baseParamMapper.selectCount(wrapper);
@@ -89,9 +90,10 @@
QueryWrapper<BaseParam> wrapper = new QueryWrapper<>();
wrapper.lambda()
.eq(BaseParam::getType,baseParam.getType())
+ .eq(BaseParam::getIsdeleted,Constants.ZERO)
.eq(BaseParam::getType,baseParam.getName());
- BaseParam baseParam1 = baseParamMapper.selectOne(wrapper);
+ BaseParam baseParam1 = baseParamMapper.selectOne(wrapper.last(" limit 1"));
if (Objects.nonNull(baseParam1) && !baseParam1.getId().equals(baseParam.getId())){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"杞﹁締闂宸插瓨鍦�");
}
@@ -124,7 +126,7 @@
@Override
public BaseParam findOne(BaseParam baseParam) {
QueryWrapper<BaseParam> wrapper = new QueryWrapper<>(baseParam);
- return baseParamMapper.selectOne(wrapper);
+ return baseParamMapper.selectOne(wrapper.last(" limit 1"));
}
@Override
@@ -139,6 +141,7 @@
IPage<BaseParam> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
QueryWrapper<BaseParam> queryWrapper = new QueryWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
+ pageWrap.getModel().setIsdeleted(Constants.ZERO);
if (pageWrap.getModel().getId() != null) {
queryWrapper.lambda().eq(BaseParam::getId, pageWrap.getModel().getId());
}
@@ -160,7 +163,7 @@
queryWrapper.lambda().eq(BaseParam::getIsdeleted, pageWrap.getModel().getIsdeleted());
}
if (pageWrap.getModel().getName() != null) {
- queryWrapper.lambda().eq(BaseParam::getName, pageWrap.getModel().getName());
+ queryWrapper.lambda().like(BaseParam::getName, pageWrap.getModel().getName());
}
if (pageWrap.getModel().getSortnum() != null) {
queryWrapper.lambda().eq(BaseParam::getSortnum, pageWrap.getModel().getSortnum());
@@ -172,18 +175,12 @@
queryWrapper.lambda().eq(BaseParam::getStatus, pageWrap.getModel().getStatus());
}
if (pageWrap.getModel().getInfo() != null) {
- queryWrapper.lambda().eq(BaseParam::getInfo, pageWrap.getModel().getInfo());
+ queryWrapper.lambda().like(BaseParam::getInfo, pageWrap.getModel().getInfo());
}
if (pageWrap.getModel().getRequired() != null) {
queryWrapper.lambda().eq(BaseParam::getRequired, pageWrap.getModel().getRequired());
}
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
- }
- }
+ queryWrapper.lambda().orderByAsc(BaseParam::getSortnum);
return PageData.from(baseParamMapper.selectPage(page, queryWrapper));
}
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 0294c49..556b696 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
@@ -101,7 +101,7 @@
@Override
public BikeRepair findOne(BikeRepair bikeRepair) {
QueryWrapper<BikeRepair> wrapper = new QueryWrapper<>(bikeRepair);
- return bikeRepairMapper.selectOne(wrapper);
+ return bikeRepairMapper.selectOne(wrapper.last(" limit 1"));
}
@Override
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 547c405..fefcb4b 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
@@ -83,7 +83,7 @@
@Override
public Bikes findOne(Bikes bikes) {
QueryWrapper<Bikes> wrapper = new QueryWrapper<>(bikes);
- return bikesMapper.selectOne(wrapper);
+ return bikesMapper.selectOne(wrapper.last(" limit 1"));
}
@Override
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
index a4a7a83..7b24ac9 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -149,12 +149,12 @@
@Override
public Goodsorder findOne(Goodsorder goodsorder) {
QueryWrapper<Goodsorder> wrapper = new QueryWrapper<>(goodsorder);
- return goodsorderMapper.selectOne(wrapper);
+ return goodsorderMapper.selectOne(wrapper.last(" limit 1"));
}
@Override
public Goodsorder findOneByWrapper(QueryWrapper<Goodsorder> wrapper) {
- return goodsorderMapper.selectOne(wrapper);
+ return goodsorderMapper.selectOne(wrapper.last(" limit 1"));
}
@Override
@@ -171,11 +171,11 @@
}
@Override
public List<GoodsorderExportVO> findExportAccountDetailPage(Goodsorder model){
-// List<GoodsorderExportVO> list = new ArrayList<>();
model.setPayStatus(Constants.ONE); //鍙煡璇㈡敮浠樻垚鍔熺殑
MPJLambdaWrapper<Goodsorder> queryWrapper = initQueryParamByModel(model);
List<GoodsorderExportVO> goodsorderList = goodsorderJoinMapper.selectJoinList(GoodsorderExportVO.class,queryWrapper);
- /* if(goodsorderList!=null){
+ /* List<GoodsorderExportVO> list = new ArrayList<>();
+ if(goodsorderList!=null){
for(Goodsorder order : goodsorderList){
GoodsorderExportVO vo = new GoodsorderExportVO();
vo.setId(order.getId());
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/HolidaysServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/HolidaysServiceImpl.java
index d05fba5..9033b0b 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/HolidaysServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/HolidaysServiceImpl.java
@@ -1,5 +1,7 @@
package com.doumee.service.business.impl;
+import com.doumee.core.constants.Constants;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
@@ -10,11 +12,15 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.shiro.SecurityUtils;
+import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import java.util.Date;
import java.util.List;
+import java.util.UUID;
/**
* 鑺傚亣鏃ラ厤缃〃Service瀹炵幇
@@ -28,9 +34,27 @@
private HolidaysMapper holidaysMapper;
@Override
- public String create(Holidays holidays) {
- holidaysMapper.insert(holidays);
- return holidays.getId();
+ public String create(Holidays model) {
+ Holidays param = isHolidayCreated(model.getHoliday());
+ if(param!=null){
+ return param.getId();
+ }
+ LoginUserInfo user =(LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+
+ model.setIsdeleted(Constants.ZERO);
+ model.setId(UUID.randomUUID().toString());
+ model.setCreateDate(new Date());
+ model.setCreator(user.getId());
+
+ holidaysMapper.insert(model);
+ return model.getId();
+ }
+ @Override
+ public Holidays isHolidayCreated(String date) {
+ Holidays d = new Holidays();
+ d.setIsdeleted(Constants.ZERO);
+ d.setHoliday(date);
+ return findOne(d) ;
}
@Override
@@ -54,6 +78,10 @@
@Override
public void updateById(Holidays holidays) {
+
+ LoginUserInfo user =(LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ holidays.setEditDate(new Date());
+ holidays.setEditor(user.getId());
holidaysMapper.updateById(holidays);
}
@@ -75,11 +103,12 @@
@Override
public Holidays findOne(Holidays holidays) {
QueryWrapper<Holidays> wrapper = new QueryWrapper<>(holidays);
- return holidaysMapper.selectOne(wrapper);
+ return holidaysMapper.selectOne(wrapper.last(" limit 1"));
}
@Override
public List<Holidays> findList(Holidays holidays) {
+ holidays.setIsdeleted(Constants.ZERO);
QueryWrapper<Holidays> wrapper = new QueryWrapper<>(holidays);
return holidaysMapper.selectList(wrapper);
}
@@ -89,6 +118,7 @@
IPage<Holidays> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
QueryWrapper<Holidays> queryWrapper = new QueryWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
+ pageWrap.getModel().setIsdeleted(Constants.ZERO);
if (pageWrap.getModel().getId() != null) {
queryWrapper.lambda().eq(Holidays::getId, pageWrap.getModel().getId());
}
@@ -113,8 +143,7 @@
queryWrapper.lambda().eq(Holidays::getInfo, pageWrap.getModel().getInfo());
}
if (pageWrap.getModel().getHoliday() != null) {
- queryWrapper.lambda().ge(Holidays::getHoliday, Utils.Date.getStart(pageWrap.getModel().getHoliday()));
- queryWrapper.lambda().le(Holidays::getHoliday, Utils.Date.getEnd(pageWrap.getModel().getHoliday()));
+ queryWrapper.lambda().like(Holidays::getHoliday, pageWrap.getModel().getHoliday());
}
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/LocksServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/LocksServiceImpl.java
index 3943d3a..2a42a7d 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/LocksServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/LocksServiceImpl.java
@@ -75,7 +75,7 @@
@Override
public Locks findOne(Locks locks) {
QueryWrapper<Locks> wrapper = new QueryWrapper<>(locks);
- return locksMapper.selectOne(wrapper);
+ return locksMapper.selectOne(wrapper.last(" limit 1"));
}
@Override
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
index acefe3f..0f68927 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
@@ -111,7 +111,7 @@
@Override
public MemberRides findOne(MemberRides memberRides) {
QueryWrapper<MemberRides> wrapper = new QueryWrapper<>(memberRides);
- return memberRidesMapper.selectOne(wrapper);
+ return memberRidesMapper.selectOne(wrapper.last(" limit 1"));
}
@Override
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index d0051b2..7c5d6f4 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -143,7 +143,7 @@
@Override
public Member findOne(Member member) {
QueryWrapper<Member> wrapper = new QueryWrapper<>(member);
- return memberMapper.selectOne(wrapper);
+ return memberMapper.selectOne(wrapper.last(" limit 1"));
}
@Override
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/MultifileServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/MultifileServiceImpl.java
index 02ec839..0b5cf5b 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/MultifileServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/MultifileServiceImpl.java
@@ -75,7 +75,7 @@
@Override
public Multifile findOne(Multifile multifile) {
QueryWrapper<Multifile> wrapper = new QueryWrapper<>(multifile);
- return multifileMapper.selectOne(wrapper);
+ return multifileMapper.selectOne(wrapper.last(" limit 1"));
}
@Override
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java
index 6e6cdf2..17168b5 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java
@@ -132,7 +132,7 @@
@Override
public PricingDetail findOne(PricingDetail pricingDetail) {
QueryWrapper<PricingDetail> wrapper = new QueryWrapper<>(pricingDetail);
- return pricingDetailMapper.selectOne(wrapper);
+ return pricingDetailMapper.selectOne(wrapper.last(" limit 1"));
}
@Override
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/PricingParamServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/PricingParamServiceImpl.java
index b5d1112..a77d0db 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/PricingParamServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/PricingParamServiceImpl.java
@@ -38,8 +38,8 @@
PricingParam insert = new PricingParam();
insert.setCreateDate(new Date());
insert.setCreator(principal.getId());
- insert.setEditDate(new Date());
- insert.setEditor(principal.getId());
+// insert.setEditDate(new Date());
+// insert.setEditor(principal.getId());
insert.setIsdeleted(Constants.ZERO);
insert.setName(pricingParam.getName());
insert.setStartDate(pricingParam.getStartDate());
@@ -71,9 +71,12 @@
@Override
public void update(PricingParam pricingParam) {
+
+ LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
UpdateWrapper<PricingParam> wrapper = new UpdateWrapper<>();
wrapper.lambda()
.eq(PricingParam::getId,pricingParam.getId())
+ .set(PricingParam::getEditor,principal.getId())
.set(PricingParam::getName,pricingParam.getName())
.set(PricingParam::getStartDate,pricingParam.getStartDate())
.set(PricingParam::getEndDate,pricingParam.getEndDate())
@@ -105,7 +108,7 @@
@Override
public PricingParam findOne(PricingParam pricingParam) {
QueryWrapper<PricingParam> wrapper = new QueryWrapper<>(pricingParam);
- return pricingParamMapper.selectOne(wrapper);
+ return pricingParamMapper.selectOne(wrapper.last(" limit 1"));
}
@Override
@@ -140,7 +143,7 @@
queryWrapper.lambda().eq(PricingParam::getIsdeleted, pageWrap.getModel().getIsdeleted());
}
if (pageWrap.getModel().getName() != null) {
- queryWrapper.lambda().eq(PricingParam::getName, pageWrap.getModel().getName());
+ queryWrapper.lambda().like(PricingParam::getName, pageWrap.getModel().getName());
}
if (pageWrap.getModel().getStartDate() != null) {
queryWrapper.lambda().ge(PricingParam::getStartDate, Utils.Date.getStart(pageWrap.getModel().getStartDate()));
@@ -159,13 +162,7 @@
if (pageWrap.getModel().getInfo() != null) {
queryWrapper.lambda().eq(PricingParam::getInfo, pageWrap.getModel().getInfo());
}
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
- }
- }
+ queryWrapper.lambda().orderByAsc(PricingParam::getSortnum);
return PageData.from(pricingParamMapper.selectPage(page, queryWrapper));
}
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/RefundServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/RefundServiceImpl.java
index 4218801..c9eff3b 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/RefundServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/RefundServiceImpl.java
@@ -88,7 +88,7 @@
@Override
public Refund findOne(Refund refund) {
QueryWrapper<Refund> wrapper = new QueryWrapper<>(refund);
- return refundMapper.selectOne(wrapper);
+ return refundMapper.selectOne(wrapper.last(" limit 1"));
}
@Override
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/RentSiteServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/RentSiteServiceImpl.java
index 5238157..3649991 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/RentSiteServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/RentSiteServiceImpl.java
@@ -1,5 +1,7 @@
package com.doumee.service.business.impl;
+import com.doumee.core.constants.Constants;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
@@ -10,11 +12,14 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import java.util.Date;
import java.util.List;
+import java.util.UUID;
/**
* 绉熻溅鐐逛俊鎭〃Service瀹炵幇
@@ -29,6 +34,12 @@
@Override
public String create(RentSite rentSite) {
+ LoginUserInfo user =(LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ rentSite.setId(UUID.randomUUID().toString());
+ rentSite.setCreateDate(new Date());
+ rentSite.setCreator(user.getId());
+ rentSite.setStatus(Constants.ZERO);
+ rentSite.setIsdeleted(Constants.ZERO);
rentSiteMapper.insert(rentSite);
return rentSite.getId();
}
@@ -54,6 +65,9 @@
@Override
public void updateById(RentSite rentSite) {
+ LoginUserInfo user =(LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ rentSite.setEditDate(new Date());
+ rentSite.setEditor(user.getId());
rentSiteMapper.updateById(rentSite);
}
@@ -75,11 +89,12 @@
@Override
public RentSite findOne(RentSite rentSite) {
QueryWrapper<RentSite> wrapper = new QueryWrapper<>(rentSite);
- return rentSiteMapper.selectOne(wrapper);
+ return rentSiteMapper.selectOne(wrapper.last(" limit 1"));
}
@Override
public List<RentSite> findList(RentSite rentSite) {
+ rentSite.setIsdeleted(Constants.ZERO);
QueryWrapper<RentSite> wrapper = new QueryWrapper<>(rentSite);
return rentSiteMapper.selectList(wrapper);
}
@@ -89,6 +104,7 @@
IPage<RentSite> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
QueryWrapper<RentSite> queryWrapper = new QueryWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
+ pageWrap.getModel().setIsdeleted(Constants.ZERO);
if (pageWrap.getModel().getId() != null) {
queryWrapper.lambda().eq(RentSite::getId, pageWrap.getModel().getId());
}
@@ -110,10 +126,10 @@
queryWrapper.lambda().eq(RentSite::getIsdeleted, pageWrap.getModel().getIsdeleted());
}
if (pageWrap.getModel().getName() != null) {
- queryWrapper.lambda().eq(RentSite::getName, pageWrap.getModel().getName());
+ queryWrapper.lambda().like(RentSite::getName, pageWrap.getModel().getName());
}
if (pageWrap.getModel().getCode() != null) {
- queryWrapper.lambda().eq(RentSite::getCode, pageWrap.getModel().getCode());
+ queryWrapper.lambda().like(RentSite::getCode, pageWrap.getModel().getCode());
}
if (pageWrap.getModel().getLongitude() != null) {
queryWrapper.lambda().eq(RentSite::getLongitude, pageWrap.getModel().getLongitude());
@@ -130,13 +146,7 @@
if (pageWrap.getModel().getInfo() != null) {
queryWrapper.lambda().eq(RentSite::getInfo, pageWrap.getModel().getInfo());
}
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
- }
- }
+ queryWrapper.lambda().orderByAsc(RentSite::getCode);
return PageData.from(rentSiteMapper.selectPage(page, queryWrapper));
}
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 f432b84..7fdb63f 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
@@ -128,7 +128,7 @@
@Override
public Sites findOne(Sites sites) {
QueryWrapper<Sites> wrapper = new QueryWrapper<>(sites);
- return sitesMapper.selectOne(wrapper);
+ return sitesMapper.selectOne(wrapper.last(" limit 1"));
}
@Override
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/TransactionsServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/TransactionsServiceImpl.java
index 58eab98..4de6300 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/TransactionsServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/TransactionsServiceImpl.java
@@ -75,7 +75,7 @@
@Override
public Transactions findOne(Transactions transactions) {
QueryWrapper<Transactions> wrapper = new QueryWrapper<>(transactions);
- return transactionsMapper.selectOne(wrapper);
+ return transactionsMapper.selectOne(wrapper.last(" limit 1"));
}
@Override
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/WxBillDetailServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/WxBillDetailServiceImpl.java
index 11bd97d..00b01c8 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/WxBillDetailServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/WxBillDetailServiceImpl.java
@@ -78,7 +78,7 @@
@Override
public WxBillDetail findOne(WxBillDetail wxBillDetail) {
QueryWrapper<WxBillDetail> wrapper = new QueryWrapper<>(wxBillDetail);
- return wxBillDetailMapper.selectOne(wrapper);
+ return wxBillDetailMapper.selectOne(wrapper.last(" limit 1"));
}
@Override
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/WxBillServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/WxBillServiceImpl.java
index 1181f86..e414e88 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/WxBillServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/WxBillServiceImpl.java
@@ -95,7 +95,7 @@
@Override
public WxBill findOne(WxBill wxBill) {
QueryWrapper<WxBill> wrapper = new QueryWrapper<>(wxBill);
- return wxBillMapper.selectOne(wrapper);
+ return wxBillMapper.selectOne(wrapper.last(" limit 1"));
}
@Override
diff --git a/server/services/src/main/java/com/doumee/service/system/impl/SystemDataPermissionServiceImpl.java b/server/services/src/main/java/com/doumee/service/system/impl/SystemDataPermissionServiceImpl.java
index a5ccaca..42e4c94 100644
--- a/server/services/src/main/java/com/doumee/service/system/impl/SystemDataPermissionServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/system/impl/SystemDataPermissionServiceImpl.java
@@ -85,7 +85,7 @@
@Override
public SystemDataPermission findOne(SystemDataPermission systemDataPermission) {
- Wrapper<SystemDataPermission> wrapper = new QueryWrapper<>(systemDataPermission);
+ Wrapper<SystemDataPermission> wrapper = new QueryWrapper<>(systemDataPermission).last(" limit 1");
return systemDataPermissionMapper.selectOne(wrapper );
}
diff --git a/server/services/src/main/java/com/doumee/service/system/impl/SystemDepartmentServiceImpl.java b/server/services/src/main/java/com/doumee/service/system/impl/SystemDepartmentServiceImpl.java
index 8f36fcc..ee6cb8e 100644
--- a/server/services/src/main/java/com/doumee/service/system/impl/SystemDepartmentServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/system/impl/SystemDepartmentServiceImpl.java
@@ -83,7 +83,7 @@
@Override
public SystemDepartment findOne(SystemDepartment systemDepartment) {
- Wrapper<SystemDepartment> wrapper = new QueryWrapper<>(systemDepartment);
+ Wrapper<SystemDepartment> wrapper = new QueryWrapper<>(systemDepartment).last(" limit 1");
return systemDepartmentMapper.selectOne(wrapper );
}
diff --git a/server/services/src/main/java/com/doumee/service/system/impl/SystemDepartmentUserServiceImpl.java b/server/services/src/main/java/com/doumee/service/system/impl/SystemDepartmentUserServiceImpl.java
index 0e07970..f34b3cc 100644
--- a/server/services/src/main/java/com/doumee/service/system/impl/SystemDepartmentUserServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/system/impl/SystemDepartmentUserServiceImpl.java
@@ -76,8 +76,8 @@
@Override
public SystemDepartmentUser findOne(SystemDepartmentUser systemDepartmentUser) {
- Wrapper<SystemDepartmentUser> wrapper = new QueryWrapper<>(systemDepartmentUser);
- return systemDepartmentUserMapper.selectOne(wrapper );
+ Wrapper<SystemDepartmentUser> wrapper = new QueryWrapper<>(systemDepartmentUser).last(" limit 1");
+ return systemDepartmentUserMapper.selectOne(wrapper );
}
@Override
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 b895426..54931bf 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
@@ -89,7 +89,7 @@
@Override
public SystemDictData findOne(SystemDictData systemDictData) {
- Wrapper<SystemDictData> wrapper = new QueryWrapper<>(systemDictData);
+ Wrapper<SystemDictData> wrapper = new QueryWrapper<>(systemDictData).last(" limit 1");
return systemDictDataMapper.selectOne(wrapper );
}
diff --git a/server/services/src/main/java/com/doumee/service/system/impl/SystemDictServiceImpl.java b/server/services/src/main/java/com/doumee/service/system/impl/SystemDictServiceImpl.java
index 0d8ad0d..50a5bf8 100644
--- a/server/services/src/main/java/com/doumee/service/system/impl/SystemDictServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/system/impl/SystemDictServiceImpl.java
@@ -86,7 +86,7 @@
@Override
public SystemDict findOne(SystemDict systemDict) {
- Wrapper<SystemDict> wrapper = new QueryWrapper<>(systemDict);
+ Wrapper<SystemDict> wrapper = new QueryWrapper<>(systemDict).last(" limit 1");
return systemDictMapper.selectOne(wrapper );
}
diff --git a/server/services/src/main/java/com/doumee/service/system/impl/SystemLoginLogServiceImpl.java b/server/services/src/main/java/com/doumee/service/system/impl/SystemLoginLogServiceImpl.java
index 59d6e53..44135ea 100644
--- a/server/services/src/main/java/com/doumee/service/system/impl/SystemLoginLogServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/system/impl/SystemLoginLogServiceImpl.java
@@ -72,7 +72,7 @@
@Override
public SystemLoginLog findOne(SystemLoginLog systemLoginLog) {
- Wrapper<SystemLoginLog> wrapper = new QueryWrapper<>(systemLoginLog);
+ Wrapper<SystemLoginLog> wrapper = new QueryWrapper<>(systemLoginLog).last(" limit 1");
return systemLoginLogMapper.selectOne(wrapper);
}
diff --git a/server/services/src/main/java/com/doumee/service/system/impl/SystemMenuServiceImpl.java b/server/services/src/main/java/com/doumee/service/system/impl/SystemMenuServiceImpl.java
index ae72c38..c621093 100644
--- a/server/services/src/main/java/com/doumee/service/system/impl/SystemMenuServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/system/impl/SystemMenuServiceImpl.java
@@ -72,7 +72,7 @@
@Override
public SystemMenu findOne(SystemMenu systemMenu) {
- Wrapper<SystemMenu> wrapper = new QueryWrapper<>(systemMenu);
+ Wrapper<SystemMenu> wrapper = new QueryWrapper<>(systemMenu).last(" limit 1");
return systemMenuMapper.selectOne(wrapper);
}
diff --git a/server/services/src/main/java/com/doumee/service/system/impl/SystemPermissionServiceImpl.java b/server/services/src/main/java/com/doumee/service/system/impl/SystemPermissionServiceImpl.java
index b8fb8bd..57a254c 100644
--- a/server/services/src/main/java/com/doumee/service/system/impl/SystemPermissionServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/system/impl/SystemPermissionServiceImpl.java
@@ -83,7 +83,7 @@
@Override
public SystemPermission findOne(SystemPermission systemPermission) {
- Wrapper<SystemPermission> wrapper = new QueryWrapper<>(systemPermission);
+ Wrapper<SystemPermission> wrapper = new QueryWrapper<>(systemPermission).last(" limit 1");
return systemPermissionMapper.selectOne(wrapper);
}
diff --git a/server/services/src/main/java/com/doumee/service/system/impl/SystemPositionUserServiceImpl.java b/server/services/src/main/java/com/doumee/service/system/impl/SystemPositionUserServiceImpl.java
index 5eb5b41..c20a173 100644
--- a/server/services/src/main/java/com/doumee/service/system/impl/SystemPositionUserServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/system/impl/SystemPositionUserServiceImpl.java
@@ -76,7 +76,7 @@
@Override
public SystemPositionUser findOne(SystemPositionUser systemPositionUser) {
- Wrapper<SystemPositionUser> wrapper = new QueryWrapper<>(systemPositionUser);
+ Wrapper<SystemPositionUser> wrapper = new QueryWrapper<>(systemPositionUser).last(" limit 1");
return systemPositionUserMapper.selectOne(wrapper);
}
diff --git a/server/services/src/main/java/com/doumee/service/system/impl/SystemRoleMenuServiceImpl.java b/server/services/src/main/java/com/doumee/service/system/impl/SystemRoleMenuServiceImpl.java
index d19019f..44fe766 100644
--- a/server/services/src/main/java/com/doumee/service/system/impl/SystemRoleMenuServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/system/impl/SystemRoleMenuServiceImpl.java
@@ -81,7 +81,7 @@
@Override
public SystemRoleMenu findOne(SystemRoleMenu systemRoleMenu) {
- Wrapper<SystemRoleMenu> wrapper = new QueryWrapper<>(systemRoleMenu);
+ Wrapper<SystemRoleMenu> wrapper = new QueryWrapper<>(systemRoleMenu).last(" limit 1");
return systemRoleMenuMapper.selectOne(wrapper);
}
diff --git a/server/services/src/main/java/com/doumee/service/system/impl/SystemRolePermissionServiceImpl.java b/server/services/src/main/java/com/doumee/service/system/impl/SystemRolePermissionServiceImpl.java
index d12a9d2..f86e07e 100644
--- a/server/services/src/main/java/com/doumee/service/system/impl/SystemRolePermissionServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/system/impl/SystemRolePermissionServiceImpl.java
@@ -81,7 +81,7 @@
@Override
public SystemRolePermission findOne(SystemRolePermission systemRolePermission) {
- Wrapper<SystemRolePermission> wrapper = new QueryWrapper<>(systemRolePermission);
+ Wrapper<SystemRolePermission> wrapper = new QueryWrapper<>(systemRolePermission).last(" limit 1");
return systemRolePermissionMapper.selectOne(wrapper);
}
diff --git a/server/services/src/main/java/com/doumee/service/system/impl/SystemRoleServiceImpl.java b/server/services/src/main/java/com/doumee/service/system/impl/SystemRoleServiceImpl.java
index 061ce29..80a65c3 100644
--- a/server/services/src/main/java/com/doumee/service/system/impl/SystemRoleServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/system/impl/SystemRoleServiceImpl.java
@@ -86,7 +86,7 @@
@Override
public SystemRole findOne(SystemRole systemRole) {
- Wrapper<SystemRole> wrapper = new QueryWrapper<>(systemRole);
+ Wrapper<SystemRole> wrapper = new QueryWrapper<>(systemRole).last(" limit 1");
return systemRoleMapper.selectOne(wrapper);
}
diff --git a/server/services/src/main/java/com/doumee/service/system/impl/SystemTraceLogServiceImpl.java b/server/services/src/main/java/com/doumee/service/system/impl/SystemTraceLogServiceImpl.java
index 2227abb..0954c3b 100644
--- a/server/services/src/main/java/com/doumee/service/system/impl/SystemTraceLogServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/system/impl/SystemTraceLogServiceImpl.java
@@ -65,7 +65,7 @@
@Override
public SystemTraceLog findOne(SystemTraceLog systemTraceLog) {
- Wrapper<SystemTraceLog> wrapper = new QueryWrapper<>(systemTraceLog);
+ Wrapper<SystemTraceLog> wrapper = new QueryWrapper<>(systemTraceLog).last(" limit 1");
return systemTraceLogMapper.selectOne(wrapper);
}
diff --git a/server/services/src/main/java/com/doumee/service/system/impl/SystemUserRoleServiceImpl.java b/server/services/src/main/java/com/doumee/service/system/impl/SystemUserRoleServiceImpl.java
index b5e7b8d..ca3d402 100644
--- a/server/services/src/main/java/com/doumee/service/system/impl/SystemUserRoleServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/system/impl/SystemUserRoleServiceImpl.java
@@ -81,7 +81,7 @@
@Override
public SystemUserRole findOne(SystemUserRole systemUserRole) {
- Wrapper<SystemUserRole> wrapper = new QueryWrapper<>(systemUserRole);
+ Wrapper<SystemUserRole> wrapper = new QueryWrapper<>(systemUserRole).last(" limit 1");
return systemUserRoleMapper.selectOne(wrapper);
}
--
Gitblit v1.9.3