From 5958922af8160cc8a1134bad861fad1daf0083e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com> Date: Wed, 11 Aug 2021 10:39:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=98=E5=B7=A5=E8=B5=84=E6=BA=90=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mesnac/common/service/UserService.java | 1 + .../service/impl/UserResourceServiceImpl.java | 24 ++++++++++++------- integration/pom.xml | 6 ----- .../mesnac/listener/service/UsrService.java | 3 +-- .../listener/service/impl/UsrServiceImpl.java | 3 ++- .../src/main/resources/mapper/UsrMapper.xml | 11 ++++++--- 6 files changed, 27 insertions(+), 21 deletions(-) diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/UserService.java b/common/src/main/java/com/foreverwin/mesnac/common/service/UserService.java index eeb9af99..f03c422d 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/service/UserService.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/service/UserService.java @@ -11,6 +11,7 @@ import java.util.List; * @Since 2021-08-10 */ public interface UserService { + List findList(String user); IPage findPage(IPage page,String user); diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/UserResourceServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/UserResourceServiceImpl.java index 87a41f73..09272d10 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/UserResourceServiceImpl.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/UserResourceServiceImpl.java @@ -1,9 +1,9 @@ package com.foreverwin.mesnac.dispatch.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.foreverwin.mesnac.common.dto.UsrDto; import com.foreverwin.mesnac.common.enums.HandleEnum; +import com.foreverwin.mesnac.common.service.UserService; import com.foreverwin.mesnac.dispatch.dto.UserResourceDto; import com.foreverwin.mesnac.dispatch.mapper.UserResourceMapper; import com.foreverwin.mesnac.dispatch.model.UserResource; @@ -13,7 +13,6 @@ import com.foreverwin.mesnac.meapi.service.NwaUserService; import com.foreverwin.mesnac.meapi.service.ResrceService; import com.foreverwin.modular.core.exception.BusinessException; import com.foreverwin.modular.core.util.CommonMethods; -import com.foreverwin.modular.core.util.FrontPage; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -45,6 +44,10 @@ public class UserResourceServiceImpl extends ServiceImpl findEmployeeList(String site) { return userResourceMapper.findEmployeeList(site); @@ -62,7 +65,9 @@ public class UserResourceServiceImpl extends ServiceImpl hashMap = new HashMap<>();; - List nwaUserList = nwaUserService.selectList(null); + // List nwaUserList = nwaUserService.selectList(null); + List nwaUserList = userService.findList(null); + List userResourceList = userResourceMapper.findAll(site, resource, userId); hashMap.put("users",nwaUserList); hashMap.put("userResources",userResourceList); @@ -88,14 +93,15 @@ public class UserResourceServiceImpl extends ServiceImpl userByUserName = userService.findList(userResource.getUserId()); if("false".equals(userResource.getTemporaryUser()) && - userByUserName == null){ + userByUserName.size() <= 0){ throw BusinessException.build("第"+(i+1)+"行的用户不存在，必须为临时用户"); - }else if(userByUserName != null){ + }else if(userByUserName != null && userByUserName.size() > 0){ //userByUserName.setFullName(userResource.getUserDescription()); - userResource.setUserDescription(userByUserName.getFullName()); - nwaUserService.saveOrUpdate(userByUserName); + userResource.setUserDescription(userByUserName.get(0).getFullName()); + //nwaUserService.saveOrUpdate(userByUserName); } userResource.setStatus(userResourceDto.getStatus()); userResource.setHandle("UserResourceBo:"+userResource.getSite()+","+ diff --git a/integration/pom.xml b/integration/pom.xml index c8f3bbba..78216c8d 100644 --- a/integration/pom.xml +++ b/integration/pom.xml @@ -34,12 +34,6 @@ com.foreverwin.mesnac meapi - - - com.foreverwin.mesnac - common - - com.foreverwin.mesnac dispatch diff --git a/listener/src/main/java/com/foreverwin/mesnac/listener/service/UsrService.java b/listener/src/main/java/com/foreverwin/mesnac/listener/service/UsrService.java index 19800010..bff21257 100644 --- a/listener/src/main/java/com/foreverwin/mesnac/listener/service/UsrService.java +++ b/listener/src/main/java/com/foreverwin/mesnac/listener/service/UsrService.java @@ -2,7 +2,6 @@ package com.foreverwin.mesnac.listener.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.foreverwin.mesnac.common.service.UserService; import com.foreverwin.mesnac.listener.model.SysUser; import com.foreverwin.mesnac.listener.model.Usr; import com.foreverwin.modular.core.util.FrontPage; @@ -17,7 +16,7 @@ import java.util.List; * @author sungang * @since 2020-10-16 */ -public interface UsrService extends IService, UserService { +public interface UsrService extends IService { /** * 分页查询 diff --git a/listener/src/main/java/com/foreverwin/mesnac/listener/service/impl/UsrServiceImpl.java b/listener/src/main/java/com/foreverwin/mesnac/listener/service/impl/UsrServiceImpl.java index b6484643..6b752c5b 100644 --- a/listener/src/main/java/com/foreverwin/mesnac/listener/service/impl/UsrServiceImpl.java +++ b/listener/src/main/java/com/foreverwin/mesnac/listener/service/impl/UsrServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.foreverwin.mesnac.common.dto.UsrDto; +import com.foreverwin.mesnac.common.service.UserService; import com.foreverwin.mesnac.listener.mapper.UsrMapper; import com.foreverwin.mesnac.listener.model.SysUser; import com.foreverwin.mesnac.listener.model.Usr; @@ -26,7 +27,7 @@ import java.util.List; */ @Service @Transactional(rollbackFor = Exception.class) -public class UsrServiceImpl extends ServiceImpl implements UsrService { +public class UsrServiceImpl extends ServiceImpl implements UsrService,UserService { @Autowired diff --git a/listener/src/main/resources/mapper/UsrMapper.xml b/listener/src/main/resources/mapper/UsrMapper.xml index b40e7fb2..f61d2226 100644 --- a/listener/src/main/resources/mapper/UsrMapper.xml +++ b/listener/src/main/resources/mapper/UsrMapper.xml @@ -616,7 +616,12 @@ SELECT U.USER_ID USER_NAME,ZNU.FULL_NAME FULL_NAME FROM USR U INNER JOIN Z_NWA_USER ZNU ON ZNU.USER_NAME = U.USER_ID - WHERE U.SITE=#{site} AND U.USER_ID = #{user} + WHERE U.SITE=#{site} + + AND ( + U.USER_ID = #{user} + ) +