From 5af3e49dd60158bfe819135f7cbb45438ca015e2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 15 七月 2025 15:18:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/service/business/impl/ReceiveWeightServiceImpl.java | 112 ++++++++++++++++++++++++++++++-------------------------
1 files changed, 61 insertions(+), 51 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/ReceiveWeightServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/ReceiveWeightServiceImpl.java
index 14fd298..48f288f 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/ReceiveWeightServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/ReceiveWeightServiceImpl.java
@@ -1,20 +1,31 @@
package com.doumee.service.business.impl;
+import com.doumee.core.constants.Constants;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.ReceiveWeightMapper;
+import com.doumee.dao.business.model.Category;
import com.doumee.dao.business.model.ReceiveWeight;
+import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.ReceiveWeightService;
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.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
/**
* 鎺ュ崟鏉冮噸閰嶇疆琛⊿ervice瀹炵幇
@@ -28,14 +39,35 @@
private ReceiveWeightMapper receiveWeightMapper;
@Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
public Integer create(ReceiveWeight receiveWeight) {
+ if(Objects.isNull(receiveWeight)
+ || Objects.isNull(receiveWeight.getReceiveMin())
+ || Objects.isNull(receiveWeight.getReceiveMax())
+ || Objects.isNull(receiveWeight.getLevel())
+ || Objects.isNull(receiveWeight.getDelayTime())
+ || receiveWeight.getLevel() < 1 || receiveWeight.getLevel() > 10
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ receiveWeight.setCreateTime(new Date());
+ receiveWeight.setCreateUser(loginUserInfo.getId());
+ receiveWeight.setUpdateTime(receiveWeight.getCreateTime());
+ receiveWeight.setUpdateUser(loginUserInfo.getId());
+ receiveWeight.setDeleted(Constants.ZERO);
+ //鏌ヨ浼樺厛绾ф槸鍚﹀凡瀛樺湪
+ if(receiveWeightMapper.selectCount(new QueryWrapper<ReceiveWeight>().lambda()
+ .eq(ReceiveWeight::getDeleted,Constants.ZERO).eq(ReceiveWeight::getLevel,receiveWeight.getLevel()))>Constants.ZERO){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浼樺厛绾у凡瀛樺湪");
+ }
receiveWeightMapper.insert(receiveWeight);
return receiveWeight.getId();
}
@Override
public void deleteById(Integer id) {
- receiveWeightMapper.deleteById(id);
+ receiveWeightMapper.update(new UpdateWrapper<ReceiveWeight>().lambda().set(ReceiveWeight::getDeleted,Constants.ONE).eq(ReceiveWeight::getId,id));
}
@Override
@@ -53,7 +85,27 @@
}
@Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
public void updateById(ReceiveWeight receiveWeight) {
+ if(Objects.isNull(receiveWeight)
+ || Objects.isNull(receiveWeight.getId())
+ || Objects.isNull(receiveWeight.getReceiveMin())
+ || Objects.isNull(receiveWeight.getReceiveMax())
+ || Objects.isNull(receiveWeight.getLevel())
+ || Objects.isNull(receiveWeight.getDelayTime())
+ || receiveWeight.getLevel() < 1 || receiveWeight.getLevel() > 10
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ receiveWeight.setUpdateTime(receiveWeight.getCreateTime());
+ receiveWeight.setUpdateUser(loginUserInfo.getId());
+ receiveWeight.setDeleted(Constants.ZERO);
+ //鏌ヨ浼樺厛绾ф槸鍚﹀凡瀛樺湪
+ if(receiveWeightMapper.selectCount(new QueryWrapper<ReceiveWeight>().lambda().ne(ReceiveWeight::getId,receiveWeight.getId())
+ .eq(ReceiveWeight::getDeleted,Constants.ZERO).eq(ReceiveWeight::getLevel,receiveWeight.getLevel()))>Constants.ZERO){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浼樺厛绾у凡瀛樺湪");
+ }
receiveWeightMapper.updateById(receiveWeight);
}
@@ -87,57 +139,15 @@
@Override
public PageData<ReceiveWeight> findPage(PageWrap<ReceiveWeight> pageWrap) {
IPage<ReceiveWeight> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<ReceiveWeight> queryWrapper = new QueryWrapper<>();
+ MPJLambdaWrapper<ReceiveWeight> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
- if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(ReceiveWeight::getId, pageWrap.getModel().getId());
- }
- if (pageWrap.getModel().getDeleted() != null) {
- queryWrapper.lambda().eq(ReceiveWeight::getDeleted, pageWrap.getModel().getDeleted());
- }
- if (pageWrap.getModel().getStatus() != null) {
- queryWrapper.lambda().eq(ReceiveWeight::getStatus, pageWrap.getModel().getStatus());
- }
- if (pageWrap.getModel().getCreateUser() != null) {
- queryWrapper.lambda().eq(ReceiveWeight::getCreateUser, pageWrap.getModel().getCreateUser());
- }
- if (pageWrap.getModel().getCreateTime() != null) {
- queryWrapper.lambda().ge(ReceiveWeight::getCreateTime, Utils.Date.getStart(pageWrap.getModel().getCreateTime()));
- queryWrapper.lambda().le(ReceiveWeight::getCreateTime, Utils.Date.getEnd(pageWrap.getModel().getCreateTime()));
- }
- if (pageWrap.getModel().getUpdateUser() != null) {
- queryWrapper.lambda().eq(ReceiveWeight::getUpdateUser, pageWrap.getModel().getUpdateUser());
- }
- if (pageWrap.getModel().getUpdateTime() != null) {
- queryWrapper.lambda().ge(ReceiveWeight::getUpdateTime, Utils.Date.getStart(pageWrap.getModel().getUpdateTime()));
- queryWrapper.lambda().le(ReceiveWeight::getUpdateTime, Utils.Date.getEnd(pageWrap.getModel().getUpdateTime()));
- }
- if (pageWrap.getModel().getRemark() != null) {
- queryWrapper.lambda().eq(ReceiveWeight::getRemark, pageWrap.getModel().getRemark());
- }
- if (pageWrap.getModel().getReceiveMax() != null) {
- queryWrapper.lambda().eq(ReceiveWeight::getReceiveMax, pageWrap.getModel().getReceiveMax());
- }
- if (pageWrap.getModel().getReceiveMin() != null) {
- queryWrapper.lambda().eq(ReceiveWeight::getReceiveMin, pageWrap.getModel().getReceiveMin());
- }
- if (pageWrap.getModel().getLevel() != null) {
- queryWrapper.lambda().eq(ReceiveWeight::getLevel, pageWrap.getModel().getLevel());
- }
- if (pageWrap.getModel().getDelayTime() != null) {
- queryWrapper.lambda().eq(ReceiveWeight::getDelayTime, pageWrap.getModel().getDelayTime());
- }
- if (pageWrap.getModel().getSortnum() != null) {
- queryWrapper.lambda().eq(ReceiveWeight::getSortnum, pageWrap.getModel().getSortnum());
- }
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
- }
- }
- return PageData.from(receiveWeightMapper.selectPage(page, queryWrapper));
+ queryWrapper.selectAll(ReceiveWeight.class)
+ .selectAs(SystemUser::getRealname,ReceiveWeight::getUpdateUserName)
+ .leftJoin(SystemUser.class,SystemUser::getId,ReceiveWeight::getUpdateUser)
+ .eq(ReceiveWeight::getDeleted,Constants.ZERO)
+ .orderByDesc(ReceiveWeight::getLevel);
+ PageData<ReceiveWeight> result =PageData.from(receiveWeightMapper.selectJoinPage(page, ReceiveWeight.class,queryWrapper));
+ return result;
}
@Override
--
Gitblit v1.9.3