From efcdc8c49b0452d9c7f192ab351da09bf8aafc80 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 27 五月 2024 18:34:58 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerLogServiceImpl.java | 79 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 77 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerLogServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerLogServiceImpl.java
index c9e8154..312a77c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerLogServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerLogServiceImpl.java
@@ -1,20 +1,33 @@
package com.doumee.service.business.impl;
+import com.doumee.biz.system.SystemDictDataBiz;
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.HiddenDangerLogMapper;
+import com.doumee.dao.business.HiddenDangerMapper;
+import com.doumee.dao.business.dao.CompanyMapper;
+import com.doumee.dao.business.join.HiddenDangerLogJoinMapper;
+import com.doumee.dao.business.model.Company;
+import com.doumee.dao.business.model.HiddenDanger;
import com.doumee.dao.business.model.HiddenDangerLog;
+import com.doumee.dao.business.model.Member;
+import com.doumee.dao.system.SystemUserMapper;
+import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.HiddenDangerLogService;
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.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.List;
+import java.util.Objects;
/**
* 鐞嗚碃鎿嶄綔鍘嗗彶琛⊿ervice瀹炵幇
@@ -26,6 +39,21 @@
@Autowired
private HiddenDangerLogMapper hiddenDangerLogMapper;
+
+ @Autowired
+ private HiddenDangerMapper hiddenDangerMapper;
+
+ @Autowired
+ private HiddenDangerLogJoinMapper hiddenDangerLogJoinMapper;
+
+ @Autowired
+ private SystemUserMapper systemUserMapper;
+
+ @Autowired
+ private CompanyMapper companyMapper;
+
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
@Override
public Integer create(HiddenDangerLog hiddenDangerLog) {
@@ -80,8 +108,55 @@
@Override
public List<HiddenDangerLog> findList(HiddenDangerLog hiddenDangerLog) {
- QueryWrapper<HiddenDangerLog> wrapper = new QueryWrapper<>(hiddenDangerLog);
- return hiddenDangerLogMapper.selectList(wrapper);
+ List<HiddenDangerLog> hiddenDangerLogList = hiddenDangerLogJoinMapper.selectJoinList(HiddenDangerLog.class,
+ new MPJLambdaWrapper<HiddenDangerLog>()
+ .selectAll(HiddenDangerLog.class)
+ .selectAs(SystemUser::getRealname,HiddenDangerLog::getCreateUserName)
+ .selectAs(SystemUser::getAvatar,HiddenDangerLog::getAvatar)
+ .selectAs(Company::getCompanyNamePath,HiddenDangerLog::getCompanyName)
+ .leftJoin(SystemUser.class,SystemUser::getId,HiddenDangerLog::getCreator)
+ .leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
+ .eq(Objects.nonNull(hiddenDangerLog.getHiddenDangerId()),HiddenDangerLog::getHiddenDangerId,hiddenDangerLog.getHiddenDangerId())
+ .eq(Objects.isNull(hiddenDangerLog.getHiddenDangerId()),"1",2)
+ .eq(HiddenDangerLog::getIsdeleted, Constants.ZERO)
+ .orderByAsc(HiddenDangerLog::getCreateDate)
+ );
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(hiddenDangerLogList)){
+ HiddenDanger hiddenDanger = hiddenDangerMapper.selectById(hiddenDangerLog.getHiddenDangerId());
+ if(Objects.isNull(hiddenDanger)){
+ return null;
+ }
+ HiddenDangerLog newBean = new HiddenDangerLog();
+ newBean.setCreateUserName("-");
+ newBean.setCompanyName("-");
+ newBean.setTitle("闅愭偅澶勭悊");
+ newBean.setAvatar("-");
+
+ if(hiddenDanger.getStatus().equals(Constants.ZERO)){
+ //涓嬩竴姝ュ鐞嗕汉
+ SystemUser systemUser = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda().eq(SystemUser::getMemberId,hiddenDanger.getCheckUserId()));
+ if(Objects.nonNull(systemUser)){
+ newBean.setCreateUserName(systemUser.getRealname());
+ newBean.setAvatar(systemUser.getAvatar());
+ Company company = companyMapper.selectById(systemUser.getCompanyId());
+ if(Objects.nonNull(company)){
+ newBean.setCompanyName(company.getCompanyNamePath());
+ }
+ }
+ }
+ hiddenDangerLogList.add(newBean);
+
+ String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+ +systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
+
+ for (HiddenDangerLog bean:hiddenDangerLogList) {
+ if(StringUtils.isNotBlank(bean.getAvatar())){
+ bean.setAvatar(path + bean.getAvatar());
+ }
+ }
+ }
+
+ return hiddenDangerLogList;
}
@Override
--
Gitblit v1.9.3