From 8c1cf946c1a9e47d2b8064b00569b31de8eef056 Mon Sep 17 00:00:00 2001 From: zch Date: Mon, 18 May 2026 17:05:16 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E8=A7=84=E8=8C=83=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=8F=8A=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rfid/controller/RfidDeviceController.java | 33 ++++++++-------- .../RfidDowntimeRecordController.java | 25 ++++++------ .../controller/RfidReadRecordController.java | 39 ++++++++++--------- .../org/dromara/rfid/domain/RfidDevice.java | 9 +++-- .../dromara/rfid/domain/bo/RfidDeviceBo.java | 13 ++++--- .../rfid/domain/bo/RfidReadRecordBo.java | 14 ++++--- .../dromara/rfid/domain/vo/HomeStatsVO.java | 1 + .../dromara/rfid/domain/vo/RfidDeviceVo.java | 8 ++-- .../rfid/domain/vo/RfidDowntimeRecordVo.java | 14 +++---- .../rfid/domain/vo/RfidReadRecordVo.java | 10 ++--- .../dromara/rfid/mapper/RfidDeviceMapper.java | 15 +++---- .../rfid/mapper/RfidReadRecordMapper.java | 13 ++++--- .../dromara/rfid/mapper/StatisticsMapper.java | 3 +- .../rfid/service/IRfidReadRecordService.java | 6 +-- .../service/impl/RfidDeviceServiceImpl.java | 24 ++++++------ .../impl/RfidReadRecordServiceImpl.java | 22 +++++------ 16 files changed, 130 insertions(+), 119 deletions(-) diff --git a/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/controller/RfidDeviceController.java b/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/controller/RfidDeviceController.java index d633b03..9d12d4e 100644 --- a/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/controller/RfidDeviceController.java +++ b/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/controller/RfidDeviceController.java @@ -1,26 +1,27 @@ 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 org.springframework.web.bind.annotation.*; -import org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.log.enums.BusinessType; import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.rfid.domain.vo.RfidDeviceVo; -import org.dromara.rfid.domain.bo.RfidDeviceBo; -import org.dromara.rfid.service.IRfidDeviceService; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +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.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 list = rfidDeviceService.queryList(bo); return R.ok(list); } - + } diff --git a/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/controller/RfidDowntimeRecordController.java b/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/controller/RfidDowntimeRecordController.java index c76cfbf..522516a 100644 --- a/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/controller/RfidDowntimeRecordController.java +++ b/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/controller/RfidDowntimeRecordController.java @@ -1,22 +1,25 @@ package org.dromara.rfid.controller; -import java.util.List; - -import lombok.RequiredArgsConstructor; -import jakarta.servlet.http.HttpServletResponse; import cn.dev33.satoken.annotation.SaCheckPermission; -import org.springframework.web.bind.annotation.*; -import org.springframework.validation.annotation.Validated; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; +import org.dromara.common.excel.utils.ExcelUtil; 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.TableDataInfo; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.rfid.domain.vo.RfidReadRecordVo; -import org.dromara.rfid.domain.vo.RfidDowntimeRecordVo; +import org.dromara.common.web.core.BaseController; 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.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; /** * 停机记录 diff --git a/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/controller/RfidReadRecordController.java b/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/controller/RfidReadRecordController.java index c027fd5..54c2a3c 100644 --- a/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/controller/RfidReadRecordController.java +++ b/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/controller/RfidReadRecordController.java @@ -1,28 +1,29 @@ 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 org.springframework.format.annotation.DateTimeFormat; -import org.springframework.web.bind.annotation.*; -import org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.log.enums.BusinessType; import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.rfid.domain.vo.RfidReadRecordVo; -import org.dromara.rfid.domain.bo.RfidReadRecordBo; -import org.dromara.rfid.service.IRfidReadRecordService; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +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.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)); } - /** + /** * 下拉框查询读取记录列表 */ @SaCheckPermission("rfid:rfidReadRecord:list") @@ -121,5 +122,5 @@ public class RfidReadRecordController extends BaseController { List list = rfidReadRecordService.queryList(bo); return R.ok(list); } - + } diff --git a/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/domain/RfidDevice.java b/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/domain/RfidDevice.java index 5eb1288..0487abd 100644 --- a/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/domain/RfidDevice.java +++ b/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/domain/RfidDevice.java @@ -1,13 +1,14 @@ package org.dromara.rfid.domain; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; +import java.util.Date; /** * 设备信息对象 rfid_device diff --git a/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/domain/bo/RfidDeviceBo.java b/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/domain/bo/RfidDeviceBo.java index e0abbb0..e60860a 100644 --- a/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/domain/bo/RfidDeviceBo.java +++ b/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/domain/bo/RfidDeviceBo.java @@ -1,15 +1,16 @@ 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 jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Data; 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 com.fasterxml.jackson.annotation.JsonFormat; /** * 设备信息业务对象 rfid_device diff --git a/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/domain/bo/RfidReadRecordBo.java b/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/domain/bo/RfidReadRecordBo.java index b1c9dda..daccc54 100644 --- a/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/domain/bo/RfidReadRecordBo.java +++ b/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/domain/bo/RfidReadRecordBo.java @@ -1,15 +1,17 @@ package org.dromara.rfid.domain.bo; -import org.dromara.rfid.domain.RfidReadRecord; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; +import com.fasterxml.jackson.annotation.JsonFormat; import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Data; 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 com.fasterxml.jackson.annotation.JsonFormat; /** * 读取记录业务对象 diff --git a/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/domain/vo/HomeStatsVO.java b/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/domain/vo/HomeStatsVO.java index a13f26b..890a571 100644 --- a/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/domain/vo/HomeStatsVO.java +++ b/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/domain/vo/HomeStatsVO.java @@ -1,6 +1,7 @@ package org.dromara.rfid.domain.vo; import lombok.Data; + import java.io.Serial; import java.io.Serializable; import java.util.List; diff --git a/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/domain/vo/RfidDeviceVo.java b/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/domain/vo/RfidDeviceVo.java index 01512df..2d464fb 100644 --- a/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/domain/vo/RfidDeviceVo.java +++ b/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/domain/vo/RfidDeviceVo.java @@ -1,14 +1,12 @@ 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.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; import io.github.linpeilie.annotations.AutoMapper; 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.Serializable; diff --git a/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/domain/vo/RfidDowntimeRecordVo.java b/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/domain/vo/RfidDowntimeRecordVo.java index 403d9c5..03b47fb 100644 --- a/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/domain/vo/RfidDowntimeRecordVo.java +++ b/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/domain/vo/RfidDowntimeRecordVo.java @@ -1,16 +1,16 @@ 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.Serializable; 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; - /** * 停机记录视图对象 *

diff --git a/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/domain/vo/RfidReadRecordVo.java b/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/domain/vo/RfidReadRecordVo.java index d0d34b5..d5b65ea 100644 --- a/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/domain/vo/RfidReadRecordVo.java +++ b/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/domain/vo/RfidReadRecordVo.java @@ -1,17 +1,17 @@ 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.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; +import com.fasterxml.jackson.annotation.JsonFormat; import io.github.linpeilie.annotations.AutoMapper; 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.Serializable; +import java.util.Date; /** * 读取记录视图对象 rfid_read_record diff --git a/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/mapper/RfidDeviceMapper.java b/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/mapper/RfidDeviceMapper.java index 023c222..bb08ce8 100644 --- a/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/mapper/RfidDeviceMapper.java +++ b/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/mapper/RfidDeviceMapper.java @@ -1,16 +1,17 @@ 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.vo.DashboardVO; -import org.dromara.rfid.domain.vo.RfidDeviceVo; import org.dromara.rfid.domain.vo.RfidDashboardStatsVo; -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 org.dromara.rfid.domain.vo.RfidDeviceVo; + import java.util.Collection; +import java.util.List; /** * 设备信息Mapper接口 diff --git a/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/mapper/RfidReadRecordMapper.java b/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/mapper/RfidReadRecordMapper.java index b13d283..4943c85 100644 --- a/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/mapper/RfidReadRecordMapper.java +++ b/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/mapper/RfidReadRecordMapper.java @@ -1,14 +1,15 @@ 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.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.List; /** * 读取记录Mapper接口 diff --git a/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/mapper/StatisticsMapper.java b/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/mapper/StatisticsMapper.java index fcda65e..647d1ea 100644 --- a/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/mapper/StatisticsMapper.java +++ b/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/mapper/StatisticsMapper.java @@ -1,7 +1,8 @@ package org.dromara.rfid.mapper; -import org.dromara.rfid.domain.vo.HomeStatsVO; import org.apache.ibatis.annotations.Mapper; +import org.dromara.rfid.domain.vo.HomeStatsVO; + import java.util.List; /** diff --git a/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/service/IRfidReadRecordService.java b/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/service/IRfidReadRecordService.java index e102a2d..15b66a3 100644 --- a/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/service/IRfidReadRecordService.java +++ b/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/service/IRfidReadRecordService.java @@ -1,9 +1,9 @@ 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.TableDataInfo; +import org.dromara.rfid.domain.bo.RfidReadRecordBo; +import org.dromara.rfid.domain.vo.RfidReadRecordVo; import java.util.Collection; import java.util.Date; diff --git a/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/service/impl/RfidDeviceServiceImpl.java b/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/service/impl/RfidDeviceServiceImpl.java index 4f70547..c707ecf 100644 --- a/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/service/impl/RfidDeviceServiceImpl.java +++ b/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/service/impl/RfidDeviceServiceImpl.java @@ -1,31 +1,31 @@ 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.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.dromara.rfid.domain.bo.RfidDeviceBo; -import org.dromara.rfid.domain.vo.RfidDeviceVo; +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.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.rfid.domain.RfidDevice; 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.RfidReadRecordMapper; 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.List; -import java.util.Collection; /** * 设备信息Service业务层处理 diff --git a/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/service/impl/RfidReadRecordServiceImpl.java b/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/service/impl/RfidReadRecordServiceImpl.java index 9ed8187..2a6c768 100644 --- a/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/service/impl/RfidReadRecordServiceImpl.java +++ b/ruoyi-modules/hw-rfid/src/main/java/org/dromara/rfid/service/impl/RfidReadRecordServiceImpl.java @@ -2,30 +2,30 @@ package org.dromara.rfid.service.impl; import cn.hutool.core.collection.CollUtil; 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.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.query.LambdaQueryWrapper; -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.common.mybatis.core.page.TableDataInfo; +import org.dromara.rfid.domain.RfidReadRecord; import org.dromara.rfid.domain.bo.RfidReadRecordBo; 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.service.IRfidReadRecordService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.time.LocalDate; import java.time.temporal.ChronoUnit; +import java.util.Collection; import java.util.Date; import java.util.List; -import java.util.Collection; import java.util.regex.Pattern; /**