From 421ee711aa469f00eaff610cfa85ad1d4b755688 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 19 十月 2023 08:49:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MdmCountConfigServiceImpl.java | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MdmCountConfigServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MdmCountConfigServiceImpl.java
index cf22c3e..3ebe012 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MdmCountConfigServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MdmCountConfigServiceImpl.java
@@ -6,14 +6,17 @@
import com.vci.ubcs.system.entity.MdmCountConfig;
import com.vci.ubcs.system.mapper.MdmCountConfigMapper;
import com.vci.ubcs.system.service.IMdmCountConfigService;
+import com.vci.ubcs.system.vo.MdmCountConfigVO;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.sql.Wrapper;
import java.util.Date;
+import java.util.stream.Collectors;
/**
* 涓绘暟鎹粺璁￠椤甸厤缃湇鍔�
@@ -23,28 +26,47 @@
@Service
public class MdmCountConfigServiceImpl extends ServiceImpl<MdmCountConfigMapper, MdmCountConfig> implements IMdmCountConfigService {
+ /**
+ * 淇濆瓨鐢ㄦ埛閰嶇疆鐨勪富鏁版嵁缁熻椤�
+ * @param mdmCountConfigVO
+ * @return
+ */
@Override
- public boolean saveMdmCountConfig(MdmCountConfig mdmCountConfig) throws ServiceException{
- if(Func.isEmpty(mdmCountConfig) || Func.isBlank(mdmCountConfig.getUserId().toString())){
+ public R saveMdmCountConfig(MdmCountConfigVO mdmCountConfigVO) throws ServiceException{
+ if(Func.isEmpty(mdmCountConfigVO) || Func.isBlank(mdmCountConfigVO.getUserId().toString())){
throw new ServiceException("涓绘暟鎹粺璁￠厤缃繚瀛樻椂缂哄皯蹇呭～鍙傛暟!");
+ }
+ if(mdmCountConfigVO.getMdmNameList().isEmpty()) {
+ return R.status(false);
+ }
+ if(mdmCountConfigVO.getMdmNameList().size() > 7){
+ return R.fail("鏄剧ず鐨勪富鏁版嵁閰嶇疆椤规渶澶氫负8椤�");
}
boolean res = false;
try {
- MdmCountConfig mdmCountConfigDB = getMdmCountConfig(mdmCountConfig.getUserId().toString());
+ String mdmNames = mdmCountConfigVO.getMdmNameList().stream().collect(Collectors.joining(","));
+ MdmCountConfig mdmCountConfigDB = getMdmCountConfig(mdmCountConfigVO.getUserId().toString());
+ MdmCountConfig mdmCountConfig = new MdmCountConfig();
//鏂板
- if(Func.isBlank(mdmCountConfig.getId().toString())){
- Func.copy(mdmCountConfig,mdmCountConfigDB);
+ if(Func.isEmpty(mdmCountConfigDB)){
+ mdmCountConfig.setUserId(mdmCountConfigVO.getUserId());
}else {
//淇敼
- mdmCountConfigDB.setMdmName(mdmCountConfig.getMdmName());
+ Func.copy(mdmCountConfigDB,mdmCountConfig);
}
- res = this.saveOrUpdate(mdmCountConfigDB);
+ mdmCountConfig.setMdmName(mdmNames);
+ res = this.saveOrUpdate(mdmCountConfig);
}catch (Exception e){
throw new ServiceException("閰嶇疆淇濆瓨澶辫触,鍘熷洜锛�"+e.getCause());
}
- return res;
+ return R.status(res);
}
+ /**
+ * 鑾峰彇褰撳墠鐢ㄦ埛鏈夐偅浜涗富鏁版嵁缁熻閰嶇疆鍦ㄩ椤�
+ * @param userId
+ * @return
+ */
@Override
public MdmCountConfig getMdmCountConfig(String userId) {
LambdaQueryWrapper<MdmCountConfig> wrapper = Wrappers.<MdmCountConfig>query().
--
Gitblit v1.9.3