质检-断面仪

1、查询接口、修改接口开发

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/QProfilerOffsetDTO.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.QProfilerOffset;
+
+/**
+ * @author LHB
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class QProfilerOffsetDTO extends QProfilerOffset {
+    @ApiModelProperty(value = "当前页")
+    private Integer current;
+    @ApiModelProperty(value = "每页显示数量")
+    private Integer size;
+    @ApiModelProperty(value = "开始时间")
+    private String startTime;
+    @ApiModelProperty(value = "结束时间")
+    private String endTime;
+}

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/QProfilerOffsetResultDTO.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.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

@@ -8,6 +8,7 @@ import java.time.LocalDateTime;
 import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -23,36 +24,43 @@ public class QProfilerData {
      * 
      */
     @TableId(type = IdType.INPUT)
+    @ApiModelProperty("id")
     private Long id;
 
     /**
      * 基础信息id
      */
+    @ApiModelProperty("基础信息id")
     private Long offsetId;
 
     /**
      * 测点角度
      */
+    @ApiModelProperty("测点角度")
     private String angle;
 
     /**
      * 超/欠挖值
      */
+    @ApiModelProperty("超/欠挖值")
     private String backBreak;
 
     /**
      * 距离
      */
+    @ApiModelProperty("距离")
     private String dist;
 
     /**
      * x坐标
      */
+    @ApiModelProperty("x坐标")
     private String x;
 
     /**
      * z坐标
      */
+    @ApiModelProperty("z坐标")
     private String z;
 
     /**

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

@@ -9,6 +9,7 @@ import java.time.LocalDateTime;
 import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -24,79 +25,93 @@ public class QProfilerOffset {
      * 
      */
     @TableId(type = IdType.INPUT)
+    @ApiModelProperty("id")
     private Long id;
 
     /**
      * 断面仪测量设备编码或名称
      */
+    @ApiModelProperty("断面仪测量设备编码或名称")
     private String deviceCode;
 
     /**
      * 仪器高度（米）
      */
+    @ApiModelProperty("仪器高度（米）")
     private String deviceHeight;
 
     /**
      * 椭圆半径
      */
+    @ApiModelProperty("椭圆半径")
     private String ellipseRadius;
 
     /**
      * 斜坡
      */
+    @ApiModelProperty("斜坡")
     private String slope;
 
     /**
      * x方向偏移量（米）
      */
+    @ApiModelProperty("x方向偏移量（米）")
     @TableField(value = "x")
     private String x0;
 
     /**
      * z方向偏移量（米）
      */
+    @ApiModelProperty("z方向偏移量（米）")
     @TableField(value = "z")
     private String z0;
 
     /**
      * 隧道名称
      */
+    @ApiModelProperty("隧道名称")
     @TableField(value = "info_channel_name")
     private String channelName;
 
     /**
      * 施工单位
      */
+    @ApiModelProperty("施工单位")
     @TableField(value = "info_construction_unit")
     private String constructionUnit;
 
     /**
      * 测量时间
      */
+    @ApiModelProperty("测量时间")
     @TableField(value = "info_date")
     private String date;
 
     /**
      * 工程名称
      */
+    @ApiModelProperty("工程名称")
     @TableField(value = "info_name_of_project")
     private String nameOfProject;
 
     /**
      * 测量者
      */
+    @ApiModelProperty("测量者")
     @TableField(value = "info_user_name")
     private String userName;
 
     /**
      * 里程号
      */
+    @ApiModelProperty("里程号")
     @TableField(value = "info_mileage_number")
     private String mileageNumber;
 
     /**
      * 文件地址
      */
+    @ApiModelProperty("文件地址")
     private String fileUrl;
 
     /**

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

@@ -9,6 +9,7 @@ import java.time.LocalDateTime;
 import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -24,47 +25,56 @@ public class QProfilerStandardSectionBean {
      * 
      */
     @TableId(type = IdType.INPUT)
+    @ApiModelProperty("id")
     private Long id;
 
     /**
      * 基础信息id
      */
+    @ApiModelProperty("基础信息id")
     private Long offsetId;
 
     /**
      * 方向,true为顺时针，false为逆时针 
      */
+    @ApiModelProperty("方向,true为顺时针，false为逆时针 ")
     private String direction;
 
     /**
      * 终角
      */
+    @ApiModelProperty("终角")
     private String endAngle;
 
     /**
      * 半径
      */
+    @ApiModelProperty("半径")
     private String radius;
 
     /**
      * 查询
      */
+    @ApiModelProperty("查询")
     @TableField("`select`")
     private String select;
 
     /**
      * 起角（米）
      */
+    @ApiModelProperty("起角（米）")
     private String startAngle;
 
     /**
      * 圆心x（米）
      */
+    @ApiModelProperty("圆心x（米）")
     private String x;
 
     /**
      * 圆心z（米）
      */
+    @ApiModelProperty("圆心z（米）")
     private String y;
 
     /**

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/profiler/ProfilerSaveDTO.java

@@ -1,5 +1,6 @@
 package org.springblade.manager.entity.profiler;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -8,9 +9,14 @@ import lombok.Data;
  */
 @Data
 public class ProfilerSaveDTO {
+    @ApiModelProperty(value = "appKey")
     private String appKey;
+    @ApiModelProperty(value = "当前时间戳（秒）")
     private Long timestamp;
+    @ApiModelProperty(value = "签名")
     private String sign;
+    @ApiModelProperty(value = "编码")
     private String deviceCode;
+    @ApiModelProperty(value = "JSON数据")
     private String data;
 }

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

@@ -1,11 +1,15 @@
 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;
-import io.swagger.annotations.ApiImplicitParam;
 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.entity.profiler.ProfilerResult;
 import org.springblade.manager.entity.profiler.ProfilerSaveDTO;
@@ -26,29 +30,65 @@ public class QProfilerController {
 
     /**
      * 新增接口
-     *  第三方推送数据过来
+     * 第三方推送数据过来
      */
     @PostMapping("/save")
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "新增断面仪数据", notes = "")
     public ProfilerResult add(ProfilerSaveDTO save,
                               @RequestParam(value = "file", required = false) MultipartFile file) {
-        if(StringUtil.isBlank(save.getAppKey())){
+        if (StringUtil.isBlank(save.getAppKey())) {
             return ProfilerResult.error("1001", "appKey不能为空", "");
         }
-        if(save.getTimestamp() == null){
+        if (save.getTimestamp() == null) {
             return ProfilerResult.error("1002", "timestamp不能为空", "");
         }
-        if(StringUtil.isBlank(save.getSign())){
+        if (StringUtil.isBlank(save.getSign())) {
             return ProfilerResult.error("1003", "sign不能为空", "");
         }
-        if(StringUtil.isBlank(save.getDeviceCode())){
+        if (StringUtil.isBlank(save.getDeviceCode())) {
             return ProfilerResult.error("1004", "deviceCode不能为空", "");
         }
-        if(StringUtil.isBlank(save.getData())){
+        if (StringUtil.isBlank(save.getData())) {
             return ProfilerResult.error("1005", "data不能为空", "");
         }
         return offsetService.save(save, file);
     }
 
+
+    /**
+     * 查询接口
+     */
+    @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())));
+    }
+
+    /**
+     * 查询详情接口
+     */
+    @ApiOperationSupport(order = 3)
+    @ApiOperation(value = "查询详情接口", notes = "")
+    @GetMapping("/getOne")
+    public R<QProfilerOffsetResultDTO> getOne(Long id) {
+        return R.data(offsetService.getOne(id));
+    }
+
+    /**
+     * 编辑接口
+     */
+    @ApiOperationSupport(order = 4)
+    @ApiOperation(value = "修改接口", notes = "")
+    @PostMapping("/edit")
+    public R<Boolean> edit(@RequestBody QProfilerOffsetResultDTO offset) {
+        return R.status(offsetService.edit(offset));
+    }
+
 }

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

@@ -1,5 +1,6 @@
 package org.springblade.manager.service;
 
+import org.springblade.manager.dto.QProfilerOffsetResultDTO;
 import org.springblade.manager.entity.QProfilerOffset;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springblade.manager.entity.profiler.ProfilerResult;
@@ -14,4 +15,9 @@ import org.springframework.web.multipart.MultipartFile;
 public interface QProfilerOffsetService extends IService<QProfilerOffset> {
 
     ProfilerResult save(ProfilerSaveDTO save, MultipartFile file);
+
+    QProfilerOffsetResultDTO getOne(Long id);
+
+    boolean edit(QProfilerOffsetResultDTO offset);
+
 }

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

@@ -4,12 +4,14 @@ 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.toolkit.Wrappers;
 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;
@@ -146,6 +148,39 @@ public class QProfilerOffsetServiceImpl extends ServiceImpl<QProfilerOffsetMappe
             return false;
         }
     }
+
+    @Override
+    public QProfilerOffsetResultDTO getOne(Long id) {
+        QProfilerOffset byId = this.getById(id);
+        if(byId != null){
+            QProfilerOffsetResultDTO resultDTO = BeanUtil.copyProperties(byId, QProfilerOffsetResultDTO.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));
+                resultDTO.setSectionBeans(list);
+                resultDTO.setData(list1);
+            }
+            return resultDTO;
+        }
+        return null;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean edit(QProfilerOffsetResultDTO offset) {
+        QProfilerOffset qProfilerOffset = BeanUtil.copyProperties(offset, QProfilerOffset.class);
+        boolean update = this.updateById(qProfilerOffset);
+
+        List<QProfilerStandardSectionBean> sectionBeans = offset.getSectionBeans();
+        if(CollectionUtil.isNotEmpty(sectionBeans)){
+            beanService.updateBatchById(sectionBeans);
+        }
+        List<QProfilerData> data = offset.getData();
+        if(CollectionUtil.isNotEmpty(data)){
+            dataService.updateBatchById(data);
+        }
+        return update;
+    }
 }