修改了一些BUG、需求

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/feign/SaveUserInfoByProjectClient.java

@@ -16,10 +16,19 @@ public interface SaveUserInfoByProjectClient {
      * URL常量
      */
     String SEARCH_USER_INFO_AND_PROJECT = "/api/manager/searchUserInfoAndProject";
+    String SEARCH_USER_INFO_AND_PROJECT2 = "/api/manager/searchUserInfoAndProject2";
 
     /**
      * 获取用户引用项目合同角色信息
      */
     @GetMapping(SEARCH_USER_INFO_AND_PROJECT)
     List<SaveUserInfoByProjectDTO> searchUserInfoAndProject(@RequestParam("userId") String userId, @RequestParam("roleId") String roleId);
+
+    /**
+     * 获取用户引用项目合同角色信息
+     */
+    @GetMapping(SEARCH_USER_INFO_AND_PROJECT2)
+    List<SaveUserInfoByProjectDTO> searchUserInfoAndProject2(@RequestParam("userId") String userId);
+
+
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/ManagerApplication.java

@@ -20,6 +20,7 @@ import org.springblade.common.constant.LauncherConstant;
 import org.springblade.core.cloud.feign.EnableBladeFeign;
 import org.springblade.core.launch.BladeApplication;
 import org.springframework.cloud.client.SpringCloudApplication;
+import org.springframework.scheduling.annotation.EnableAsync;
 
 /**
  * manager启动器
@@ -28,6 +29,7 @@ import org.springframework.cloud.client.SpringCloudApplication;
  */
 @EnableBladeFeign
 @SpringCloudApplication
+@EnableAsync //开启异步
 public class ManagerApplication {
 
 	public static void main(String[] args) {

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsFormElementController.java

@@ -151,17 +151,28 @@ public class WbsFormElementController extends BladeController {
         for (WbsFormElementExcel wbsFE : list) {
             if (("字符串").equals(wbsFE.getElementType()) || ("string").equals(wbsFE.getElementType())) {
                 wbsFE.setElementType("1");
+                wbsFE.setElementLength("1000");
             } else if (("整数").equals(wbsFE.getElementType()) || ("bigint").equals(wbsFE.getElementType())) {
                 wbsFE.setElementType("2");
+                wbsFE.setElementLength("255");
             } else if (("小数").equals(wbsFE.getElementType()) || ("decimal").equals(wbsFE.getElementType())) {
                 wbsFE.setElementType("3");
+                wbsFE.setElementLength("65");
             } else if (("日期").equals(wbsFE.getElementType()) || ("datetime").equals(wbsFE.getElementType())) {
                 wbsFE.setElementType("4");
                 wbsFE.setElementLength("0");
             } else if (("数值").equals(wbsFE.getElementType())) {
                 wbsFE.setElementType("3");
+                wbsFE.setElementLength("65");
             } else if (("签名").equals(wbsFE.getElementType())) {
                 wbsFE.setElementType("1");
+                wbsFE.setElementLength("1000");
+            } else if (("文件").equals(wbsFE.getElementType())) {
+                wbsFE.setElementType("1");
+                wbsFE.setElementLength("1000");
+            } else {
+                wbsFE.setElementType("1");
+                wbsFE.setElementLength("1000");
             }
         }
         return R.data(list, "操作成功");

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsTreeController.java

@@ -302,21 +302,19 @@ public class WbsTreeController extends BladeController {
         Long parentId = wbsTreeFu.getParentId();
         WbsTree wbsTree1 = wbsTreeService.getById(parentId);
         if (wbsTree1.getProjectNodeId().equals(parentId)) {
-            //覆盖
             wbsTreeService.deleteBatchByProjectNodeId(wbsTree1.getProjectNodeId());
-            String result = wbsTreeService.importWbsTree(excelFile, wbsTreeFu, wbsTree1);
-            if (result.equals("1")) {
-                return R.fail("请选择正确模板导入");
-            } else {
+            boolean result = wbsTreeService.importWbsTree(excelFile, wbsTreeFu, wbsTree1);
+            if (result) {
                 return R.success("覆盖导入成功");
+            } else {
+                return R.fail("请选择正确模板导入");
             }
         } else {
-            //新增
-            String result = wbsTreeService.importWbsTree(excelFile, wbsTreeFu, wbsTree1);
-            if (result.equals("1")) {
-                return R.fail("请选择正确模板导入");
-            } else {
+            boolean result = wbsTreeService.importWbsTree(excelFile, wbsTreeFu, wbsTree1);
+            if (result) {
                 return R.success("新增导入成功");
+            } else {
+                return R.fail("请选择正确模板导入");
             }
         }
     }

blade-service/blade-manager/src/main/java/org/springblade/manager/feign/SaveUserInfoByProjectClientImpl.java

@@ -22,4 +22,12 @@ public class SaveUserInfoByProjectClientImpl implements SaveUserInfoByProjectCli
                         .eq(SaveUserInfoByProjectDTO::getUserId, userId)
                         .eq(SaveUserInfoByProjectDTO::getRoleId, roleId));
     }
+
+    @Override
+    public List<SaveUserInfoByProjectDTO> searchUserInfoAndProject2(String userId) {
+        return saveUserInfoByProjectService.list(
+                Wrappers.<SaveUserInfoByProjectDTO>query().lambda()
+                        .eq(SaveUserInfoByProjectDTO::getUserId, userId)
+        );
+    }
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ContractInfoMapper.xml

@@ -146,7 +146,7 @@
 
     <select id="findUserByName" resultType="org.springblade.system.user.entity.User">
         select `id`,`name`,account,`password` from blade_user WHERE `name` like concat('%',#{name},'%')
-        and is_deleted = 0 and `status`	= 1
+        and is_deleted = 0 and `status`	= 1 order by create_time
     </select>
 
     <select id="tree" resultMap="treeNodeResultMap">

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsInfoMapper.xml

@@ -41,6 +41,8 @@
         </if>
         GROUP BY
         wbs_name
+        ORDER BY
+        create_time
     </select>
 
     <select id="selectById2" resultMap="wbsInfoResultMap">

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreePrivateMapper.xml

@@ -220,6 +220,8 @@
         </if>
         GROUP BY
         project_id
+        ORDER BY
+        create_time
     </select>
 
     <select id="tree" resultMap="treeNodeResultMap">

blade-service/blade-manager/src/main/java/org/springblade/manager/service/IWbsTreeService.java

@@ -87,7 +87,7 @@ public interface IWbsTreeService extends BaseService<WbsTree> {
      */
     List<WbsFormElementVO> selectFormElements(String id);
 
-    String importWbsTree(MultipartFile excelFile, WbsTree wbsTreeFu, WbsTree wbsTree1) throws IOException;
+    boolean importWbsTree(MultipartFile excelFile, WbsTree wbsTreeFu, WbsTree wbsTree1) throws IOException;
 
     String submitWbsTreeInProject(WbsTreeContractDTO pawDTO);
 

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeContractServiceImpl.java

@@ -35,6 +35,11 @@ public class WbsTreeContractServiceImpl
     private final WbsTreePrivateMapper wbsTreePrivateMapper;
     private final WbsInfoMapper wbsInfoMapper;
 
+    /**
+     * 合同段wbs树保存
+     * @param pawDTO
+     * @return
+     */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean submitWbsTreeInContract(WbsTreeContractDTO pawDTO) {

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeServiceImpl.java

@@ -211,8 +211,8 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
                 String initTableName = i.getInitTableName();
 
                 for (Map<String, String> map : result) {
-                    System.out.println("i:"+i);
-                    System.out.println("map:"+map);
+                    System.out.println("i:" + i);
+                    System.out.println("map:" + map);
                     int keyNumb = 0;
                     if (tableName.equals(map.get("表名"))) {
                         System.out.println(map);
@@ -270,7 +270,7 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
             case 4:
                 return "datetime"; //日期
             case 5:
-                return "bigint";  //数值
+                return "decimal";  //数值
             case 6:
                 return "varchar"; //签名
             case 7:
@@ -309,9 +309,9 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
             case "文件":
                 return 1000;
             case "整数":
-            case "数值":
                 return 255;
             case "小数":
+            case "数值":
                 return 65;
             case "日期":
             default:
@@ -381,55 +381,31 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
         return String.valueOf(wbsTree.getId());
     }
 
+
+    /**
+     * wbs公有树节点excel导入
+     *
+     * @param excelFile
+     * @param wbsTreeFu
+     * @param wbsTree1
+     * @return
+     * @throws IOException
+     */
     @Override
-    public String importWbsTree(MultipartFile excelFile, WbsTree wbsTreeFu, WbsTree wbsTree1) throws IOException {
+    @Transactional(rollbackFor = Exception.class)
+    public boolean importWbsTree(MultipartFile excelFile, WbsTree wbsTreeFu, WbsTree wbsTree1) throws IOException {
         //赋值
         wbsTreeFu.setAncestors("0");
         wbsTree1.setProjectNodeId(wbsTree1.getId());
-        //获取文件路径
         File file = WbsExcelUtil.convert(excelFile);
         String canonicalPath = file.getCanonicalPath();
         try {
-            //解析excel
+            //解析
             WbsExcelUtil excelUtil = new WbsExcelUtil();
             ArrayList<Map<String, String>> result = excelUtil.readExcelToObj(canonicalPath);
-            for (Map<String, String> map : result) {
-                map.forEach((nodeType, nodeName) -> {
-                    WbsTree wbsTreeZi = new WbsTree();
-                    if (StringUtils.isNotEmpty(nodeName)) {
-                        //初始化默认值
-                        wbsTreeZi.setTenantId(AuthUtil.getTenantId());
-                        wbsTreeZi.setDeptName(nodeName);
-                        wbsTreeZi.setDeptCategory(Integer.valueOf(nodeType));
-                        wbsTreeZi.setWbsId(wbsTreeFu.getWbsId());
-                        wbsTreeZi.setParentId(wbsTreeFu.getParentId());
-                        wbsTreeZi.setAncestors(wbsTreeFu.getAncestors());
-                        wbsTreeZi.setProjectNodeId(wbsTree1.getProjectNodeId());
-                        //新增节点返回未创建成功查询出来的wbsTree对象、创建成功后的wbsTreeZi对象
-                        WbsTree wbsTree = importTree(wbsTreeZi);
-                        //后置初始化默认值
-                        if (wbsTree == null) {
-                            Long id = wbsTreeZi.getId();
-                            //设置ancestors祖级id集合
-                            StringBuilder stringBuffer = new StringBuilder();
-                            StringBuilder appendStr = stringBuffer.append(",").append(wbsTreeZi.getParentId());
-                            String ancestors = wbsTreeZi.getAncestors() + appendStr;
-                            //修改ancestors的值
-                            updateData(ancestors, id);
-                            wbsTreeFu.setParentId(id);
-                            wbsTreeFu.setAncestors(ancestors);
-                        } else {
-                            wbsTreeFu.setParentId(wbsTree.getId());
-                            wbsTreeFu.setAncestors(wbsTree.getAncestors());
-                        }
-                    }
-                });
-            }
-            //修改根节点ProjectNodeId
-            baseMapper.updateById(wbsTree1);
-            return "2";
+            return startAsyncImportExcel(result, wbsTreeFu, wbsTree1);
         } catch (Exception e) {
-            return "1";
+            throw new ServiceException("导入失败");
         } finally {
             File file2 = new File(canonicalPath);
             if (file2.isFile() && file2.exists()) {
@@ -439,6 +415,45 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
         }
     }
 
+    private boolean startAsyncImportExcel(ArrayList<Map<String, String>> result, WbsTree wbsTreeFu, WbsTree wbsTree1) {
+        for (Map<String, String> map : result) {
+            map.forEach((nodeType, nodeName) -> {
+                WbsTree wbsTreeZi = new WbsTree();
+                if (StringUtils.isNotEmpty(nodeName)) {
+                    //初始化默认值
+                    wbsTreeZi.setTenantId(AuthUtil.getTenantId());
+                    wbsTreeZi.setDeptName(nodeName);
+                    wbsTreeZi.setDeptCategory(Integer.valueOf(nodeType));
+                    wbsTreeZi.setWbsId(wbsTreeFu.getWbsId());
+                    wbsTreeZi.setParentId(wbsTreeFu.getParentId());
+                    wbsTreeZi.setAncestors(wbsTreeFu.getAncestors());
+                    wbsTreeZi.setProjectNodeId(wbsTree1.getProjectNodeId());
+                    //新增节点返回未创建成功查询出来的wbsTree对象、创建成功后的wbsTreeZi对象
+                    WbsTree wbsTree = importTree(wbsTreeZi);
+                    //后置初始化默认值
+                    if (wbsTree == null) {
+                        Long id = wbsTreeZi.getId();
+                        //设置ancestors祖级id集合
+                        StringBuilder stringBuffer = new StringBuilder();
+                        StringBuilder appendStr = stringBuffer.append(",").append(wbsTreeZi.getParentId());
+                        String ancestors = wbsTreeZi.getAncestors() + appendStr;
+                        //修改ancestors的值
+                        updateData(ancestors, id);
+                        wbsTreeFu.setParentId(id);
+                        wbsTreeFu.setAncestors(ancestors);
+                    } else {
+                        wbsTreeFu.setParentId(wbsTree.getId());
+                        wbsTreeFu.setAncestors(wbsTree.getAncestors());
+                    }
+                }
+            });
+        }
+        //修改根节点ProjectNodeId
+        int i = baseMapper.updateById(wbsTree1);
+        return i > 0;
+    }
+
+
     private WbsTree importTree(WbsTree wbsTreeZi) {
         //查重
         QueryWrapper<WbsTree> queryWrapper = new QueryWrapper<>();
@@ -528,6 +543,13 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
         return false;
     }
 
+
+    /**
+     * 项目级wbs树保存
+     *
+     * @param pawDTO
+     * @return
+     */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String submitWbsTreeInProject(WbsTreeContractDTO pawDTO) {
@@ -590,9 +612,9 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
                 //TODO 是否要同步删除元素表
             }
         } else {
-            if (idList1.size() > idList2.size()) {
+            if (idList1.size() > idList2.size()) { //新增
                 //新增前去删除当前项目已经引用的旧的私有节点，避免重复引用
-                wbsTreePrivateMapper.delete(Wrappers.<WbsTreePrivate>query().lambda().eq(WbsTreePrivate::getProjectId, pawDTO.getProjectId()));
+                //wbsTreePrivateMapper.delete(Wrappers.<WbsTreePrivate>query().lambda().eq(WbsTreePrivate::getProjectId, pawDTO.getProjectId()));
 
                 for (String id : diffrent) {
                     //项目私有wbs节点库存在该节点且为删除状态,那么修改is_deleted=0,否则新增
@@ -672,7 +694,7 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
                         }
                     }
                 }
-            } else {
+            } else { //删除
                 for (String id : diffrent) {
                     //删除当前节点
                     wbsTreePrivateMapper.deleteByCondition(id, pawDTO.getWbsId(), pawDTO.getProjectId());

blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java

@@ -40,6 +40,8 @@ import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringPool;
 import org.springblade.core.tool.utils.StringUtil;
+import org.springblade.manager.dto.SaveUserInfoByProjectDTO;
+import org.springblade.manager.feign.SaveUserInfoByProjectClient;
 import org.springblade.system.user.dto.UserDTO;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.excel.UserExcel;
@@ -73,6 +75,7 @@ public class UserController {
 
     private final IUserService userService;
     private final BladeRedis bladeRedis;
+    private final SaveUserInfoByProjectClient saveUserInfoByProjectClient;
 
     /**
      * 查询单条
@@ -186,7 +189,23 @@ public class UserController {
     @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
     public R remove(@RequestParam String ids) {
         CacheUtil.clear(USER_CACHE);
-        return R.status(userService.removeUser(ids));
+        if (ids.contains(",")) { //批量
+            String[] split = ids.split(",");
+            //判断关联项目
+            for (String id : split) {
+                List<SaveUserInfoByProjectDTO> list = saveUserInfoByProjectClient.searchUserInfoAndProject2(id);
+                if (list.size() > 0) {
+                    return R.fail("请先移除用户关联的项目合同角色信息");
+                }
+            }
+            return R.status(userService.removeUser(ids));
+        } else { //单个
+            List<SaveUserInfoByProjectDTO> list = saveUserInfoByProjectClient.searchUserInfoAndProject2(ids);
+            if (list.size() > 0) {
+                return R.fail("请先移除用户关联的项目合同角色信息");
+            }
+            return R.status(userService.removeUser(ids));
+        }
     }
 
     /**

blade-service/blade-user/src/main/java/org/springblade/system/user/excel/UserExcel.java

@@ -36,62 +36,54 @@ import java.util.Date;
 @HeadRowHeight(20)
 @ContentRowHeight(18)
 public class UserExcel implements Serializable {
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
+    @ColumnWidth(15)
+    @ExcelProperty("账户")
+    private String account;
 
-	@ColumnWidth(15)
-	@ExcelProperty("租户编号")
-	private String tenantId;
+    @ColumnWidth(15)
+    @ExcelProperty("姓名")
+    private String realName;
 
-	@ExcelIgnore
-	@ExcelProperty("用户平台")
-	private String userType;
+    @ColumnWidth(15)
+    @ExcelProperty("手机")
+    private String phone;
 
-	@ColumnWidth(20)
-	@ExcelProperty("用户平台名称")
-	private String userTypeName;
+    @ColumnWidth(15)
+    @ExcelProperty("身份证号")
+    private String idNumber;
 
-	@ColumnWidth(15)
-	@ExcelProperty("账户")
-	private String account;
+    @ColumnWidth(15)
+    @ExcelProperty("角色名称")
+    private String roleName;
 
-	@ColumnWidth(10)
-	@ExcelProperty("昵称")
-	private String name;
+    @ColumnWidth(15)
+    @ExcelProperty("部门名称")
+    private String deptName;
 
-	@ColumnWidth(10)
-	@ExcelProperty("姓名")
-	private String realName;
+    @ExcelIgnore
+    @ExcelProperty("角色ID")
+    private String roleId;
 
-	@ExcelProperty("邮箱")
-	private String email;
+    @ExcelIgnore
+    @ExcelProperty("部门ID")
+    private String deptId;
 
-	@ColumnWidth(15)
-	@ExcelProperty("手机")
-	private String phone;
+    @ExcelIgnore
+    @ExcelProperty("岗位ID")
+    private String postId;
 
-	@ExcelIgnore
-	@ExcelProperty("角色ID")
-	private String roleId;
+    @ExcelIgnore
+    @ExcelProperty("租户编号")
+    private String tenantId;
 
-	@ExcelIgnore
-	@ExcelProperty("部门ID")
-	private String deptId;
+    @ExcelIgnore
+    @ExcelProperty("用户平台")
+    private String userType;
 
-	@ExcelIgnore
-	@ExcelProperty("岗位ID")
-	private String postId;
+    @ExcelIgnore
+    @ExcelProperty("用户平台名称")
+    private String userTypeName;
 
-	@ExcelProperty("角色名称")
-	private String roleName;
-
-	@ExcelProperty("部门名称")
-	private String deptName;
-
-	@ExcelProperty("岗位名称")
-	private String postName;
-
-	@ColumnWidth(20)
-	@ExcelProperty("生日")
-	private Date birthday;
 
 }

blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

@@ -162,6 +162,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
         }
         user.setRoleId(String.valueOf(stringBuffer.deleteCharAt(stringBuffer.length() - 1)));
         user.setUserType(1); //用户平台-WEB
+        user.setName(user.getRealName());
         boolean b1 = save(user);
         if (b1) {
             //比较
@@ -222,6 +223,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
         if (userCount > 0L) {
             throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
         }
+        user.setName(user.getRealName());
         return updateUserInfo(user);
     }
 
@@ -422,7 +424,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
             // 设置部门ID
             user.setDeptId(Func.toStrWithEmpty(SysCache.getDeptIds(userExcel.getTenantId(), userExcel.getDeptName()), StringPool.EMPTY));
             // 设置岗位ID
-            user.setPostId(Func.toStrWithEmpty(SysCache.getPostIds(userExcel.getTenantId(), userExcel.getPostName()), StringPool.EMPTY));
+            //user.setPostId(Func.toStrWithEmpty(SysCache.getPostIds(userExcel.getTenantId(), userExcel.getPostName()), StringPool.EMPTY));
             // 设置角色ID
             user.setRoleId(Func.toStrWithEmpty(SysCache.getRoleIds(userExcel.getTenantId(), userExcel.getRoleName()), StringPool.EMPTY));
             // 设置租户ID
@@ -442,6 +444,11 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
             // 获取默认密码配置
             String initPassword = ParamCache.getValue(DEFAULT_PARAM_PASSWORD);
             user.setPassword(initPassword);
+            user.setPlaintextPassword("123456");
+            user.setStatus(1);
+            user.setIsDeleted(0);
+            user.setCode(user.getAccount());
+            user.setName(user.getRealName());
             this.submit(user);
         });
     }
@@ -453,7 +460,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
             user.setUserTypeName(DictCache.getValue(DictEnum.USER_TYPE, user.getUserType()));
             user.setRoleName(StringUtil.join(SysCache.getRoleNames(user.getRoleId())));
             user.setDeptName(StringUtil.join(SysCache.getDeptNames(user.getDeptId())));
-            user.setPostName(StringUtil.join(SysCache.getPostNames(user.getPostId())));
+            //user.setPostName(StringUtil.join(SysCache.getPostNames(user.getPostId())));
         });
         return userList;
     }