diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/UserResourceController.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/UserResourceController.java
index dcaf5eb6..c383a4a4 100644
--- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/UserResourceController.java
+++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/UserResourceController.java
@@ -19,8 +19,8 @@ import java.util.Map;
/**
*
- * @author robert
- * @since 2021-06-24
+ * @author zjw
+ * @since 2021-08-18
*/
@RestController
@RequestMapping("/Z-USER-RESOURCE")
@@ -32,7 +32,6 @@ public class UserResourceController {
@Autowired
public UserService userService;
-
/**
* 根据id查询
*
@@ -86,6 +85,7 @@ public class UserResourceController {
.or().like(UserResource::getStatus, frontPage.getGlobalQuery())
.or().like(UserResource::getCreatedUser, frontPage.getGlobalQuery())
.or().like(UserResource::getModifiedUser, frontPage.getGlobalQuery())
+ .or().like(UserResource::getExistUser, frontPage.getGlobalQuery())
);
}
result = userResourceService.page(frontPage.getPagePlus(), queryWrapper);
diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/UserResourceMapper.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/UserResourceMapper.java
index 3eccf20a..3d01bf33 100644
--- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/UserResourceMapper.java
+++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/UserResourceMapper.java
@@ -14,8 +14,8 @@ import java.util.List;
* Mapper 接口
*
*
- * @author robert
- * @since 2021-06-24
+ * @author zjw
+ * @since 2021-08-18
*/
@Repository
public interface UserResourceMapper extends BaseMapper {
@@ -27,4 +27,6 @@ public interface UserResourceMapper extends BaseMapper {
List findAll(@Param("site") String site, @Param("resource") String resource, @Param("userId") String userId);
void deleteByUserAndResource(@Param("user")String user,@Param("resource")String resource);
+
+
}
\ No newline at end of file
diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/UserResource.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/UserResource.java
index df6f7f50..35e219e1 100644
--- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/UserResource.java
+++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/UserResource.java
@@ -14,8 +14,8 @@ import java.time.LocalDateTime;
*
*
*
- * @author robert
- * @since 2021-06-24
+ * @author zjw
+ * @since 2021-08-18
*/
@TableName("Z_USER_RESOURCE")
@@ -89,6 +89,11 @@ public class UserResource extends Model {
*/
@TableField("MODIFIED_DATE_TIME")
private LocalDateTime modifiedDateTime;
+ /**
+ * 判断该用户是否存在
+ */
+ @TableField("EXIST_USER")
+ private String existUser;
public String getHandle() {
@@ -195,6 +200,14 @@ public class UserResource extends Model {
this.modifiedDateTime = modifiedDateTime;
}
+ public String getExistUser() {
+ return existUser;
+ }
+
+ public void setExistUser(String existUser) {
+ this.existUser = existUser;
+ }
+
public static final String HANDLE = "HANDLE";
public static final String SITE = "SITE";
@@ -221,6 +234,8 @@ public static final String MODIFIED_USER = "MODIFIED_USER";
public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME";
+public static final String EXIST_USER = "EXIST_USER";
+
@Override
protected Serializable pkVal() {
@@ -243,6 +258,7 @@ public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME";
", createdDateTime = " + createdDateTime +
", modifiedUser = " + modifiedUser +
", modifiedDateTime = " + modifiedDateTime +
+ ", existUser = " + existUser +
"}";
}
}
\ No newline at end of file
diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/UserResourceService.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/UserResourceService.java
index f650fc30..261f8370 100644
--- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/UserResourceService.java
+++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/UserResourceService.java
@@ -15,11 +15,20 @@ import java.util.List;
* 服务类
*
*
- * @author robert
- * @since 2021-06-24
+ * @author zjw
+ * @since 2021-08-18
*/
public interface UserResourceService extends IService {
+ /**
+ * 分页查询
+ * @param frontPage
+ * @return
+ */
+ IPage selectPage(FrontPage frontPage, UserResource userResource);
+
+ List selectList(UserResource userResource);
+
List findEmployeeList(String site, String resourceType);
List findEnableList(String site, String resource, String user);
@@ -28,5 +37,4 @@ public interface UserResourceService extends IService {
void saveAll(List userResourceDtoList,String resource,String user);
-
}
\ No newline at end of file
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 f7401b83..2f557530 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,5 +1,7 @@
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;
@@ -9,10 +11,10 @@ import com.foreverwin.mesnac.dispatch.mapper.UserResourceMapper;
import com.foreverwin.mesnac.dispatch.model.UserResource;
import com.foreverwin.mesnac.dispatch.service.UserResourceService;
import com.foreverwin.mesnac.meapi.model.NwaUser;
-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;
@@ -26,8 +28,8 @@ import java.util.List;
* 服务实现类
*
*
- * @author robert
- * @since 2021-06-24
+ * @author zjw
+ * @since 2021-08-18
*/
@Service
@Transactional(rollbackFor = Exception.class)
@@ -37,7 +39,6 @@ public class UserResourceServiceImpl extends ServiceImpl selectPage(FrontPage frontPage, UserResource userResource) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.setEntity(userResource);
+ return super.page(frontPage.getPagePlus(), queryWrapper);
+ }
+
+ @Override
+ public List selectList(UserResource userResource) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.setEntity(userResource);
+ return super.list(queryWrapper);
+ }
+
+
@Override
public List findEmployeeList(String site, String resourceType) {
return userResourceMapper.findEmployeeList(site, resourceType);
@@ -62,7 +78,7 @@ 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);
@@ -93,7 +109,7 @@ public class UserResourceServiceImpl extends ServiceImpl userByUserName = userService.findList(userResource.getUserId());
if("false".equals(userResource.getTemporaryUser()) &&
- userByUserName.size() <= 0){
+ userByUserName.size() <= 0){
throw BusinessException.build("第"+(i+1)+"行的用户不存在,必须为临时用户");
}else if(userByUserName != null && userByUserName.size() > 0){
//userByUserName.setFullName(userResource.getUserDescription());
@@ -117,4 +133,8 @@ public class UserResourceServiceImpl extends ServiceImpl
+
+
-
- HANDLE, SITE, RESOURCE_BO, RESRCE, RESRCE_DESCRIPTION, USER_ID, USER_DESCRIPTION, TEMPORARY_USER, STATUS, CREATED_USER, CREATED_DATE_TIME, MODIFIED_USER, MODIFIED_DATE_TIME
+ HANDLE, SITE, RESOURCE_BO, RESRCE, RESRCE_DESCRIPTION, USER_ID, USER_DESCRIPTION, TEMPORARY_USER, STATUS, CREATED_USER, CREATED_DATE_TIME, MODIFIED_USER, MODIFIED_DATE_TIME, EXIST_USER
@@ -74,6 +75,7 @@
AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}
AND MODIFIED_USER=#{ew.entity.modifiedUser}
AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}
+ AND EXIST_USER=#{ew.entity.existUser}
@@ -97,6 +99,7 @@
AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}
AND MODIFIED_USER=#{ew.entity.modifiedUser}
AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}
+ AND EXIST_USER=#{ew.entity.existUser}
${ew.sqlSegment}
@@ -128,6 +131,7 @@
AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}
AND MODIFIED_USER=#{ew.entity.modifiedUser}
AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}
+ AND EXIST_USER=#{ew.entity.existUser}
${ew.sqlSegment}
@@ -159,6 +163,7 @@
AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}
AND MODIFIED_USER=#{ew.entity.modifiedUser}
AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}
+ AND EXIST_USER=#{ew.entity.existUser}
${ew.sqlSegment}
@@ -190,6 +195,7 @@
AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}
AND MODIFIED_USER=#{ew.entity.modifiedUser}
AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}
+ AND EXIST_USER=#{ew.entity.existUser}
${ew.sqlSegment}
@@ -221,6 +227,7 @@
AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}
AND MODIFIED_USER=#{ew.entity.modifiedUser}
AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}
+ AND EXIST_USER=#{ew.entity.existUser}
${ew.sqlSegment}
@@ -252,6 +259,7 @@
AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}
AND MODIFIED_USER=#{ew.entity.modifiedUser}
AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}
+ AND EXIST_USER=#{ew.entity.existUser}
${ew.sqlSegment}
@@ -279,6 +287,7 @@
CREATED_DATE_TIME,
MODIFIED_USER,
MODIFIED_DATE_TIME,
+ EXIST_USER,
VALUES
#{handle},
@@ -294,6 +303,7 @@
#{createdDateTime},
#{modifiedUser},
#{modifiedDateTime},
+ #{existUser},
@@ -316,6 +326,7 @@
#{createdDateTime},
#{modifiedUser},
#{modifiedDateTime},
+ #{existUser},
@@ -334,6 +345,7 @@
CREATED_DATE_TIME=#{et.createdDateTime},
MODIFIED_USER=#{et.modifiedUser},
MODIFIED_DATE_TIME=#{et.modifiedDateTime},
+ EXIST_USER=#{et.existUser},
WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL}
@@ -352,6 +364,7 @@
CREATED_DATE_TIME=#{et.createdDateTime},
MODIFIED_USER=#{et.modifiedUser},
MODIFIED_DATE_TIME=#{et.modifiedDateTime},
+ EXIST_USER=#{et.existUser},
WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL}
@@ -370,6 +383,7 @@
CREATED_DATE_TIME=#{et.createdDateTime},
MODIFIED_USER=#{et.modifiedUser},
MODIFIED_DATE_TIME=#{et.modifiedDateTime},
+ EXIST_USER=#{et.existUser},
@@ -387,6 +401,7 @@
AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}
AND MODIFIED_USER=#{ew.entity.modifiedUser}
AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}
+ AND EXIST_USER=#{ew.entity.existUser}
${ew.sqlSegment}
@@ -435,6 +450,7 @@
AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}
AND MODIFIED_USER=#{ew.entity.modifiedUser}
AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}
+ AND EXIST_USER=#{ew.entity.existUser}
${ew.sqlSegment}
@@ -452,6 +468,7 @@
)
+
+