DZ/faw-report-library-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复工作流全部错误完成（都添加了TODO）

Browse Source
This commit is contained in:
xuetao.li
2023-04-17 17:51:27 +08:00
parent 0d878d45cb
commit 61c65f1b50
30 changed files with 368 additions and 465 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/RoleEODao.java
-1
View File
@@ -3,7 +3,6 @@ package com.adc.da.sys.dao.mysql;
import java.util.List;
import com.adc.da.sys.vo.UserRoleVO;
import com.adc.da.sys.vo.ddm.DdmRoleUserQuery;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/RoleMenuEODao.java
-3
View File
@@ -1,9 +1,7 @@
package com.adc.da.sys.dao.mysql;
import com.adc.da.base.dao.BaseDao;
import com.adc.da.sys.entity.RoleEO;
import com.adc.da.sys.entity.RoleMenuEO;
import com.adc.da.sys.vo.ddm.DdmMenuVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -19,5 +17,4 @@ public interface RoleMenuEODao extends BaseDao<RoleMenuEO> {
List<RoleMenuEO> getRoleMenuList(@Param("roleId") String roleId);
List<DdmMenuVO> getRoleMenuInfoList(@Param("roleId") String roleId);
}
adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/UserEODao.java
-6
View File
@@ -4,8 +4,6 @@ import java.util.List;
import java.util.Map;
import com.adc.da.sys.vo.UserVO;
import com.adc.da.sys.vo.ddm.DdmUserQueryVO;
import com.adc.da.sys.vo.ddm.DdmUserVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
@@ -39,10 +37,6 @@ public interface UserEODao extends BaseMapper<UserEO> {
// 根据account获取未逻辑删除的UserEO
UserEO getUserEOByAccountNotDeleted(String account);
IPage<DdmUserVO> getUserPage(IPage page, @Param("userAccount") String account, @Param("userName") String userName);
Long getUserCount(DdmUserQueryVO ddmUserQueryVO);
int insertUserBatch(@Param("userEOList") List<UserEO> userEOList);
List<Map<String, Object>> allList( @Param("account") String account, @Param("roleName") String roleName);
adc-da-sys/src/main/java/com/adc/da/sys/service/RoleEOService.java
-43
View File
@@ -2,29 +2,12 @@ package com.adc.da.sys.service;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import com.adc.da.sys.dao.mysql.*;
import com.adc.da.sys.entity.*;
import com.adc.da.sys.vo.MenuVO;
import com.adc.da.sys.vo.UserRoleVO;
import com.adc.da.sys.vo.ddm.DdmMenuVO;
import com.adc.da.sys.vo.ddm.DdmRoleMenuCreateVO;
import com.adc.da.sys.vo.ddm.DdmRoleUserQuery;
import com.adc.da.sys.vo.ddm.DdmUserVO;
import com.adc.da.util.exception.AdcDaBaseException;
import com.adc.da.util.http.PageInfo;
import com.adc.da.util.utils.BeanMapper;
import com.adc.da.util.utils.StringUtils;
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 org.apache.ibatis.annotations.Param;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import com.adc.da.base.service.BaseService;
@@ -147,32 +130,6 @@ public class RoleEOService extends BaseService<RoleEO, String> {
return dao.getUserRoleListByRoleId(roleId);
}
/**
* 查询角色所对应的用户
*
* @param roleId 角色id
* @return 角色信息
*/
@Transactional(readOnly = true)
public List<UserRoleVO> getUserInfoListByRoleId(String roleId) {
return dao.getUserInfoListByRoleId(roleId);
}
@Transactional(readOnly = true)
public PageInfo<UserRoleVO> getUserInfoPageByRoleId(DdmRoleUserQuery query) {
IPage page = new Page();
page.setCurrent(query.getPageNum());
page.setSize(query.getPageSize());
IPage<UserRoleVO> userInfoList = dao.getUserInfoPageByRoleId(page, query.getRoleId());
Long count = dao.getUserCountByRoleId(query.getRoleId());
PageInfo<UserRoleVO> pageInfo = new PageInfo();
pageInfo.setPageSize(query.getPageSize());
pageInfo.setCount(count);
pageInfo.setList(userInfoList.getRecords());
return pageInfo;
}
/**
* 设置角色菜单关联
*
adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java
-17
View File
@@ -10,10 +10,7 @@ import com.adc.da.sys.service.iservice.IUserEoService;
import com.adc.da.sys.util.EncryptUtil;
import com.adc.da.sys.vo.UserImportVO;
import com.adc.da.sys.vo.UserVO;
import com.adc.da.sys.vo.ddm.DdmUserQueryVO;
import com.adc.da.sys.vo.ddm.DdmUserVO;
import com.adc.da.util.exception.AdcDaBaseException;
import com.adc.da.util.http.PageInfo;
import com.adc.da.util.utils.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -191,20 +188,6 @@ public class UserEOServiceImpl implements IUserEoService {
return userEO;
}
@Transactional(readOnly = true)
public PageInfo<DdmUserVO> getUserPage(DdmUserQueryVO query) {
IPage page = new Page();
page.setCurrent(query.getPageNum());
page.setSize(query.getPageSize());
IPage<DdmUserVO> userPage = dao.getUserPage(page,query.getUserAccount(),query.getUserName());
Long count = dao.getUserCount(query);
PageInfo<DdmUserVO> pageInfo = new PageInfo();
pageInfo.setPageSize(query.getPageSize());
pageInfo.setCount(count);
pageInfo.setList(userPage.getRecords());
return pageInfo;
}
@Override
@Transactional(rollbackFor = Exception.class)
public void importExcelUser(List<UserImportVO> list) {
adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IUserEoService.java
-3
View File
@@ -3,9 +3,6 @@ package com.adc.da.sys.service.iservice;
import com.adc.da.sys.entity.UserEO;
import com.adc.da.sys.vo.UserImportVO;
import com.adc.da.sys.vo.UserVO;
import com.adc.da.sys.vo.ddm.DdmUserQueryVO;
import com.adc.da.sys.vo.ddm.DdmUserVO;
import com.adc.da.util.http.PageInfo;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
adc-da-sys/src/main/java/com/adc/da/sys/vo/UserVO.java
+5
View File
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import com.adc.da.sys.entity.RoleEO;
import com.adc.da.sys.vo.iam.orgsIAM;
import lombok.Data;
@@ -46,5 +47,9 @@ public class UserVO {
private List<String> roleIdList = new ArrayList<>();
/**
* 部门列表
*/
private List<orgsIAM> orgList = new ArrayList();
}
adc-da-sys/src/main/java/com/adc/da/sys/vo/ddm/DdmMenuVO.java
-13
View File
@@ -1,13 +0,0 @@
package com.adc.da.sys.vo.ddm;
import lombok.Data;
@Data
public class DdmMenuVO {
//菜单id
private String modelId;
//菜单父Id
private String parentModelId;
//菜单名称
private String modelName;
}
adc-da-sys/src/main/java/com/adc/da/sys/vo/ddm/DdmRoleMenuCreateVO.java
-18
View File
@@ -1,18 +0,0 @@
package com.adc.da.sys.vo.ddm;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@Data
public class DdmRoleMenuCreateVO {
//菜单id
@NotBlank(message = "菜单id不能为空")
private String modelId;
//菜单父Id
@NotBlank(message = "菜单父id不能为空")
private String parentModelId;
//角色id
@NotBlank(message = "角色id不能为空")
private String roleId;
}
adc-da-sys/src/main/java/com/adc/da/sys/vo/ddm/DdmRoleUserQuery.java
-10
View File
@@ -1,10 +0,0 @@
package com.adc.da.sys.vo.ddm;
import lombok.Data;
@Data
public class DdmRoleUserQuery {
private String roleId;
private Integer pageNum;
private Integer pageSize;
}
adc-da-sys/src/main/java/com/adc/da/sys/vo/ddm/DdmUserQueryVO.java
-14
View File
@@ -1,14 +0,0 @@
package com.adc.da.sys.vo.ddm;
import lombok.Data;
@Data
public class DdmUserQueryVO {
private String userAccount;
private String userName;
private Integer pageNum;
private Integer pageSize;
}
adc-da-sys/src/main/java/com/adc/da/sys/vo/ddm/DdmUserVO.java
-18
View File
@@ -1,18 +0,0 @@
package com.adc.da.sys.vo.ddm;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
@Data
public class DdmUserVO {
private String userId;
private String userName;
private String userAccount;
}
adc-da-sys/src/main/java/com/adc/da/sys/vo/iam/orgsIAM.java
+14
View File
@@ -0,0 +1,14 @@
package com.adc.da.sys.vo.iam;
import lombok.Data;
@Data
public class orgsIAM {
private String orgCode; // 组织编码
private String orgName; // 部门名称
private String orgShortName; // 部门简称
}
adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/RoleMenuEOMapper.xml
-13
View File
@@ -75,17 +75,4 @@
select role_id,menu_id from TR_ROLE_MENU where role_id=#{roleId}
</select>
<select id="getRoleMenuInfoList" resultType="com.adc.da.sys.vo.ddm.DdmMenuVO">
SELECT
t1.role_id ,
t1.menu_id modelId,
t2.`NAME` modelName,
t2.PARENT_ID parentModelId
FROM
TR_ROLE_MENU t1
LEFT JOIN TS_MENU t2 ON t1.MENU_ID = t2.ID
WHERE
t1.role_id = #{roleId}
</select>
</mapper>
adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml
-16
View File
@@ -19,22 +19,6 @@
</select>
<select id="getUserPage" resultType="com.adc.da.sys.vo.ddm.DdmUserVO">
select t1.USID userId,t1.ACCOUNT userAccount,t1.USNAME userName,t1.CELLPHONE_NUMBER,t1.EMAIL,t1.ISUSE,t1.DEPARTMENT,
date_format(t1.UPDATE_TIME,'%Y-%m-%d %H:%i:%S')CREATEDATE from TS_USER t1
where t1.del_flag='0'
<if test="userAccount !='' and userAccount !=null">
and t1.ACCOUNT like "%"#{userAccount}"%"
</if>
<if test="userName !='' and userName !=null">
and t1.USNAME like "%"#{userName}"%"
</if>
ORDER BY t1.UPDATE_TIME DESC
</select>
<select id="getUserCount" resultType="java.lang.Long">
select count(*) from TS_USER t1
where t1.del_flag='0'