style: 规范导入排序及代码格式

main
zch 2 months ago
parent 87bf75370f
commit 8c1cf946c1

@ -1,26 +1,27 @@
package org.dromara.rfid.controller; package org.dromara.rfid.controller;
import java.util.List;
import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckPermission;
import org.springframework.web.bind.annotation.*; import jakarta.servlet.http.HttpServletResponse;
import org.springframework.validation.annotation.Validated; import jakarta.validation.constraints.NotEmpty;
import org.dromara.common.idempotent.annotation.RepeatSubmit; import jakarta.validation.constraints.NotNull;
import org.dromara.common.log.annotation.Log; import lombok.RequiredArgsConstructor;
import org.dromara.common.web.core.BaseController;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.R;
import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup; import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil; import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.rfid.domain.vo.RfidDeviceVo; import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.rfid.domain.bo.RfidDeviceBo; import org.dromara.common.log.annotation.Log;
import org.dromara.rfid.service.IRfidDeviceService; import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.rfid.domain.bo.RfidDeviceBo;
import org.dromara.rfid.domain.vo.RfidDeviceVo;
import org.dromara.rfid.service.IRfidDeviceService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/** /**
* *
@ -112,5 +113,5 @@ public class RfidDeviceController extends BaseController {
List<RfidDeviceVo> list = rfidDeviceService.queryList(bo); List<RfidDeviceVo> list = rfidDeviceService.queryList(bo);
return R.ok(list); return R.ok(list);
} }
} }

@ -1,22 +1,25 @@
package org.dromara.rfid.controller; package org.dromara.rfid.controller;
import java.util.List;
import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckPermission;
import org.springframework.web.bind.annotation.*; import jakarta.servlet.http.HttpServletResponse;
import org.springframework.validation.annotation.Validated; import lombok.RequiredArgsConstructor;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.common.log.annotation.Log; import org.dromara.common.log.annotation.Log;
import org.dromara.common.web.core.BaseController; import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.log.enums.BusinessType; import org.dromara.common.web.core.BaseController;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.rfid.domain.vo.RfidReadRecordVo;
import org.dromara.rfid.domain.vo.RfidDowntimeRecordVo;
import org.dromara.rfid.domain.bo.RfidReadRecordBo; import org.dromara.rfid.domain.bo.RfidReadRecordBo;
import org.dromara.rfid.domain.vo.RfidDowntimeRecordVo;
import org.dromara.rfid.domain.vo.RfidReadRecordVo;
import org.dromara.rfid.service.IRfidReadRecordService; import org.dromara.rfid.service.IRfidReadRecordService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/** /**
* *

@ -1,28 +1,29 @@
package org.dromara.rfid.controller; package org.dromara.rfid.controller;
import java.util.Date;
import java.util.List;
import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckPermission;
import org.springframework.format.annotation.DateTimeFormat; import jakarta.servlet.http.HttpServletResponse;
import org.springframework.web.bind.annotation.*; import jakarta.validation.constraints.NotEmpty;
import org.springframework.validation.annotation.Validated; import jakarta.validation.constraints.NotNull;
import org.dromara.common.idempotent.annotation.RepeatSubmit; import lombok.RequiredArgsConstructor;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.web.core.BaseController;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.R;
import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup; import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil; import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.rfid.domain.vo.RfidReadRecordVo; import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.rfid.domain.bo.RfidReadRecordBo; import org.dromara.common.log.annotation.Log;
import org.dromara.rfid.service.IRfidReadRecordService; import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.rfid.domain.bo.RfidReadRecordBo;
import org.dromara.rfid.domain.vo.RfidReadRecordVo;
import org.dromara.rfid.service.IRfidReadRecordService;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.Date;
import java.util.List;
/** /**
* *
@ -112,7 +113,7 @@ public class RfidReadRecordController extends BaseController {
return toAjax(rfidReadRecordService.deleteWithValidByIds(List.of(ids), queryDate, true)); return toAjax(rfidReadRecordService.deleteWithValidByIds(List.of(ids), queryDate, true));
} }
/** /**
* *
*/ */
@SaCheckPermission("rfid:rfidReadRecord:list") @SaCheckPermission("rfid:rfidReadRecord:list")
@ -121,5 +122,5 @@ public class RfidReadRecordController extends BaseController {
List<RfidReadRecordVo> list = rfidReadRecordService.queryList(bo); List<RfidReadRecordVo> list = rfidReadRecordService.queryList(bo);
return R.ok(list); return R.ok(list);
} }
} }

@ -1,13 +1,14 @@
package org.dromara.rfid.domain; package org.dromara.rfid.domain;
import org.dromara.common.mybatis.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.util.Date; import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.io.Serial; import java.io.Serial;
import java.util.Date;
/** /**
* rfid_device * rfid_device

@ -1,15 +1,16 @@
package org.dromara.rfid.domain.bo; package org.dromara.rfid.domain.bo;
import org.dromara.rfid.domain.RfidDevice;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*; import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.rfid.domain.RfidDevice;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
/** /**
* rfid_device * rfid_device

@ -1,15 +1,17 @@
package org.dromara.rfid.domain.bo; package org.dromara.rfid.domain.bo;
import org.dromara.rfid.domain.RfidReadRecord; import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*; import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.rfid.domain.RfidReadRecord;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
/** /**
* *

@ -1,6 +1,7 @@
package org.dromara.rfid.domain.vo; package org.dromara.rfid.domain.vo;
import lombok.Data; import lombok.Data;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;

@ -1,14 +1,12 @@
package org.dromara.rfid.domain.vo; package org.dromara.rfid.domain.vo;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.rfid.domain.RfidDevice;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty; import cn.idev.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import org.dromara.rfid.domain.RfidDevice;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;

@ -1,16 +1,16 @@
package org.dromara.rfid.domain.vo; package org.dromara.rfid.domain.vo;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import lombok.Data;
/** /**
* *
* <p> * <p>

@ -1,17 +1,17 @@
package org.dromara.rfid.domain.vo; package org.dromara.rfid.domain.vo;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.rfid.domain.RfidReadRecord;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty; import cn.idev.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import org.dromara.rfid.domain.RfidReadRecord;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date;
/** /**
* rfid_read_record * rfid_read_record

@ -1,16 +1,17 @@
package org.dromara.rfid.mapper; package org.dromara.rfid.mapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.rfid.domain.RfidDevice; import org.dromara.rfid.domain.RfidDevice;
import org.dromara.rfid.domain.vo.DashboardVO; import org.dromara.rfid.domain.vo.DashboardVO;
import org.dromara.rfid.domain.vo.RfidDeviceVo;
import org.dromara.rfid.domain.vo.RfidDashboardStatsVo; import org.dromara.rfid.domain.vo.RfidDashboardStatsVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.rfid.domain.vo.RfidDeviceVo;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Collection; import java.util.Collection;
import java.util.List;
/** /**
* Mapper * Mapper

@ -1,14 +1,15 @@
package org.dromara.rfid.mapper; package org.dromara.rfid.mapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.rfid.domain.RfidReadRecord; import org.dromara.rfid.domain.RfidReadRecord;
import org.dromara.rfid.domain.vo.RfidReadRecordVo; import org.dromara.rfid.domain.vo.RfidReadRecordVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Collection; import java.util.Collection;
import java.util.List;
/** /**
* Mapper * Mapper

@ -1,7 +1,8 @@
package org.dromara.rfid.mapper; package org.dromara.rfid.mapper;
import org.dromara.rfid.domain.vo.HomeStatsVO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.dromara.rfid.domain.vo.HomeStatsVO;
import java.util.List; import java.util.List;
/** /**

@ -1,9 +1,9 @@
package org.dromara.rfid.service; package org.dromara.rfid.service;
import org.dromara.rfid.domain.vo.RfidReadRecordVo;
import org.dromara.rfid.domain.bo.RfidReadRecordBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.rfid.domain.bo.RfidReadRecordBo;
import org.dromara.rfid.domain.vo.RfidReadRecordVo;
import java.util.Collection; import java.util.Collection;
import java.util.Date; import java.util.Date;

@ -1,31 +1,31 @@
package org.dromara.rfid.service.impl; package org.dromara.rfid.service.impl;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; import org.dromara.common.core.exception.ServiceException;
import org.springframework.transaction.annotation.Transactional; import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.rfid.domain.bo.RfidDeviceBo; import org.dromara.common.core.utils.StringUtils;
import org.dromara.rfid.domain.vo.RfidDeviceVo; import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.rfid.domain.RfidDevice; import org.dromara.rfid.domain.RfidDevice;
import org.dromara.rfid.domain.RfidReadRecord; import org.dromara.rfid.domain.RfidReadRecord;
import org.dromara.rfid.domain.bo.RfidDeviceBo;
import org.dromara.rfid.domain.vo.RfidDeviceVo;
import org.dromara.rfid.helper.RfidReadRecordTableHelper;
import org.dromara.rfid.mapper.RfidDeviceMapper; import org.dromara.rfid.mapper.RfidDeviceMapper;
import org.dromara.rfid.mapper.RfidReadRecordMapper; import org.dromara.rfid.mapper.RfidReadRecordMapper;
import org.dromara.rfid.service.IRfidDeviceService; import org.dromara.rfid.service.IRfidDeviceService;
import org.dromara.rfid.helper.RfidReadRecordTableHelper; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Collection;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Collection;
/** /**
* Service * Service

@ -2,30 +2,30 @@ package org.dromara.rfid.service.impl;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.dromara.common.mybatis.core.page.TableDataInfo;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.dromara.rfid.domain.RfidReadRecord;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.rfid.helper.RfidReadRecordTableHelper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.dromara.rfid.domain.bo.RfidReadRecordBo; import org.dromara.rfid.domain.bo.RfidReadRecordBo;
import org.dromara.rfid.domain.vo.RfidReadRecordVo; import org.dromara.rfid.domain.vo.RfidReadRecordVo;
import org.dromara.rfid.domain.RfidReadRecord; import org.dromara.rfid.helper.RfidReadRecordTableHelper;
import org.dromara.rfid.mapper.RfidReadRecordMapper; import org.dromara.rfid.mapper.RfidReadRecordMapper;
import org.dromara.rfid.service.IRfidReadRecordService; import org.dromara.rfid.service.IRfidReadRecordService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.temporal.ChronoUnit; import java.time.temporal.ChronoUnit;
import java.util.Collection;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Collection;
import java.util.regex.Pattern; import java.util.regex.Pattern;
/** /**

Loading…
Cancel
Save