fix:修改导出文件等问题

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysDeptDataImpl.java

@@ -80,7 +80,7 @@ public class SysDeptDataImpl implements ISysDeptData, IJPACommData<SysDept, Long
 
     @Override
     public List<SysDept> findByDeptId(Long deptId) {
-        return MapstructUtils.convert(deptRepository.findAll().stream().filter(o -> o.getAncestors().indexOf(deptId.toString()) != -1)
+        return MapstructUtils.convert(deptRepository.findAll().stream().filter(o -> o.getAncestors() != null && o.getAncestors().contains(deptId.toString()))
                 .collect(Collectors.toList()), SysDept.class);
     }
 
@@ -95,7 +95,7 @@ public class SysDeptDataImpl implements ISysDeptData, IJPACommData<SysDept, Long
                 .from(tbSysDept)
                 .where(predicateBuilder.build())
                 .fetchOne();
-        return count==0;
+        return count == 0;
     }
 
     @Override

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysRoleMenuDataImpl.java

@@ -5,7 +5,6 @@ import cc.iotkit.data.dao.IJPACommData;
 import cc.iotkit.data.dao.SysRoleMenuRepository;
 import cc.iotkit.data.model.QTbSysRoleMenu;
 import cc.iotkit.data.model.TbSysRoleMenu;
-import cc.iotkit.data.model.TbSysUserRole;
 import cc.iotkit.data.system.ISysRoleMenuData;
 import cc.iotkit.data.util.PredicateBuilder;
 import cc.iotkit.model.system.SysRoleMenu;
@@ -15,7 +14,9 @@ import org.springframework.context.annotation.Primary;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
 
 import static cc.iotkit.data.model.QTbSysRoleMenu.tbSysRoleMenu;
 
@@ -50,13 +51,12 @@ public class SysRoleMenuDataImpl implements ISysRoleMenuData, IJPACommData<SysRo
 
     @Override
     public boolean checkMenuExistRole(Long menuId) {
-        TbSysRoleMenu tbSysRoleMenu = jpaQueryFactory
-                .select(QTbSysRoleMenu.tbSysRoleMenu)
+        return jpaQueryFactory
+                .select(QTbSysRoleMenu.tbSysRoleMenu.count())
                 .from(QTbSysRoleMenu.tbSysRoleMenu)
                 .where(PredicateBuilder.instance()
                         .and(QTbSysRoleMenu.tbSysRoleMenu.menuId.eq(menuId))
-                        .build()).fetchOne();
-        return Objects.nonNull(tbSysRoleMenu);
+                        .build()).fetchOne() > 0;
     }
 
     @Override

iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysConfigController.java

@@ -51,9 +51,9 @@ public class SysConfigController extends BaseController {
   @Log(title = "参数管理", businessType = BusinessType.EXPORT)
   @SaCheckPermission("system:config:export")
   @PostMapping("/export")
-  public void export(@RequestBody @Validated(QueryGroup.class) Request<SysConfigBo> config,
+  public void export(@Validated(QueryGroup.class) SysConfigBo config,
       HttpServletResponse response) {
-    List<SysConfigVo> list = configService.selectConfigList(config.getData());
+    List<SysConfigVo> list = configService.selectConfigList(config);
     ExcelUtil.exportExcel(list, "参数数据", SysConfigVo.class, response);
   }
 

iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysDictDataController.java

@@ -52,8 +52,8 @@ public class SysDictDataController {
     @SaCheckPermission("system:dict:export")
     @ApiOperation(value = "导出字典数据列表", notes = "导出字典数据列表")
     @PostMapping("/export")
-    public void export(@RequestBody @Validated Request<SysDictDataBo> bo, HttpServletResponse response) {
-        List<SysDictDataVo> list = dictDataService.selectDictDataList(bo.getData());
+    public void export(SysDictDataBo bo, HttpServletResponse response) {
+        List<SysDictDataVo> list = dictDataService.selectDictDataList(bo);
         ExcelUtil.exportExcel(list, "字典数据", SysDictDataVo.class, response);
     }
 

iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysDictTypeController.java

@@ -55,9 +55,9 @@ public class SysDictTypeController extends BaseController {
     @Log(title = "字典类型", businessType = BusinessType.EXPORT)
     @SaCheckPermission("system:dict:export")
     @PostMapping("/export")
-    public void export(@RequestBody @Validated(QueryGroup.class)PageRequest<SysDictTypeBo> dictType, HttpServletResponse response) {
+    public void export(@Validated(QueryGroup.class) SysDictTypeBo dictType, HttpServletResponse response) {
 
-        List<SysDictTypeVo> list = dictTypeService.selectDictTypeList(dictType.getData());
+        List<SysDictTypeVo> list = dictTypeService.selectDictTypeList(dictType);
         ExcelUtil.exportExcel(list, "字典类型", SysDictTypeVo.class, response);
     }
 

iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysLogininforController.java

@@ -54,8 +54,8 @@ public class SysLogininforController extends BaseController {
     @Log(title = "登录日志", businessType = BusinessType.EXPORT)
     @SaCheckPermission("monitor:logininfor:export")
     @PostMapping("/export")
-    public void export(Request<SysLogininforBo> logininfor, HttpServletResponse response) {
-        List<SysLogininforVo> list = logininforService.selectLogininforList(logininfor.getData());
+    public void export(SysLogininforBo logininfor, HttpServletResponse response) {
+        List<SysLogininforVo> list = logininforService.selectLogininforList(logininfor);
         ExcelUtil.exportExcel(list, "登录日志", SysLogininforVo.class, response);
     }
 

iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysPostController.java

@@ -54,8 +54,8 @@ public class SysPostController extends BaseController {
     @Log(title = "岗位管理", businessType = BusinessType.EXPORT)
     @SaCheckPermission("system:post:export")
     @PostMapping("/export")
-    public void export(@RequestBody @Validated(QueryGroup.class) Request<SysPostBo> post, HttpServletResponse response) {
-        List<SysPostVo> list = postService.selectPostList(post.getData());
+    public void export(@Validated(QueryGroup.class) SysPostBo post, HttpServletResponse response) {
+        List<SysPostVo> list = postService.selectPostList(post);
         ExcelUtil.exportExcel(list, "岗位数据", SysPostVo.class, response);
     }
 

iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysRoleController.java

@@ -59,8 +59,8 @@ public class SysRoleController extends BaseController {
     @ApiOperation(value = "导出角色信息列表", notes = "导出角色信息列表")
     @SaCheckPermission("system:role:export")
     @PostMapping("/export")
-    public void export(@RequestBody @Validated Request<SysRoleBo> role, HttpServletResponse response) {
-        List<SysRoleVo> list = roleService.selectRoleList(role.getData());
+    public void export(@Validated SysRoleBo role, HttpServletResponse response) {
+        List<SysRoleVo> list = roleService.selectRoleList(role);
         ExcelUtil.exportExcel(list, "角色数据", SysRoleVo.class, response);
     }
 

iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysTenantController.java

@@ -62,8 +62,8 @@ public class SysTenantController extends BaseController {
     @SaCheckPermission("system:tenant:export")
     @Log(title = "租户", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(Request<SysTenantBo> bo, HttpServletResponse response) {
-        List<SysTenantVo> list = tenantService.queryList(bo.getData());
+    public void export(SysTenantBo bo, HttpServletResponse response) {
+        List<SysTenantVo> list = tenantService.queryList(bo);
         ExcelUtil.exportExcel(list, "租户", SysTenantVo.class, response);
     }
 

iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysUserController.java

@@ -69,9 +69,8 @@ public class SysUserController extends BaseController {
     @Log(title = "用户管理", businessType = BusinessType.EXPORT)
     @SaCheckPermission("system:user:export")
     @PostMapping("/export")
-    public void export(@RequestBody @Validated(QueryGroup.class) Request<SysUserBo> req,
+    public void export(@Validated(QueryGroup.class) SysUserBo user,
                        HttpServletResponse response) {
-        SysUserBo user = req.getData();
         List<SysUserVo> list = userService.selectUserList(user);
         List<SysUserExportVo> listVo = MapstructUtils.convert(list, SysUserExportVo.class);
         ExcelUtil.exportExcel(listVo, "用户数据", SysUserExportVo.class, response);

iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysConfigServiceImpl.java

@@ -22,7 +22,6 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**

iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysDictTypeServiceImpl.java

@@ -15,7 +15,6 @@ import cc.iotkit.data.system.ISysDictData;
 import cc.iotkit.data.system.ISysDictTypeData;
 import cc.iotkit.model.system.SysDictData;
 import cc.iotkit.model.system.SysDictType;
-import cc.iotkit.model.system.SysUser;
 import cc.iotkit.system.dto.bo.SysDictTypeBo;
 import cc.iotkit.system.dto.vo.SysDictDataVo;
 import cc.iotkit.system.dto.vo.SysDictTypeVo;
@@ -41,7 +40,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService
     private final ISysDictData sysDictData;
 
     @Override
-    public Paging<SysDictTypeVo> selectPageDictTypeList( PageRequest<SysDictTypeBo> query) {
+    public Paging<SysDictTypeVo> selectPageDictTypeList(PageRequest<SysDictTypeBo> query) {
         return sysDictTypeData.findAll(query.to(SysDictType.class)).to(SysDictTypeVo.class);
     }
 
@@ -153,8 +152,8 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService
     @Override
     public List<SysDictDataVo> updateDictType(SysDictTypeBo bo) {
         SysDictType oldDict = sysDictTypeData.findById(bo.getId());
-        List<SysDictData> olds=sysDictData.findByDicType(oldDict.getDictType());
-        for (SysDictData sd:olds) {
+        List<SysDictData> olds = sysDictData.findByDicType(oldDict.getDictType());
+        for (SysDictData sd : olds) {
             sd.setDictType(bo.getDictType());
             sysDictData.save(sd);
         }
@@ -189,7 +188,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService
         // 优先从本地缓存获取
         List<SysDictDataVo> datas = (List<SysDictDataVo>) SaHolder.getStorage().get(CacheConstants.SYS_DICT_KEY + dictType);
         if (ObjectUtil.isNull(datas)) {
-            datas = SpringUtils.getAopProxy(this).selectDictDataByType(dictType);
+            datas = selectDictDataByType(dictType);
             SaHolder.getStorage().set(CacheConstants.SYS_DICT_KEY + dictType, datas);
         }
 

iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysLogininforServiceImpl.java

@@ -8,7 +8,6 @@ import cc.iotkit.common.utils.MapstructUtils;
 import cc.iotkit.common.utils.StringUtils;
 import cc.iotkit.common.utils.ip.AddressUtils;
 import cc.iotkit.data.system.ISysLogininforData;
-import cc.iotkit.data.util.PageBuilder;
 import cc.iotkit.model.system.SysLogininfor;
 import cc.iotkit.system.dto.bo.SysLogininforBo;
 import cc.iotkit.system.dto.vo.SysLogininforVo;

iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysRoleServiceImpl.java

@@ -24,7 +24,6 @@ import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import lombok.RequiredArgsConstructor;
-import org.hibernate.service.spi.ServiceException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -335,7 +334,7 @@ public class SysRoleServiceImpl implements ISysRoleService {
             checkRoleDataScope(roleId);
             SysRole role = iSysRoleData.findById(roleId);
             if (countUserRoleByRoleId(roleId) > 0) {
-                throw new ServiceException(String.format("%1$s已分配,不能删除", role.getRoleName()));
+                throw new BizException(String.format("%1$s已分配,不能删除", role.getRoleName()));
             }
         }
 

iot-starter/src/main/java/cc/iotkit/Application.java

@@ -34,7 +34,6 @@ public class Application {
         if (EmbeddedRedisConfig.embeddedEnable()) {
             EmbeddedRedisConfig.startEmbeddedRedisServer();
         }
-        System.setProperty("nashorn.args","--no-deprecation-warning");
 
         SpringApplication.run(Application.class, args);
         System.out.println("server start success!");

iot-starter/src/main/java/cc/iotkit/web/controller/CaptchaController.java

@@ -2,7 +2,6 @@ package cc.iotkit.web.controller;
 
 import cc.iotkit.common.constant.Constants;
 import cc.iotkit.common.constant.GlobalConstants;
-import cc.iotkit.common.exception.BizException;
 import cc.iotkit.common.redis.utils.RedisUtils;
 import cc.iotkit.common.utils.ReflectUtils;
 import cc.iotkit.common.utils.SpringUtils;
@@ -14,13 +13,10 @@ import cn.dev33.satoken.annotation.SaIgnore;
 import cn.hutool.captcha.AbstractCaptcha;
 import cn.hutool.captcha.generator.CodeGenerator;
 import cn.hutool.core.util.IdUtil;
-import cn.hutool.core.util.RandomUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import jakarta.validation.constraints.NotBlank;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-
 import org.springframework.expression.Expression;
 import org.springframework.expression.ExpressionParser;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
@@ -29,8 +25,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.time.Duration;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * 验证码操作处理
@@ -46,56 +40,6 @@ import java.util.Map;
 public class CaptchaController {
 
     private final CaptchaProperties captchaProperties;
-//    private final SmsProperties smsProperties;
-//    private final MailProperties mailProperties;
-
-    /**
-     * 短信验证码
-     *
-     * @param phonenumber 用户手机号
-     */
-//    @PostMapping("/resource/sms/code")
-//    public void smsCode(@NotBlank(message = "{user.phonenumber.not.blank}") String phonenumber) {
-//        if (!smsProperties.getEnabled()) {
-//            throw new BizException("当前系统没有开启短信功能！");
-//        }
-//        String key = GlobalConstants.CAPTCHA_CODE_KEY + phonenumber;
-//        String code = RandomUtil.randomNumbers(4);
-//        RedisUtils.setCacheObject(key, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION));
-//        // 验证码模板id 自行处理 (查数据库或写死均可)
-//        String templateId = "";
-//        Map<String, String> map = new HashMap<>(1);
-//        map.put("code", code);
-//        SmsTemplate smsTemplate = SpringUtils.getBean(SmsTemplate.class);
-//        SmsResult result = smsTemplate.send(phonenumber, templateId, map);
-//        if (!result.isSuccess()) {
-//            log.error("验证码短信发送异常 => {}", result);
-//            throw new RuntimeException("验证码短信发送异常");
-//        }
-//        return ;
-//    }
-
-    /**
-     * 邮箱验证码
-     *
-     * @param email 邮箱
-     */
-//    @PostMapping("/resource/email/code")
-//    public void emailCode(@NotBlank(message = "{user.email.not.blank}") String email) {
-//        if (!mailProperties.getEnabled()) {
-//            throw new BizException("当前系统没有开启邮件功能！"));
-//        }
-//        String key = GlobalConstants.CAPTCHA_CODE_KEY + email;
-//        String code = RandomUtil.randomNumbers(4);
-//        RedisUtils.setCacheObject(key, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION));
-//        try {
-//            MailUtils.sendText(email, "登录验证码", "您本次验证码为：" + code + "，有效性为" + Constants.CAPTCHA_EXPIRATION + "分钟，请尽快填写。");
-//        } catch (Exception e) {
-//            log.error("验证码短信发送异常 => {}", e.getMessage());
-//           throw new RuntimeException("验证码短信发送异常");
-//        }
-//
-//    }
 
     /**
      * 生成验证码

iot-starter/src/main/java/cc/iotkit/web/service/SysLoginService.java

@@ -29,16 +29,12 @@ import cn.dev33.satoken.secure.BCrypt;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
-
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.time.Duration;
-import java.util.Date;
 import java.util.List;
 import java.util.function.Supplier;