普通用户 试用期过后 不能删除修改等操作

zqy

11 小时以前 56ce440159701f4154c69daca105fbe4641f95f9

普通用户 试用期过后 不能删除修改等操作

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZExperienceController.java

@@ -12,6 +12,7 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZExperience;
import com.ruoyi.service.ZExperienceService;
import com.ruoyi.system.service.ISysUserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -41,6 +42,11 @@
    @Autowired
    private ZExperienceService zExperienceService;

    @Autowired
    private ISysUserService iSysUserService;



    @GetMapping("/all")
    public AjaxResult  listAll(){
        SysUser user = SecurityUtils.getLoginUser().getUser();
@@ -61,6 +67,8 @@
        SysUser user = SecurityUtils.getLoginUser().getUser();
        Long userId = user.getUserId();



        List<ZExperience> list = zExperienceService.selectExperienceList(userId);
        log.info("导出记录为:{}",list);
        ExcelUtil<ZExperience> util = new ExcelUtil<>(ZExperience.class);
@@ -78,10 +86,13 @@
        SysUser user = SecurityUtils.getLoginUser().getUser();
        Long userId = user.getUserId();

        if(iSysUserService.findUserStatus(userId))
            return AjaxResult.error("您的试用期已经结束，请付费继续使用");

        boolean flag=zExperienceService.importExcel(file,userId);
        if(flag){
            return AjaxResult.success("导入数据成功");
        }
        }else
        return AjaxResult.error("导入数据失败");
    }

@@ -106,6 +117,10 @@
    {
        SysUser user = SecurityUtils.getLoginUser().getUser();
        Long userId = user.getUserId();

        if(iSysUserService.findUserStatus(userId))
            return AjaxResult.error("您的试用期已经结束，请付费继续使用");

        zExperience.setUserId(userId);
        return toAjax(zExperienceService.save(zExperience));
    }
@@ -118,6 +133,11 @@
    @PutMapping
    public AjaxResult edit(@RequestBody ZExperience zExperience)
    {
        SysUser user = SecurityUtils.getLoginUser().getUser();
        Long userId = user.getUserId();

        if(iSysUserService.findUserStatus(userId))
            return AjaxResult.error("您的试用期已经结束，请付费继续使用");
        return toAjax(zExperienceService.updateById(zExperience));
    }
//
@@ -129,6 +149,11 @@
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        SysUser user = SecurityUtils.getLoginUser().getUser();
        Long userId = user.getUserId();

        if(iSysUserService.findUserStatus(userId))
            return AjaxResult.error("您的试用期已经结束，请付费继续使用");
        return toAjax(zExperienceService.removeByIds(Arrays.asList(ids)));
    }


 ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java

@@ -56,11 +56,12 @@
        {
            log.info("登录用户：{} 异常.", username);
            throw new ServiceException("对不起，您的账号：" + username + " 出现异常，请联系管理员");
        }else if(UserStatus.END.getCode().equals(user.getStatus()))
        {
            log.info("登录用户：{} 异常.", username);
            throw new ServiceException("对不起，您的账号：" + username + " 试用期已结束，请付费继续使用");
        }
//        else if(UserStatus.END.getCode().equals(user.getStatus()))
//        {
//            log.info("登录用户：{} 异常.", username);
//            throw new ServiceException("对不起，您的账号：" + username + " 试用期已结束，请付费继续使用");
//        }

        passwordService.validate(user);


 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -15,6 +15,15 @@
{


    /**
     * 查找用户状态
     *
     * @param userId 用户sys_id
     * @return 用户账号状态
     */
    Boolean findUserStatus(Long userId);


    public List<String> findUserNames(Long [] ids);
    /**
     * 根据条件分页查询用户列表

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -80,7 +80,18 @@
    private ZInfoUserService zInfoUserService;


    /**
     * 查找用户状态
     *
     * @param userId 用户sys_id
     * @return 用户账号状态
     */

    @Override
    public Boolean findUserStatus(Long userId) {
        SysUser sysUser = userMapper.selectUserById(userId);
        return sysUser.getStatus().equals("4");
    }

    @Override
    public List<String> findUserNames(Long[] ids) {