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/RentSiteServiceImpl.java | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
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));
}
--
Gitblit v1.9.3