From bc396cb187aa7633b6dd1a3ab63773cc8976a41c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 13 十月 2023 17:24:22 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/preselect into dev
---
server/service/src/main/java/com/doumee/service/business/impl/WebParamServiceImpl.java | 61 +++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 2 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/WebParamServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/WebParamServiceImpl.java
index e3f920e..0fc1495 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/WebParamServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/WebParamServiceImpl.java
@@ -1,8 +1,12 @@
package com.doumee.service.business.impl;
+import com.doumee.biz.system.SystemDictDataBiz;
+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.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.WebParamMapper;
import com.doumee.dao.business.model.WebParam;
@@ -12,6 +16,7 @@
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.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,13 +38,40 @@
@Autowired
private WebParamMapper webParamMapper;
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
+
@Override
public WebParam findOne() {
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
QueryWrapper<WebParam> wrapper = new QueryWrapper<>();
wrapper.eq("COMPANY_ID",user.getCompanyId());
wrapper.last(" limit 1 ");
- return webParamMapper.selectOne(wrapper);
+ WebParam webParam = webParamMapper.selectOne(wrapper);
+ if(!Objects.isNull(webParam)){
+ webParam.setResourcePath(systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode() +
+ systemDictDataBiz.queryByCode(Constants.OSS,Constants.WEB_PARAM).getCode());
+ }else{
+ webParam = new WebParam();
+ webParam.setResourcePath(systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode() +
+ systemDictDataBiz.queryByCode(Constants.OSS,Constants.WEB_PARAM).getCode());
+ webParam.setBgImg(systemDictDataBiz.queryByCode(Constants.WEB_PARAM,Constants.BG_IMG).getCode());
+ webParam.setTopImg(systemDictDataBiz.queryByCode(Constants.WEB_PARAM,Constants.TOP_IMG).getCode());
+ webParam.setPkImg(systemDictDataBiz.queryByCode(Constants.WEB_PARAM,Constants.PK_IMG).getCode());
+ webParam.setMainColor(systemDictDataBiz.queryByCode(Constants.WEB_PARAM,Constants.MAIN_COLOR).getCode());
+ webParam.setRangeSize(systemDictDataBiz.queryByCode(Constants.WEB_PARAM,Constants.RANGE_SIZE).getCode());
+ }
+ return webParam;
+ }
+
+ @Override
+ public WebParam findOneNew() {
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ QueryWrapper<WebParam> wrapper = new QueryWrapper<>();
+ wrapper.lambda().eq(WebParam::getCompanyId,user.getCompanyId());
+ wrapper.last(" limit 1 ");
+ WebParam webParam = webParamMapper.selectOne(wrapper);
+ return webParam;
}
@@ -54,6 +86,7 @@
webParam = new WebParam();
BeanUtils.copyProperties(updateWebParamDTO,webParam);
webParam.setCreateTime(new Date());
+ webParam.setDeleted(Constants.ZERO);
webParam.setCompanyId(user.getCompanyId());
webParam.setCreateUser(user.getId());
webParamMapper.insert(webParam);
@@ -64,6 +97,30 @@
webParamMapper.updateById(webParam);
}
}
-
+ @Override
+ public void renewUpdate(UpdateWebParamDTO updateWebParamDTO){
+ if(StringUtils.isBlank(updateWebParamDTO.getNewParam())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ QueryWrapper<WebParam> wrapper = new QueryWrapper<>();
+ wrapper.lambda().eq(WebParam::getCompanyId,user.getCompanyId());
+ wrapper.last(" limit 1 ");
+ WebParam webParam = webParamMapper.selectOne(wrapper);
+ if(Objects.isNull(webParam)){
+ webParam = new WebParam();
+ BeanUtils.copyProperties(updateWebParamDTO,webParam);
+ webParam.setCreateTime(new Date());
+ webParam.setDeleted(Constants.ZERO);
+ webParam.setCompanyId(user.getCompanyId());
+ webParam.setCreateUser(user.getId());
+ webParamMapper.insert(webParam);
+ }else{
+ BeanUtils.copyProperties(updateWebParamDTO,webParam);
+ webParam.setUpdateUser(user.getId());
+ webParam.setUpdateTime(new Date());
+ webParamMapper.updateById(webParam);
+ }
+ }
}
--
Gitblit v1.9.3