保存测量结果

src/main/java/com/fdkankan/fusion/controller/FusionGuideController.java

@@ -27,6 +27,9 @@ public class FusionGuideController {
 
     @GetMapping("/allList")
     public ResultData allList(@RequestParam(required = false) Integer fusionId){
+        if(fusionId == null){
+            throw new BusinessException(ErrorCode.MISSING_REQUIRED_PARAMETERS);
+        }
         return ResultData.ok(fusionGuideService.getAllList(fusionId));
     }
 

src/main/java/com/fdkankan/fusion/controller/FusionMeterController.java

@@ -0,0 +1,82 @@
+package com.fdkankan.fusion.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.fdkankan.common.constant.ErrorCode;
+import com.fdkankan.common.response.ResultData;
+import com.fdkankan.fusion.entity.FusionMeter;
+import com.fdkankan.fusion.exception.BusinessException;
+import com.fdkankan.fusion.service.IFusionMeterService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2022-08-11
+ */
+@RestController
+@RequestMapping("/fusionMeter")
+public class FusionMeterController {
+
+    @Autowired
+    IFusionMeterService fusionMeterService;
+
+    @GetMapping("/allList")
+    public ResultData allList(@RequestParam(required = false) Integer fusionId,
+                              @RequestParam(required = false) String meterTitle){
+        if(fusionId == null){
+            throw new BusinessException(ErrorCode.MISSING_REQUIRED_PARAMETERS);
+        }
+        return ResultData.ok(fusionMeterService.getListByFusionId(fusionId,meterTitle));
+    }
+
+    @PostMapping("/add")
+    public ResultData add(@RequestBody FusionMeter fusionMeter){
+        fusionMeterService.add(fusionMeter);
+        return ResultData.ok();
+    }
+
+    @PostMapping("/updateMeterTitle")
+    public ResultData updateMeterTitle(@RequestBody FusionMeter fusionMeter){
+        if(fusionMeter.getFusionMeterId() == null || StringUtils.isEmpty(fusionMeter.getMeterTitle())){
+            throw new BusinessException(ErrorCode.MISSING_REQUIRED_PARAMETERS);
+        }
+        LambdaUpdateWrapper<FusionMeter> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(FusionMeter::getFusionMeterId,fusionMeter.getFusionMeterId())
+                .set(FusionMeter::getMeterTitle,fusionMeter.getMeterTitle());
+        fusionMeterService.update(wrapper);
+        return ResultData.ok();
+    }
+    @PostMapping("/hide")
+    public ResultData hide( @RequestBody FusionMeter fusionMeter){
+        if((fusionMeter.getFusionMeterId() == null&& fusionMeter.getFusionId()== null) || fusionMeter.getHide()== null){
+            throw new BusinessException(ErrorCode.MISSING_REQUIRED_PARAMETERS);
+        }
+        LambdaUpdateWrapper<FusionMeter> wrapper = new LambdaUpdateWrapper<>();
+        if(fusionMeter.getFusionId()!=null){
+            wrapper.eq(FusionMeter::getFusionId,fusionMeter.getFusionId());
+        }
+        if(fusionMeter.getFusionMeterId()!=null){
+            wrapper.eq(FusionMeter::getFusionMeterId,fusionMeter.getFusionMeterId());
+        }
+        wrapper.set(FusionMeter::getHide,fusionMeter.getHide());
+        fusionMeterService.update(wrapper);
+        return ResultData.ok();
+    }
+
+    @PostMapping("/delete")
+    public ResultData delete(@RequestBody FusionMeter fusionMeter){
+        if(fusionMeter.getFusionMeterId() == null ){
+            throw new BusinessException(ErrorCode.MISSING_REQUIRED_PARAMETERS);
+        }
+        fusionMeterService.removeById(fusionMeter.getFusionMeterId());
+        return ResultData.ok();
+    }
+
+}
+

src/main/java/com/fdkankan/fusion/entity/FusionMeter.java

@@ -0,0 +1,81 @@
+package com.fdkankan.fusion.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 
+ * @since 2022-08-11
+ */
+@Getter
+@Setter
+@TableName("t_fusion_meter")
+public class FusionMeter implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 测量
+     */
+    @TableId(value = "fusion_meter_id", type = IdType.AUTO)
+    private Integer fusionMeterId;
+
+    /**
+     * 融合id
+     */
+    @TableField("fusion_id")
+    private Integer fusionId;
+
+    /**
+     * 标题
+     */
+    @TableField("meter_title")
+    private String meterTitle;
+
+    /**
+     * 测量工具类型，0 自由，1垂直，2面积
+     */
+    @TableField("meter_type")
+    private Integer meterType;
+
+    /**
+     * 位置
+     */
+    @TableField("position")
+    private String position;
+
+    /**
+     * 长度  米
+     */
+    @TableField("length")
+    private Double length;
+
+    /**
+     * 0展示，1隐藏
+     */
+    @TableField("hide")
+    private Integer hide;
+
+    @TableField("tb_status")
+    @TableLogic
+    private Integer tbStatus;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+
+}

src/main/java/com/fdkankan/fusion/generate/AutoGenerate.java

@@ -18,7 +18,7 @@ public class AutoGenerate {
         String path =System.getProperty("user.dir") ;
 
         generate(path,"fusion", getTables(new String[]{
-                "t_fusion_guide",
+                "t_fusion_meter",
         }));
 
 //        generate(path,"goods", getTables(new String[]{

src/main/java/com/fdkankan/fusion/mapper/IFusionMeterMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.fusion.mapper;
+
+import com.fdkankan.fusion.entity.FusionMeter;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2022-08-11
+ */
+@Mapper
+public interface IFusionMeterMapper extends BaseMapper<FusionMeter> {
+
+}

src/main/java/com/fdkankan/fusion/service/IFusionMeterService.java

@@ -0,0 +1,21 @@
+package com.fdkankan.fusion.service;
+
+import com.fdkankan.fusion.entity.FusionMeter;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2022-08-11
+ */
+public interface IFusionMeterService extends IService<FusionMeter> {
+
+    List<FusionMeter> getListByFusionId(Integer fusionId, String meterTitle);
+
+    void add(FusionMeter fusionMeter);
+}

src/main/java/com/fdkankan/fusion/service/impl/FusionMeterServiceImpl.java

@@ -0,0 +1,51 @@
+package com.fdkankan.fusion.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.common.constant.ErrorCode;
+import com.fdkankan.fusion.entity.FusionMeter;
+import com.fdkankan.fusion.exception.BusinessException;
+import com.fdkankan.fusion.mapper.IFusionMeterMapper;
+import com.fdkankan.fusion.service.IFusionMeterService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2022-08-11
+ */
+@Service
+public class FusionMeterServiceImpl extends ServiceImpl<IFusionMeterMapper, FusionMeter> implements IFusionMeterService {
+
+    @Override
+    public List<FusionMeter> getListByFusionId(Integer fusionId, String meterTitle) {
+        LambdaQueryWrapper<FusionMeter> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(FusionMeter::getFusionId,fusionId);
+        if(StringUtils.isNotBlank(meterTitle)){
+            wrapper.like(FusionMeter::getMeterTitle,meterTitle);
+        }
+        return this.list(wrapper);
+    }
+
+    @Override
+    public void add(FusionMeter fusionMeter) {
+        if(fusionMeter.getFusionId() == null || fusionMeter.getLength() == null
+                || fusionMeter.getMeterType() == null || StringUtils.isEmpty(fusionMeter.getPosition())){
+            throw new BusinessException(ErrorCode.MISSING_REQUIRED_PARAMETERS);
+        }
+        String meterTitle = "总长度";
+        if(fusionMeter.getMeterType() == 2){
+            meterTitle = "总面积";
+        }
+        fusionMeter.setMeterTitle(meterTitle);
+        this.save(fusionMeter);
+
+
+    }
+}

src/main/resources/mapper/fusion/FusionMeterMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.fusion.mapper.IFusionMeterMapper">
+
+</mapper>