质检-断面仪

1、文件名称调整

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/QProfilerOffsetDTO.java → blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/ProfilerOffsetDTO.java

@@ -3,14 +3,14 @@ package org.springblade.manager.dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.manager.entity.QProfilerOffset;
+import org.springblade.manager.entity.ProfilerOffset;
 
 /**
  * @author LHB
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class QProfilerOffsetDTO extends QProfilerOffset {
+public class ProfilerOffsetDTO extends ProfilerOffset {
     @ApiModelProperty(value = "当前页")
     private Integer current;
     @ApiModelProperty(value = "每页显示数量")

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/ProfilerOffsetResultDTO.java

@@ -0,0 +1,22 @@
+package org.springblade.manager.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.manager.entity.ProfilerData;
+import org.springblade.manager.entity.ProfilerOffset;
+import org.springblade.manager.entity.ProfilerStandardSectionBean;
+
+import java.util.List;
+
+/**
+ * @author LHB
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class ProfilerOffsetResultDTO extends ProfilerOffset {
+    @ApiModelProperty(value = "标准断面")
+    private List<ProfilerStandardSectionBean> sectionBeans;
+    @ApiModelProperty(value = "测量点数组")
+    private List<ProfilerData> data;
+}

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/QProfilerOffsetResultDTO.java

@@ -1,22 +0,0 @@
-package org.springblade.manager.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springblade.manager.entity.QProfilerData;
-import org.springblade.manager.entity.QProfilerOffset;
-import org.springblade.manager.entity.QProfilerStandardSectionBean;
-
-import java.util.List;
-
-/**
- * @author LHB
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-public class QProfilerOffsetResultDTO extends QProfilerOffset {
-    @ApiModelProperty(value = "标准断面")
-    private List<QProfilerStandardSectionBean> sectionBeans;
-    @ApiModelProperty(value = "测量点数组")
-    private List<QProfilerData> data;
-}

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/QProfilerData.java → blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/ProfilerData.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import java.time.LocalDateTime;
-import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
@@ -19,7 +18,7 @@ import org.springframework.format.annotation.DateTimeFormat;
  */
 @TableName(value ="q_profiler_data")
 @Data
-public class QProfilerData {
+public class ProfilerData {
     /**
      * 
      */

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/QProfilerOffset.java → blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/ProfilerOffset.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import java.time.LocalDateTime;
-import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
@@ -20,7 +19,7 @@ import org.springframework.format.annotation.DateTimeFormat;
  */
 @TableName(value ="q_profiler_offset")
 @Data
-public class QProfilerOffset {
+public class ProfilerOffset {
     /**
      * 
      */

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/QProfilerStandardSectionBean.java → blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/ProfilerStandardSectionBean.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import java.time.LocalDateTime;
-import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
@@ -20,7 +19,7 @@ import org.springframework.format.annotation.DateTimeFormat;
  */
 @TableName(value ="q_profiler_standard_section_bean")
 @Data
-public class QProfilerStandardSectionBean {
+public class ProfilerStandardSectionBean {
     /**
      * 
      */

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/QProfilerController.java → blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ProfilerController.java

@@ -1,6 +1,5 @@
 package org.springblade.manager.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
@@ -8,12 +7,12 @@ import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.StringUtil;
-import org.springblade.manager.dto.QProfilerOffsetDTO;
-import org.springblade.manager.dto.QProfilerOffsetResultDTO;
-import org.springblade.manager.entity.QProfilerOffset;
+import org.springblade.manager.dto.ProfilerOffsetDTO;
+import org.springblade.manager.dto.ProfilerOffsetResultDTO;
+import org.springblade.manager.entity.ProfilerOffset;
 import org.springblade.manager.entity.profiler.ProfilerResult;
 import org.springblade.manager.entity.profiler.ProfilerSaveDTO;
-import org.springblade.manager.service.QProfilerOffsetService;
+import org.springblade.manager.service.ProfilerOffsetService;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -24,9 +23,9 @@ import org.springframework.web.multipart.MultipartFile;
 @AllArgsConstructor
 @RequestMapping("/profiler")
 @Api(value = "质检-综合管理-断面仪", tags = "质检-综合管理-断面仪")
-public class QProfilerController {
+public class ProfilerController {
 
-    private final QProfilerOffsetService offsetService;
+    private final ProfilerOffsetService offsetService;
 
     /**
      * 新增接口
@@ -62,13 +61,8 @@ public class QProfilerController {
     @ApiOperationSupport(order = 2)
     @ApiOperation(value = "查询接口", notes = "")
     @PostMapping("/page")
-    public R<Page<QProfilerOffset>> page(QProfilerOffsetDTO offset) {
-        QueryWrapper<QProfilerOffset> qProfilerOffsetQueryWrapper = new QueryWrapper<>();
-        qProfilerOffsetQueryWrapper.lambda()
-                .eq(StringUtil.isNotBlank(offset.getUserName()), QProfilerOffset::getUserName, offset.getUserName())
-                .ge(StringUtil.isNotBlank(offset.getStartTime()), QProfilerOffset::getDate, offset.getStartTime())
-                .le(StringUtil.isNotBlank(offset.getEndTime()), QProfilerOffset::getDate, offset.getEndTime());
-        return R.data(offsetService.page(new Page<>(offset.getCurrent(), offset.getSize())));
+    public R<Page<ProfilerOffset>> page(ProfilerOffsetDTO offset) {
+        return R.data(offsetService.getPage(offset));
     }
 
     /**
@@ -77,7 +71,7 @@ public class QProfilerController {
     @ApiOperationSupport(order = 3)
     @ApiOperation(value = "查询详情接口", notes = "")
     @GetMapping("/getOne")
-    public R<QProfilerOffsetResultDTO> getOne(Long id) {
+    public R<ProfilerOffsetResultDTO> getOne(Long id) {
         return R.data(offsetService.getOne(id));
     }
 
@@ -87,7 +81,7 @@ public class QProfilerController {
     @ApiOperationSupport(order = 4)
     @ApiOperation(value = "修改接口", notes = "")
     @PostMapping("/edit")
-    public R<Boolean> edit(@RequestBody QProfilerOffsetResultDTO offset) {
+    public R<Boolean> edit(@RequestBody ProfilerOffsetResultDTO offset) {
         return R.status(offsetService.edit(offset));
     }
 

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/QProfilerDataMapper.java → blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ProfilerDataMapper.java

@@ -1,6 +1,7 @@
 package org.springblade.manager.mapper;
 
-import org.springblade.manager.entity.QProfilerData;
+import org.apache.ibatis.annotations.Mapper;
+import org.springblade.manager.entity.ProfilerData;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -9,7 +10,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * @createDate 2025-10-27 15:58:56
 * @Entity org.springblade.manager.entity.QProfilerData
 */
-public interface QProfilerDataMapper extends BaseMapper<QProfilerData> {
+@Mapper
+public interface ProfilerDataMapper extends BaseMapper<ProfilerData> {
 
 }
 

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/QProfilerDataMapper.xml → blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ProfilerDataMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.manager.mapper.QProfilerDataMapper">
+<mapper namespace="org.springblade.manager.mapper.ProfilerDataMapper">
 
-    <resultMap id="BaseResultMap" type="org.springblade.manager.entity.QProfilerData">
+    <resultMap id="BaseResultMap" type="org.springblade.manager.entity.ProfilerData">
             <id property="id" column="id" />
             <result property="offsetId" column="offset_id" />
             <result property="angle" column="angle" />

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/QProfilerOffsetMapper.java → blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ProfilerOffsetMapper.java

@@ -1,6 +1,7 @@
 package org.springblade.manager.mapper;
 
-import org.springblade.manager.entity.QProfilerOffset;
+import org.apache.ibatis.annotations.Mapper;
+import org.springblade.manager.entity.ProfilerOffset;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -9,7 +10,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * @createDate 2025-10-27 15:58:56
 * @Entity org.springblade.manager.entity.QProfilerOffset
 */
-public interface QProfilerOffsetMapper extends BaseMapper<QProfilerOffset> {
+@Mapper
+public interface ProfilerOffsetMapper extends BaseMapper<ProfilerOffset> {
 
 }
 

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/QProfilerOffsetMapper.xml → blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ProfilerOffsetMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.manager.mapper.QProfilerOffsetMapper">
+<mapper namespace="org.springblade.manager.mapper.ProfilerOffsetMapper">
 
-    <resultMap id="BaseResultMap" type="org.springblade.manager.entity.QProfilerOffset">
+    <resultMap id="BaseResultMap" type="org.springblade.manager.entity.ProfilerOffset">
             <id property="id" column="id" />
             <result property="deviceCode" column="device_code" />
             <result property="deviceHeight" column="device_height" />

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/QProfilerStandardSectionBeanMapper.java → blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ProfilerStandardSectionBeanMapper.java

@@ -1,6 +1,7 @@
 package org.springblade.manager.mapper;
 
-import org.springblade.manager.entity.QProfilerStandardSectionBean;
+import org.apache.ibatis.annotations.Mapper;
+import org.springblade.manager.entity.ProfilerStandardSectionBean;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -9,7 +10,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * @createDate 2025-10-27 15:58:56
 * @Entity org.springblade.manager.entity.QProfilerStandardSectionBean
 */
-public interface QProfilerStandardSectionBeanMapper extends BaseMapper<QProfilerStandardSectionBean> {
+@Mapper
+public interface ProfilerStandardSectionBeanMapper extends BaseMapper<ProfilerStandardSectionBean> {
 
 }
 

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/QProfilerStandardSectionBeanMapper.xml → blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ProfilerStandardSectionBeanMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.manager.mapper.QProfilerStandardSectionBeanMapper">
+<mapper namespace="org.springblade.manager.mapper.ProfilerStandardSectionBeanMapper">
 
-    <resultMap id="BaseResultMap" type="org.springblade.manager.entity.QProfilerStandardSectionBean">
+    <resultMap id="BaseResultMap" type="org.springblade.manager.entity.ProfilerStandardSectionBean">
             <id property="id" column="id" />
             <result property="offsetId" column="offset_id" />
             <result property="direction" column="direction" />

blade-service/blade-manager/src/main/java/org/springblade/manager/service/QProfilerDataService.java → blade-service/blade-manager/src/main/java/org/springblade/manager/service/ProfilerDataService.java

@@ -1,6 +1,6 @@
 package org.springblade.manager.service;
 
-import org.springblade.manager.entity.QProfilerData;
+import org.springblade.manager.entity.ProfilerData;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -8,6 +8,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 * @description 针对表【q_profiler_data(断面仪-测量点数组)】的数据库操作Service
 * @createDate 2025-10-27 15:58:56
 */
-public interface QProfilerDataService extends IService<QProfilerData> {
+public interface ProfilerDataService extends IService<ProfilerData> {
 
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/service/QProfilerOffsetService.java → blade-service/blade-manager/src/main/java/org/springblade/manager/service/ProfilerOffsetService.java

@@ -1,7 +1,9 @@
 package org.springblade.manager.service;
 
-import org.springblade.manager.dto.QProfilerOffsetResultDTO;
-import org.springblade.manager.entity.QProfilerOffset;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springblade.manager.dto.ProfilerOffsetDTO;
+import org.springblade.manager.dto.ProfilerOffsetResultDTO;
+import org.springblade.manager.entity.ProfilerOffset;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springblade.manager.entity.profiler.ProfilerResult;
 import org.springblade.manager.entity.profiler.ProfilerSaveDTO;
@@ -12,12 +14,14 @@ import org.springframework.web.multipart.MultipartFile;
 * @description 针对表【q_profiler_offset(断面仪-基础信息+测量者信息)】的数据库操作Service
 * @createDate 2025-10-27 15:58:56
 */
-public interface QProfilerOffsetService extends IService<QProfilerOffset> {
+public interface ProfilerOffsetService extends IService<ProfilerOffset> {
 
     ProfilerResult save(ProfilerSaveDTO save, MultipartFile file);
 
-    QProfilerOffsetResultDTO getOne(Long id);
+    ProfilerOffsetResultDTO getOne(Long id);
 
-    boolean edit(QProfilerOffsetResultDTO offset);
+    boolean edit(ProfilerOffsetResultDTO offset);
+
+    Page<ProfilerOffset> getPage(ProfilerOffsetDTO offset);
 
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/service/QProfilerStandardSectionBeanService.java → blade-service/blade-manager/src/main/java/org/springblade/manager/service/ProfilerStandardSectionBeanService.java

@@ -1,6 +1,6 @@
 package org.springblade.manager.service;
 
-import org.springblade.manager.entity.QProfilerStandardSectionBean;
+import org.springblade.manager.entity.ProfilerStandardSectionBean;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -8,6 +8,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 * @description 针对表【q_profiler_standard_section_bean(断面仪-标准断面)】的数据库操作Service
 * @createDate 2025-10-27 15:58:56
 */
-public interface QProfilerStandardSectionBeanService extends IService<QProfilerStandardSectionBean> {
+public interface ProfilerStandardSectionBeanService extends IService<ProfilerStandardSectionBean> {
 
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/QProfilerDataServiceImpl.java → blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ProfilerDataServiceImpl.java

@@ -1,9 +1,9 @@
 package org.springblade.manager.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springblade.manager.entity.QProfilerData;
-import org.springblade.manager.service.QProfilerDataService;
-import org.springblade.manager.mapper.QProfilerDataMapper;
+import org.springblade.manager.entity.ProfilerData;
+import org.springblade.manager.service.ProfilerDataService;
+import org.springblade.manager.mapper.ProfilerDataMapper;
 import org.springframework.stereotype.Service;
 
 /**
@@ -12,8 +12,8 @@ import org.springframework.stereotype.Service;
 * @createDate 2025-10-27 15:58:56
 */
 @Service
-public class QProfilerDataServiceImpl extends ServiceImpl<QProfilerDataMapper, QProfilerData>
-    implements QProfilerDataService{
+public class ProfilerDataServiceImpl extends ServiceImpl<ProfilerDataMapper, ProfilerData>
+    implements ProfilerDataService {
 
 }
 

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/QProfilerOffsetServiceImpl.java → blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ProfilerOffsetServiceImpl.java

@@ -2,26 +2,27 @@ package org.springblade.manager.service.impl;
 
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
-import com.alibaba.druid.support.json.JSONUtils;
 import com.alibaba.nacos.common.utils.MD5Utils;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springblade.common.utils.SnowFlakeUtil;
 import org.springblade.core.oss.model.BladeFile;
-import org.springblade.core.tool.jackson.JsonUtil;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.CollectionUtil;
-import org.springblade.manager.dto.QProfilerOffsetResultDTO;
-import org.springblade.manager.entity.QProfilerData;
-import org.springblade.manager.entity.QProfilerOffset;
-import org.springblade.manager.entity.QProfilerStandardSectionBean;
+import org.springblade.core.tool.utils.StringUtil;
+import org.springblade.manager.dto.ProfilerOffsetDTO;
+import org.springblade.manager.dto.ProfilerOffsetResultDTO;
+import org.springblade.manager.entity.ProfilerData;
+import org.springblade.manager.entity.ProfilerOffset;
+import org.springblade.manager.entity.ProfilerStandardSectionBean;
 import org.springblade.manager.entity.profiler.ProfilerResult;
 import org.springblade.manager.entity.profiler.ProfilerSaveDTO;
-import org.springblade.manager.service.QProfilerDataService;
-import org.springblade.manager.service.QProfilerOffsetService;
-import org.springblade.manager.mapper.QProfilerOffsetMapper;
-import org.springblade.manager.service.QProfilerStandardSectionBeanService;
-import org.springblade.manager.utils.FileUtils;
+import org.springblade.manager.service.ProfilerDataService;
+import org.springblade.manager.service.ProfilerOffsetService;
+import org.springblade.manager.mapper.ProfilerOffsetMapper;
+import org.springblade.manager.service.ProfilerStandardSectionBeanService;
 import org.springblade.resource.feign.NewIOSSClient;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -37,8 +38,8 @@ import java.util.List;
  * @createDate 2025-10-27 15:58:56
  */
 @Service
-public class QProfilerOffsetServiceImpl extends ServiceImpl<QProfilerOffsetMapper, QProfilerOffset>
-        implements QProfilerOffsetService {
+public class ProfilerOffsetServiceImpl extends ServiceImpl<ProfilerOffsetMapper, ProfilerOffset>
+        implements ProfilerOffsetService {
 
     //第三方的appKey 固定值
     private final static String APP_KEY = "QDM123";
@@ -49,9 +50,9 @@ public class QProfilerOffsetServiceImpl extends ServiceImpl<QProfilerOffsetMappe
     @Resource
     private NewIOSSClient newIOSSClient;
     @Resource
-    private QProfilerDataService dataService;
+    private ProfilerDataService dataService;
     @Resource
-    private QProfilerStandardSectionBeanService beanService;
+    private ProfilerStandardSectionBeanService beanService;
 
 
     @Override
@@ -80,13 +81,13 @@ public class QProfilerOffsetServiceImpl extends ServiceImpl<QProfilerOffsetMappe
             return ProfilerResult.error("10009","data参数格式错误","");
         }
         //获取基础信息 + 测量者信息
-        QProfilerOffset offset = jsonObject.getBean("offset", QProfilerOffset.class);
+        ProfilerOffset offset = jsonObject.getBean("offset", ProfilerOffset.class);
         if(offset == null){
-            offset = new QProfilerOffset();
+            offset = new ProfilerOffset();
         }
         offset.setId(id);
         offset.setDeviceCode(deviceCode);
-        QProfilerOffset info = jsonObject.getBean("info", QProfilerOffset.class);
+        ProfilerOffset info = jsonObject.getBean("info", ProfilerOffset.class);
         //把测量者信息赋值给基础信息对象
         if(info != null){
             offset.setChannelName(info.getChannelName());
@@ -98,9 +99,9 @@ public class QProfilerOffsetServiceImpl extends ServiceImpl<QProfilerOffsetMappe
         }
         //获取标准断面数据
         JSONObject mStandardSectionDataBeanList = jsonObject.getJSONObject("standardSectionBean");
-        List<QProfilerStandardSectionBean> standardSectionBean = null;
+        List<ProfilerStandardSectionBean> standardSectionBean = null;
         if(mStandardSectionDataBeanList != null){
-            standardSectionBean = mStandardSectionDataBeanList.getBeanList("mStandardSectionDataBeanList", QProfilerStandardSectionBean.class);
+            standardSectionBean = mStandardSectionDataBeanList.getBeanList("mStandardSectionDataBeanList", ProfilerStandardSectionBean.class);
             if(standardSectionBean != null){
                 standardSectionBean.forEach(f ->{
                     f.setId(SnowFlakeUtil.getId());
@@ -109,7 +110,7 @@ public class QProfilerOffsetServiceImpl extends ServiceImpl<QProfilerOffsetMappe
             }
         }
         //获取测量数据
-        List<QProfilerData> data = jsonObject.getBeanList("data", QProfilerData.class);
+        List<ProfilerData> data = jsonObject.getBeanList("data", ProfilerData.class);
         if(data != null){
             data.forEach(f -> {
                 f.setId(SnowFlakeUtil.getId());
@@ -150,13 +151,13 @@ public class QProfilerOffsetServiceImpl extends ServiceImpl<QProfilerOffsetMappe
     }
 
     @Override
-    public QProfilerOffsetResultDTO getOne(Long id) {
-        QProfilerOffset byId = this.getById(id);
+    public ProfilerOffsetResultDTO getOne(Long id) {
+        ProfilerOffset byId = this.getById(id);
         if(byId != null){
-            QProfilerOffsetResultDTO resultDTO = BeanUtil.copyProperties(byId, QProfilerOffsetResultDTO.class);
+            ProfilerOffsetResultDTO resultDTO = BeanUtil.copyProperties(byId, ProfilerOffsetResultDTO.class);
             if(resultDTO != null){
-                List<QProfilerStandardSectionBean> list = beanService.list(Wrappers.<QProfilerStandardSectionBean>lambdaQuery().eq(QProfilerStandardSectionBean::getOffsetId, id));
-                List<QProfilerData> list1 = dataService.list(Wrappers.<QProfilerData>lambdaQuery().eq(QProfilerData::getOffsetId, id));
+                List<ProfilerStandardSectionBean> list = beanService.list(Wrappers.<ProfilerStandardSectionBean>lambdaQuery().eq(ProfilerStandardSectionBean::getOffsetId, id));
+                List<ProfilerData> list1 = dataService.list(Wrappers.<ProfilerData>lambdaQuery().eq(ProfilerData::getOffsetId, id));
                 resultDTO.setSectionBeans(list);
                 resultDTO.setData(list1);
             }
@@ -167,20 +168,30 @@ public class QProfilerOffsetServiceImpl extends ServiceImpl<QProfilerOffsetMappe
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean edit(QProfilerOffsetResultDTO offset) {
-        QProfilerOffset qProfilerOffset = BeanUtil.copyProperties(offset, QProfilerOffset.class);
+    public boolean edit(ProfilerOffsetResultDTO offset) {
+        ProfilerOffset qProfilerOffset = BeanUtil.copyProperties(offset, ProfilerOffset.class);
         boolean update = this.updateById(qProfilerOffset);
 
-        List<QProfilerStandardSectionBean> sectionBeans = offset.getSectionBeans();
+        List<ProfilerStandardSectionBean> sectionBeans = offset.getSectionBeans();
         if(CollectionUtil.isNotEmpty(sectionBeans)){
             beanService.updateBatchById(sectionBeans);
         }
-        List<QProfilerData> data = offset.getData();
+        List<ProfilerData> data = offset.getData();
         if(CollectionUtil.isNotEmpty(data)){
             dataService.updateBatchById(data);
         }
         return update;
     }
+
+    @Override
+    public Page<ProfilerOffset> getPage(ProfilerOffsetDTO offset) {
+        QueryWrapper<ProfilerOffset> qProfilerOffsetQueryWrapper = new QueryWrapper<>();
+        qProfilerOffsetQueryWrapper.lambda()
+                .eq(StringUtil.isNotBlank(offset.getUserName()), ProfilerOffset::getUserName, offset.getUserName())
+                .ge(StringUtil.isNotBlank(offset.getStartTime()), ProfilerOffset::getDate, offset.getStartTime())
+                .le(StringUtil.isNotBlank(offset.getEndTime()), ProfilerOffset::getDate, offset.getEndTime());
+        return baseMapper.selectPage(new Page<>(offset.getCurrent(), offset.getSize()),qProfilerOffsetQueryWrapper);
+    }
 }
 
 

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ProfilerStandardSectionBeanServiceImpl.java

@@ -0,0 +1,22 @@
+package org.springblade.manager.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.manager.entity.ProfilerStandardSectionBean;
+import org.springblade.manager.service.ProfilerStandardSectionBeanService;
+import org.springblade.manager.mapper.ProfilerStandardSectionBeanMapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author LHB
+* @description 针对表【q_profiler_standard_section_bean(断面仪-标准断面)】的数据库操作Service实现
+* @createDate 2025-10-27 15:58:56
+*/
+@Service
+public class ProfilerStandardSectionBeanServiceImpl extends ServiceImpl<ProfilerStandardSectionBeanMapper, ProfilerStandardSectionBean>
+    implements ProfilerStandardSectionBeanService {
+
+}
+
+
+
+

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/QProfilerStandardSectionBeanServiceImpl.java

@@ -1,22 +0,0 @@
-package org.springblade.manager.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springblade.manager.entity.QProfilerStandardSectionBean;
-import org.springblade.manager.service.QProfilerStandardSectionBeanService;
-import org.springblade.manager.mapper.QProfilerStandardSectionBeanMapper;
-import org.springframework.stereotype.Service;
-
-/**
-* @author LHB
-* @description 针对表【q_profiler_standard_section_bean(断面仪-标准断面)】的数据库操作Service实现
-* @createDate 2025-10-27 15:58:56
-*/
-@Service
-public class QProfilerStandardSectionBeanServiceImpl extends ServiceImpl<QProfilerStandardSectionBeanMapper, QProfilerStandardSectionBean>
-    implements QProfilerStandardSectionBeanService{
-
-}
-
-
-
-