From 59454f195ab6ab42cf537da5a70e7e5f21052705 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, 18 Aug 2021 19:33:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?userResource=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataimport/handler/UserResourceHandler.java | 17 ++++++++++++----- .../service/impl/UserResourceServiceImpl.java | 2 ++ 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dataimport/src/main/java/com/foreverwin/mesnac/dataimport/handler/UserResourceHandler.java b/dataimport/src/main/java/com/foreverwin/mesnac/dataimport/handler/UserResourceHandler.java index 65043a50..1df51c7d 100644 --- a/dataimport/src/main/java/com/foreverwin/mesnac/dataimport/handler/UserResourceHandler.java +++ b/dataimport/src/main/java/com/foreverwin/mesnac/dataimport/handler/UserResourceHandler.java @@ -1,7 +1,9 @@ package com.foreverwin.mesnac.dataimport.handler; import com.alibaba.fastjson.JSONObject; +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.common.util.StringUtil; import com.foreverwin.mesnac.dataimport.handler.base.BaseHandler; import com.foreverwin.mesnac.dataimport.reader.FileReader; @@ -13,7 +15,6 @@ import com.foreverwin.mesnac.dispatch.model.UserResource; import com.foreverwin.mesnac.dispatch.service.UserResourceService; import com.foreverwin.mesnac.meapi.mapper.NwaUserMapper; import com.foreverwin.mesnac.meapi.mapper.ResrceMapper; -import com.foreverwin.mesnac.meapi.model.NwaUser; import com.foreverwin.mesnac.meapi.model.Resrce; import com.foreverwin.modular.core.util.CommonMethods; import com.foreverwin.modular.core.util.I18nUtil; @@ -21,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired; import java.io.InputStream; import java.time.LocalDateTime; +import java.util.List; import java.util.Map; @@ -43,6 +45,9 @@ public class UserResourceHandler extends BaseHandler { @Autowired private UserResourceMapper userResourceMapper; + @Autowired + private UserService userService; + @Override public String importFile(String site, InputStream inputStream, String fileType, String mode) throws Exception { int row = 0; @@ -144,7 +149,7 @@ public class UserResourceHandler extends BaseHandler { }; } - String updateAndInsert(UserResource userResource,Long index){ + String updateAndInsert(UserResource userResource, Long index){ //判断资源是否存在 Resrce resrce = resrceMapper.selectById(userResource.getResourceBo()); @@ -153,10 +158,12 @@ public class UserResourceHandler extends BaseHandler { } //设置资源描述 userResource.setResrceDescription(resrce.getDescription()); + userResource.setExistUser("false"); //设置员工描述 - NwaUser nwaUser = nwaUserMapper.selectById(HandleEnum.USER.getHandle(userResource.getSite(), userResource.getUserId())); - if(nwaUser != null){ - userResource.setUserDescription(nwaUser.getFullName()); + List userList = userService.findList(userResource.getUserId()); + if(userList != null && userList.size() > 0){ + userResource.setUserDescription(userList.get(0).getFullName()); + userResource.setExistUser("true"); }else if("true".equals(userResource.getTemporaryUser())){ //不做任何操作 }else{ 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 2f557530..583eb51c 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 @@ -106,6 +106,7 @@ public class UserResourceServiceImpl extends ServiceImpl userByUserName = userService.findList(userResource.getUserId()); if("false".equals(userResource.getTemporaryUser()) && @@ -114,6 +115,7 @@ public class UserResourceServiceImpl extends ServiceImpl 0){ //userByUserName.setFullName(userResource.getUserDescription()); userResource.setUserDescription(userByUserName.get(0).getFullName()); + userResource.setExistUser("true"); //nwaUserService.saveOrUpdate(userByUserName); } userResource.setStatus(userResourceDto.getStatus()); From e5e48ecaf2d19f185a42b7ae71bbae2726fb1963 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com> Date: Thu, 19 Aug 2021 13:41:25 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- integration/src/main/resources/mapper/IntegrationLogMapper.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/integration/src/main/resources/mapper/IntegrationLogMapper.xml b/integration/src/main/resources/mapper/IntegrationLogMapper.xml index 5191bc5f..fb9fd932 100644 --- a/integration/src/main/resources/mapper/IntegrationLogMapper.xml +++ b/integration/src/main/resources/mapper/IntegrationLogMapper.xml @@ -483,5 +483,6 @@ AND REQUEST_DATE_TIME <= #{integration.endDateTime} + ORDER BY REQUEST_DATE_TIME DESC