From 17efddc6a667670dca682bf36b51a43e99615e6d Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 16 十月 2024 15:59:38 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerParamServiceImpl.java | 96 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 78 insertions(+), 18 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerParamServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerParamServiceImpl.java
index 437393f..696ce97 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerParamServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerParamServiceImpl.java
@@ -9,23 +9,25 @@
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.HiddenDangerParamMapper;
import com.doumee.dao.business.MemberMapper;
-import com.doumee.dao.business.model.CarDriver;
-import com.doumee.dao.business.model.HiddenDangerParam;
-import com.doumee.dao.business.model.Member;
+import com.doumee.dao.business.model.*;
import com.doumee.service.business.HiddenDangerParamService;
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 io.swagger.models.auth.In;
import org.apache.commons.lang3.StringUtils;
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.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
/**
* 闅愭偅鍖哄煙閰嶇疆绫诲瀷淇℃伅琛⊿ervice瀹炵幇
@@ -45,20 +47,28 @@
if(loginUserInfo == null){
loginUserInfo = model.getLoginUserInfo();
}
+ if(hiddenDangerParamMapper.selectCount(new QueryWrapper<HiddenDangerParam>().lambda()
+ .eq(HiddenDangerParam::getType,model.getType())
+ .eq(HiddenDangerParam::getName,model.getName())
+ .eq(HiddenDangerParam::getIsdeleted,Constants.ZERO)
+ )>Constants.ZERO){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ュ悕绉板凡瀛樺湪!");
+ }
if(Constants.equalsInteger(model.getType(),Constants.ZERO)){
//濡傛灉鏄尯鍩熼厤缃�
- List<Integer> ids = Constants.getIntegerListByStrs(model.getMemberIds());
+ List<Integer> ids = model.getMemberIdList();
if(ids==null || ids.size() ==0){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝瀹夊叏鍛樹俊鎭笉姝ｇ‘锛岃鎸夎姹傚～鍐欏唴瀹癸紒");
}
List<Member> memberList = memberMapper.selectList(new QueryWrapper<Member>().lambda()
.eq(Member::getType,Constants.TWO)
+ .in(Member::getId,ids)
.eq(Member::getIsdeleted,Constants.ZERO));
if(memberList == null || memberList.size() == 0 || memberList.size() != ids.size() ){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇烽�夋嫨姝ｇ‘鐨勫畨鍏ㄥ憳淇℃伅锛�");
}
- String names = null;
- String idss = null;
+ String names = "";
+ String idss = "";
for(Member member : memberList){
if(StringUtils.isNotBlank(names)){
names += ",";
@@ -67,7 +77,7 @@
idss += ",";
}
names += member.getName();
- names += member.getId();
+ idss += member.getId();
}
model.setMemberNames(names);
model.setMemberIds(idss);
@@ -78,6 +88,7 @@
model.setEditDate(new Date());
model.setEditor(loginUserInfo.getId());
model.setStatus(Constants.ZERO);
+ model.setIsdeleted(Constants.ZERO);
hiddenDangerParamMapper.insert(model);
return model.getId();
}
@@ -115,23 +126,32 @@
loginUserInfo = model.getLoginUserInfo();
}
HiddenDangerParam hiddenDangerParam = hiddenDangerParamMapper.selectById(model.getId());
- if(hiddenDangerParam == null || Constants.equalsObject(hiddenDangerParam.getIsdeleted(),Constants.ONE)){
+ if(hiddenDangerParam == null || Constants.equalsInteger(hiddenDangerParam.getIsdeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝璇ラ厤缃俊鎭笉瀛樺湪锛岃杩斿洖鍒锋柊椤甸潰閲嶈瘯锛�");
+ }
+ if(hiddenDangerParamMapper.selectCount(new QueryWrapper<HiddenDangerParam>().lambda()
+ .eq(HiddenDangerParam::getType,model.getType())
+ .eq(HiddenDangerParam::getName,model.getName())
+ .eq(HiddenDangerParam::getIsdeleted,Constants.ZERO)
+ .ne(HiddenDangerParam::getId,model.getId())
+ )>Constants.ZERO){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ュ悕绉板凡瀛樺湪!");
}
if(Constants.equalsInteger(hiddenDangerParam.getType(),Constants.ZERO)){
//濡傛灉鏄尯鍩熼厤缃�,鏍￠獙瀹夊叏鍛樹俊鎭槸鍚︽纭�
- List<Integer> ids = Constants.getIntegerListByStrs(model.getMemberIds());
+ List<Integer> ids =model.getMemberIdList();
if(ids==null || ids.size() ==0){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝瀹夊叏鍛樹俊鎭笉姝ｇ‘锛岃鎸夎姹傚～鍐欏唴瀹癸紒");
}
List<Member> memberList = memberMapper.selectList(new QueryWrapper<Member>().lambda()
.eq(Member::getType,Constants.TWO)
+ .in(Member::getId,ids)
.eq(Member::getIsdeleted,Constants.ZERO));
if(memberList == null || memberList.size() == 0 || memberList.size() != ids.size() ){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇烽�夋嫨姝ｇ‘鐨勫畨鍏ㄥ憳淇℃伅锛�");
}
- String names = null;
- String idss = null;
+ String names = "";
+ String idss = "";
for(Member member : memberList){
if(StringUtils.isNotBlank(names)){
names += ",";
@@ -140,7 +160,7 @@
idss += ",";
}
names += member.getName();
- names += member.getId();
+ idss += member.getId();
}
model.setMemberNames(names);
model.setMemberIds(idss);
@@ -175,7 +195,10 @@
@Override
public List<HiddenDangerParam> findList(HiddenDangerParam hiddenDangerParam) {
+
+ hiddenDangerParam.setIsdeleted(Constants.ZERO);
QueryWrapper<HiddenDangerParam> wrapper = new QueryWrapper<>(hiddenDangerParam);
+ wrapper.lambda().orderByAsc(HiddenDangerParam::getSortnum);
return hiddenDangerParamMapper.selectList(wrapper);
}
@@ -188,13 +211,9 @@
queryWrapper.lambda()
.eq(pageWrap.getModel().getId() != null, HiddenDangerParam::getId, pageWrap.getModel().getId())
.eq(pageWrap.getModel().getCreator() != null, HiddenDangerParam::getCreator, pageWrap.getModel().getCreator())
- .ge(pageWrap.getModel().getCreateDate() != null, HiddenDangerParam::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()))
- .le(pageWrap.getModel().getCreateDate() != null, HiddenDangerParam::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()))
.eq(pageWrap.getModel().getEditor() != null, HiddenDangerParam::getEditor, pageWrap.getModel().getEditor())
- .ge(pageWrap.getModel().getEditDate() != null, HiddenDangerParam::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()))
- .le(pageWrap.getModel().getEditDate() != null, HiddenDangerParam::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()))
.eq(pageWrap.getModel().getIsdeleted() != null, HiddenDangerParam::getIsdeleted, pageWrap.getModel().getIsdeleted())
- .eq(pageWrap.getModel().getName() != null, HiddenDangerParam::getName, pageWrap.getModel().getName())
+ .like(pageWrap.getModel().getName() != null, HiddenDangerParam::getName, pageWrap.getModel().getName())
.eq(pageWrap.getModel().getRemark() != null, HiddenDangerParam::getRemark, pageWrap.getModel().getRemark())
.eq(pageWrap.getModel().getStatus() != null, HiddenDangerParam::getStatus, pageWrap.getModel().getStatus())
.eq(pageWrap.getModel().getSortnum() != null, HiddenDangerParam::getSortnum, pageWrap.getModel().getSortnum())
@@ -202,7 +221,9 @@
.eq(pageWrap.getModel().getMemberIds() != null, HiddenDangerParam::getMemberIds, pageWrap.getModel().getMemberIds())
.eq(pageWrap.getModel().getMemberNames() != null, HiddenDangerParam::getMemberNames, pageWrap.getModel().getMemberNames())
.eq(pageWrap.getModel().getType() != null, HiddenDangerParam::getType, pageWrap.getModel().getType())
+ .orderByAsc(HiddenDangerParam::getSortnum)
.orderByDesc(HiddenDangerParam::getCreateDate)
+ .eq( HiddenDangerParam::getIsdeleted, Constants.ZERO)
;
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
@@ -211,7 +232,9 @@
queryWrapper.orderByAsc(sortData.getProperty());
}
}
- return PageData.from(hiddenDangerParamMapper.selectPage(page, queryWrapper));
+ PageData<HiddenDangerParam> result = PageData.from(hiddenDangerParamMapper.selectPage(page, queryWrapper));
+
+ return result;
}
@Override
@@ -219,4 +242,41 @@
QueryWrapper<HiddenDangerParam> wrapper = new QueryWrapper<>(hiddenDangerParam);
return hiddenDangerParamMapper.selectCount(wrapper);
}
+ @Override
+ public List<Member> findHiddenAreaMemberList(HiddenDangerParam pageWrap) {
+ HiddenDangerParam hiddenDangerParam = new HiddenDangerParam();
+ hiddenDangerParam.setIsdeleted(Constants.ZERO);
+ if(Objects.nonNull(pageWrap.getId())){
+ hiddenDangerParam.setId(pageWrap.getId());
+ }
+ QueryWrapper<HiddenDangerParam> wrapper = new QueryWrapper<>(hiddenDangerParam);
+ List<HiddenDangerParam> list = hiddenDangerParamMapper.selectList(wrapper);
+ List<Member> memberList = new ArrayList<>();
+ if(list!=null){
+ List<Integer> idList = new ArrayList<>();
+ for(HiddenDangerParam m : list){
+ String ids = m.getMemberIds();
+ if(StringUtils.isNotBlank(ids)){
+ String[] t = ids.split(",");
+ for(String d : t){
+ try {
+ idList.add(Integer.parseInt(d));
+ }catch (Exception e){}
+ }
+ }
+ }
+ if(idList.size()>0){
+ memberList = memberMapper.selectJoinList(Member.class,new MPJLambdaWrapper<Member>().
+ selectAll(Member.class)
+ .selectAs(Company::getCompanyNamePath,Member::getCompanyName)
+ .leftJoin(Company.class, Company::getId,Member::getCompanyId)
+ .eq(Member::getType,Constants.TWO)
+ .eq(Member::getIsdeleted,Constants.ZERO)
+ .like(StringUtils.isNotBlank(pageWrap.getName()),Member::getName,pageWrap.getName())
+ .in(Member::getId,idList)
+ );
+ }
+ }
+ return memberList;
+ }
}
--
Gitblit v1.9.3