状态修改

eco-common/common-excel/src/main/java/org/eco/common/excel/utils/ExcelUtil.java

@@ -206,6 +206,10 @@ public class ExcelUtil {
         builder.doWrite(list);
     }
 
+    public void uploadOss (OutputStream os ) {
+
+    }
+
     /**
      * 单表多数据模板导出 模板格式为 {.属性}
      *

eco-common/common-security/src/main/java/org/eco/common/security/utils/LoginHelper.java

@@ -19,11 +19,9 @@ import java.util.function.Supplier;
 
 /**
  * 登录鉴权助手
- *
  * user_type 为 用户类型 同一个用户表 可以有多种用户类型 例如 pc,app
  * deivce 为 设备类型 同一个用户类型 可以有 多种设备类型 例如 web,ios
  * 可以组成 用户类型与设备类型多对多的 权限灵活控制
- *
  * 多用户体系 针对 多种用户类型 但权限控制不一致
  * 可以组成 多用户类型表与多设备类型 分别控制权限
  *

eco-modules/system/src/main/java/org/eco/system/controller/system/SysUserController.java

@@ -4,12 +4,13 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.secure.BCrypt;
 import cn.hutool.core.lang.tree.Tree;
 import cn.hutool.core.util.ObjectUtil;
-import org.eco.system.domain.bo.SysDeptBo;
-import org.eco.system.domain.bo.SysPostBo;
-import org.eco.system.domain.bo.SysRoleBo;
-import org.eco.system.domain.bo.SysUserBo;
-import org.eco.system.domain.vo.SysUserImportVo;
-import org.eco.system.listener.SysUserImportListener;
+import com.mybatisflex.core.mask.MaskManager;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ArrayUtils;
 import org.eco.common.core.constant.UserConstants;
 import org.eco.common.core.core.domain.CommonResult;
 import org.eco.common.core.core.domain.model.LoginUser;
@@ -19,28 +20,29 @@ import org.eco.common.core.utils.StreamUtils;
 import org.eco.common.core.utils.StringUtils;
 import org.eco.common.encrypt.annotation.ApiEncrypt;
 import org.eco.common.excel.core.ExcelResult;
+import org.eco.common.excel.service.IExcelService;
 import org.eco.common.excel.utils.ExcelUtil;
 import org.eco.common.log.annotation.Log;
 import org.eco.common.log.enums.BusinessType;
 import org.eco.common.security.utils.LoginHelper;
 import org.eco.common.tenant.helper.TenantHelper;
 import org.eco.common.web.core.BaseController;
+import org.eco.system.domain.bo.SysDeptBo;
+import org.eco.system.domain.bo.SysPostBo;
+import org.eco.system.domain.bo.SysRoleBo;
+import org.eco.system.domain.bo.SysUserBo;
 import org.eco.system.domain.vo.SysRoleVo;
 import org.eco.system.domain.vo.SysUserExportVo;
+import org.eco.system.domain.vo.SysUserImportVo;
 import org.eco.system.domain.vo.SysUserInfoVo;
 import org.eco.system.domain.vo.SysUserVo;
 import org.eco.system.domain.vo.UserInfoVo;
+import org.eco.system.listener.SysUserImportListener;
 import org.eco.system.service.ISysDeptService;
 import org.eco.system.service.ISysPostService;
 import org.eco.system.service.ISysRoleService;
 import org.eco.system.service.ISysTenantService;
 import org.eco.system.service.ISysUserService;
-import com.mybatisflex.core.mask.MaskManager;
-import jakarta.annotation.Resource;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.constraints.NotNull;
-import lombok.RequiredArgsConstructor;
-import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -64,6 +66,7 @@ import java.util.List;
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/user")
+@Slf4j
 public class SysUserController extends BaseController {
     @Resource
     private ISysUserService userService;
@@ -76,6 +79,9 @@ public class SysUserController extends BaseController {
     @Resource
     private ISysTenantService tenantService;
 
+    @Resource
+    private IExcelService excelService;
+
     /**
      * 获取用户列表
      */
@@ -103,6 +109,17 @@ public class SysUserController extends BaseController {
      * @param file          导入文件
      * @param updateSupport 是否更新已存在数据
      */
+//    @Log(title = "用户管理", businessType = BusinessType.IMPORT)
+//    @SaCheckPermission("system:user:import")
+//    @PostMapping("/importData")
+//    public CommonResult<Void> importData(MultipartFile file, boolean updateSupport) throws Exception {
+//        log.info("****************************************");
+////        ExcelResult<SysUserImportVo> result = ExcelUtil.importExcel(file.getInputStream(), SysUserImportVo.class, new SysUserImportListener(updateSupport));
+//        excelService.importExcel(file.getInputStream(), SysUserImportVo.class, new SysUserImportListener(updateSupport));
+//        log.info("#########################################");
+//        return CommonResult.success();
+//    }
+
     @Log(title = "用户管理", businessType = BusinessType.IMPORT)
     @SaCheckPermission("system:user:import")
     @PostMapping("/importData")

eco-modules/system/src/main/java/org/eco/system/domain/SysClient.java

@@ -75,7 +75,7 @@ public class SysClient implements Serializable {
     private Integer version;
 
     /**
-     * 删除标志（0就代表存在 1就代表删除）
+     * 删除标志（1代表已删除 0代表存在）
      */
     private Integer delFlag;
 

eco-modules/system/src/main/java/org/eco/system/domain/SysDept.java

@@ -67,7 +67,7 @@ public class SysDept extends BaseEntity {
     private String status;
 
     /**
-     * 删除标志（0代表存在 1代表删除）
+     * 删除标志（1代表已删除 0代表存在）
      */
     private Integer delFlag;
 

eco-modules/system/src/main/java/org/eco/system/domain/SysRole.java

@@ -63,7 +63,7 @@ public class SysRole extends BaseEntity {
     private String status;
 
     /**
-     * 删除标志（0代表存在 1代表删除）
+     * 删除标志（1代表已删除 0代表存在）
      */
     private Integer delFlag;
 

eco-modules/system/src/main/java/org/eco/system/domain/SysTenant.java

@@ -95,7 +95,7 @@ public class SysTenant implements Serializable {
     private Integer version;
 
     /**
-     * 删除标志（0代表存在 1代表删除）
+     * 删除标志（1代表已删除 0代表存在）
      */
     private Integer delFlag;
 

eco-modules/system/src/main/java/org/eco/system/domain/SysTenantPackage.java

@@ -55,7 +55,7 @@ public class SysTenantPackage implements Serializable {
     private Integer version;
 
     /**
-     * 删除标志（0代表存在 1代表删除）
+     * 删除标志（1代表已删除 0代表存在）
      */
     private Integer delFlag;
 

eco-modules/system/src/main/java/org/eco/system/domain/SysUser.java

@@ -83,7 +83,7 @@ public class SysUser extends BaseEntity {
     private String status;
 
     /**
-     * 删除标志（0代表存在 1代表删除）
+     * 删除标志（1代表已删除 0代表存在）
      */
     private Integer delFlag;
 

eco-modules/system/src/main/java/org/eco/system/listener/SysUserImportListener.java

@@ -56,6 +56,12 @@ public class SysUserImportListener extends AnalysisEventListener<SysUserImportVo
 
     @Override
     public void invoke(SysUserImportVo userVo, AnalysisContext context) {
+        log.info("invoke&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&");
+        try {
+            Thread.sleep(3000L);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
         SysUserVo sysUser = this.userService.selectUserByUserName(userVo.getUserName());
         try {
             if (StringUtils.isNotEmpty(userVo.getDeptName())) {
@@ -114,11 +120,12 @@ public class SysUserImportListener extends AnalysisEventListener<SysUserImportVo
             failureMsg.append(msg).append(e.getMessage());
             log.error(msg, e);
         }
+        log.info("invoke&&&&&&&&&&&&&&&");
     }
 
     @Override
     public void doAfterAllAnalysed(AnalysisContext context) {
-        log.info(context.toString());
+        log.info("%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%{}", context.toString());
     }
 
     @Override

eco-modules/system/src/main/java/org/eco/system/mapper/SysRoleMapper.java

@@ -42,7 +42,7 @@ public interface SysRoleMapper extends BaseMapper<SysRole> {
             .leftJoin(SYS_USER_ROLE).as("ur").on(SYS_USER_ROLE.ROLE_ID.eq(SYS_ROLE.ROLE_ID))
             .leftJoin(SYS_USER).as("u").on(SYS_USER.USER_ID.eq(SYS_USER_ROLE.USER_ID))
             .leftJoin(SYS_DEPT).as("d").on(SYS_DEPT.DEPT_ID.eq(SYS_USER.DEPT_ID));
-        queryWrapper.where(SYS_ROLE.DEL_FLAG.eq(1))
+        queryWrapper.where(SYS_ROLE.DEL_FLAG.eq(0))
             .and(SYS_USER_ROLE.USER_ID.eq(userId));
 
         return selectListByQueryAs(queryWrapper, SysRoleVo.class);

eco-modules/system/src/main/java/org/eco/system/service/impl/SysDeptServiceImpl.java

@@ -267,7 +267,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptMapper, SysDept>
         SysDept dept = MapstructUtils.convert(deptBo, SysDept.class);
         assert dept != null;
         dept.setAncestors(info.getAncestors() + "," + dept.getParentId());
-        dept.setDelFlag(0);//0 代表存在
+        dept.setDelFlag(0);//0 代表未删除
         return this.save(dept);
     }
 

eco-modules/system/src/main/java/org/eco/system/service/impl/SysRoleServiceImpl.java

@@ -552,7 +552,7 @@ public class SysRoleServiceImpl extends BaseServiceImpl<SysRoleMapper, SysRole>
             .leftJoin(SYS_USER_ROLE).as("ur").on(SYS_USER_ROLE.ROLE_ID.eq(SYS_ROLE.ROLE_ID))
             .leftJoin(SYS_USER).as("u").on(SYS_USER.USER_ID.eq(SYS_USER_ROLE.USER_ID))
             .leftJoin(SYS_DEPT).as("d").on(SYS_DEPT.DEPT_ID.eq(SYS_USER.DEPT_ID))
-            .where(SYS_ROLE.DEL_FLAG.eq(1))
+            .where(SYS_ROLE.DEL_FLAG.eq(0))
             .and(SYS_USER.USER_NAME.eq(userName));
         return this.listAs(queryWrapper, SysRoleVo.class);
     }

eco-modules/system/src/main/java/org/eco/system/service/impl/SysTenantServiceImpl.java

@@ -192,7 +192,7 @@ public class SysTenantServiceImpl extends BaseServiceImpl<SysTenantMapper, SysTe
             dept.setDeptName(sysTenantBo.getCompanyName());
             dept.setParentId(Constants.TOP_PARENT_ID);
             dept.setAncestors(Constants.TOP_PARENT_ID.toString());
-            dept.setDelFlag(0);//0 代表存在
+            dept.setDelFlag(0);//0 代表未删除
             int insertedDeptRows = deptMapper.insert(dept, true);
             if (insertedDeptRows != 1) {
                 throw new BusinessException("新增租户的部门记录失败");
@@ -216,7 +216,7 @@ public class SysTenantServiceImpl extends BaseServiceImpl<SysTenantMapper, SysTe
             user.setPassword(BCrypt.hashpw(sysTenantBo.getPassword()));
             user.setDeptId(deptId);
             user.setDelFlag(0);
-            user.setStatus("0");
+            user.setStatus("1");
             user.setUserType("sys_user");//sys_user是系统用户
             int insertedUser = userMapper.insert(user, true);
             if (insertedUser != 1) {

eco-modules/system/src/main/java/org/eco/system/service/impl/SysUserServiceImpl.java

@@ -94,7 +94,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser>
             .select(SYS_USER.USER_ID, SYS_USER.TENANT_ID, SYS_USER.DEPT_ID, SYS_USER.NICK_NAME, SYS_USER.USER_NAME, SYS_USER.USER_TYPE, SYS_USER.EMAIL, SYS_USER.AVATAR, SYS_USER.PHONENUMBER, SYS_USER.GENDER, SYS_USER.STATUS, SYS_USER.VERSION, SYS_USER.DEL_FLAG, SYS_USER.LOGIN_IP, SYS_USER.LOGIN_DATE, SYS_USER.CREATE_BY, SYS_USER.CREATE_TIME, SYS_USER.REMARK, SYS_DEPT.DEPT_NAME, SYS_DEPT.LEADER)
             .from(SYS_USER.as("u"))
             .leftJoin(SYS_DEPT).as("d").on(SYS_DEPT.DEPT_ID.eq(SYS_USER.DEPT_ID))
-            .where(SYS_USER.DEL_FLAG.eq(1));
+            .where(SYS_USER.DEL_FLAG.eq(0));
         if (ObjectUtil.isNotNull(userBo.getUserId())) {
             queryWrapper.and(SYS_USER.USER_ID.eq(userBo.getUserId()));
         }
@@ -125,7 +125,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser>
             ))
             .from(SYS_USER.as("u"))
             .leftJoin(SYS_DEPT).as("d").on(SYS_DEPT.DEPT_ID.eq(SYS_USER.DEPT_ID))
-            .where(SYS_USER.DEL_FLAG.eq(1));
+            .where(SYS_USER.DEL_FLAG.eq(0));
     }
 
 
@@ -168,7 +168,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser>
             .leftJoin(SYS_DEPT).as("d").on(SYS_DEPT.DEPT_ID.eq(SYS_USER.DEPT_ID))
             .leftJoin(SYS_USER_ROLE).as("ur").on(SYS_USER_ROLE.USER_ID.eq(SYS_USER.USER_ID))
             .leftJoin(SYS_ROLE).as("r").on(SYS_ROLE.ROLE_ID.eq(SYS_USER_ROLE.ROLE_ID))
-            .where(SYS_USER.DEL_FLAG.eq(1))
+            .where(SYS_USER.DEL_FLAG.eq(0))
             .and(SYS_ROLE.ROLE_ID.eq(userBo.getRoleId()));
         if (StringUtils.isNotEmpty(userBo.getUserName())) {
             queryWrapper.and(SYS_USER.USER_NAME.like(userBo.getUserName()));
@@ -195,7 +195,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser>
             .leftJoin(SYS_DEPT).as("d").on(SYS_DEPT.DEPT_ID.eq(SYS_USER.DEPT_ID))
             .leftJoin(SYS_USER_ROLE).as("ur").on(SYS_USER_ROLE.USER_ID.eq(SYS_USER.USER_ID))
             .leftJoin(SYS_ROLE).as("r").on(SYS_ROLE.ROLE_ID.eq(SYS_USER_ROLE.ROLE_ID))
-            .where(SYS_USER.DEL_FLAG.eq(1))
+            .where(SYS_USER.DEL_FLAG.eq(0))
             .and(SYS_USER.STATUS.eq("1"))
             .and(SYS_ROLE.ROLE_ID.ne(userBo.getRoleId()).or(SYS_ROLE.ROLE_ID.isNull()))
             .and(SYS_USER.USER_ID.notIn(select(SYS_USER.USER_ID).from(SYS_USER.as("u")).innerJoin(SYS_USER_ROLE).as("ur").on(SYS_USER_ROLE.USER_ID.eq(SYS_USER.USER_ID).and(SYS_USER_ROLE.ROLE_ID.eq(userBo.getRoleId())))));
@@ -219,7 +219,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser>
     @Override
     public SysUserVo selectUserByUserName(String userName) {
         QueryWrapper queryWrapper = buildOneQueryWrapper();
-        queryWrapper.where(SYS_USER.DEL_FLAG.eq(1));
+        queryWrapper.where(SYS_USER.DEL_FLAG.eq(0));
         if (StringUtils.isNotEmpty(userName)) {
             queryWrapper.and(SYS_USER.USER_NAME.eq(userName));
         }
@@ -252,7 +252,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser>
     @Override
     public SysUserVo selectUserByEmail(String email) {
         QueryWrapper queryWrapper = buildOneQueryWrapper();
-        queryWrapper.where(SYS_USER.DEL_FLAG.eq(1));
+        queryWrapper.where(SYS_USER.DEL_FLAG.eq(0));
         if (StringUtils.isNotEmpty(email)) {
             queryWrapper.and(SYS_USER.EMAIL.eq(email));
         }
@@ -291,7 +291,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser>
             ))
             .from(SYS_USER.as("u"))
             .leftJoin(SYS_DEPT).as("d").on(SYS_DEPT.DEPT_ID.eq(SYS_USER.DEPT_ID))
-            .where(SYS_USER.DEL_FLAG.eq(1));
+            .where(SYS_USER.DEL_FLAG.eq(0));
         if (ObjectUtil.isNotNull(userId)) {
             queryWrapper.and(SYS_USER.USER_ID.eq(userId));
         }
@@ -338,7 +338,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser>
     public boolean checkUserNameUnique(SysUserBo userBo) {
         Long userId = ObjectUtil.isNull(userBo.getUserId()) ? -1L : userBo.getUserId();
         QueryWrapper queryWrapper = query().where(SYS_USER.USER_NAME.eq(userBo.getUserName()))
-            .and(SYS_USER.DEL_FLAG.eq(1));
+            .and(SYS_USER.DEL_FLAG.eq(0));
         SysUser info = this.getOne(queryWrapper);
         if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
             return UserConstants.NOT_UNIQUE;
@@ -356,7 +356,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser>
     public boolean checkPhoneUnique(SysUserBo user) {
         Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
         QueryWrapper queryWrapper = query().where(SYS_USER.PHONENUMBER.eq(user.getPhonenumber()))
-            .and(SYS_USER.DEL_FLAG.eq(1));
+            .and(SYS_USER.DEL_FLAG.eq(0));
         SysUser info = this.getOne(queryWrapper);
         if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
             return UserConstants.NOT_UNIQUE;
@@ -374,7 +374,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser>
     public boolean checkEmailUnique(SysUserBo user) {
         long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
         QueryWrapper queryWrapper = query().where(SYS_USER.EMAIL.eq(user.getEmail()))
-            .and(SYS_USER.DEL_FLAG.eq(1));
+            .and(SYS_USER.DEL_FLAG.eq(0));
         SysUser info = this.getOne(queryWrapper);
         if (StringUtils.isNotNull(info) && info.getUserId() != userId) {
             return UserConstants.NOT_UNIQUE;
@@ -428,7 +428,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser>
             .select(QueryMethods.count(SYS_USER.USER_ID))
             .from(SYS_USER)
             .where(SYS_USER.DEPT_ID.eq(deptId))
-            .and(SYS_USER.DEL_FLAG.eq(1));
+            .and(SYS_USER.DEL_FLAG.eq(0));
 
         int result = userMapper.selectObjectByQueryAs(queryWrapper, Integer.class);
         return result > 0;
@@ -700,7 +700,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser>
      */
     @Override
     public List<SysUserVo> selectUserListByDept(Long deptId) {
-        QueryWrapper queryWrapper = query().where(SYS_USER.DEPT_ID.eq(deptId)).and(SYS_USER.DEL_FLAG.eq(1));
+        QueryWrapper queryWrapper = query().where(SYS_USER.DEPT_ID.eq(deptId)).and(SYS_USER.DEL_FLAG.eq(0));
         return this.listAs(queryWrapper, SysUserVo.class);
     }
 }

eco-start/src/main/resources/application.yml

@@ -152,9 +152,9 @@ mybatis-flex:
       key-type: Generator
       value: snowFlakeId
     # 逻辑未删除值1
-    normal-value-of-logic-delete: 1
-    # 逻辑已删除值0 1:存在(框架表均使用此值 禁止随意修改)
-    deleted-value-of-logic-delete: 0
+    normal-value-of-logic-delete: 0
+    # 逻辑已删除值1  0:存在(框架表均使用此值 禁止随意修改)
+    deleted-value-of-logic-delete: 1
     # 默认的逻辑删除字段
     logic-delete-column: del_flag
     # 默认的多租户字段