试验参数相关

blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/TrialSievePoreClassification.java

@@ -0,0 +1,29 @@
+package org.springblade.business.entity;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+
+/**
+ * 试验筛孔分类实体
+ */
+@Data
+@TableName("u_trial_sieve_pore_classification")
+@EqualsAndHashCode(callSuper = true)
+public class TrialSievePoreClassification extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "合同段id", required = true)
+    private Long contractId;
+
+    @ApiModelProperty(value = "筛孔分类名称", required = true)
+    private String name;
+
+    @ApiModelProperty("排序")
+    private String sort;
+
+}

blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/TrialSievePoreClassificationData.java

@@ -0,0 +1,50 @@
+package org.springblade.business.entity;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+
+/**
+ * 试验筛孔分类尺寸数据实体
+ */
+@Data
+@TableName("u_trial_sieve_pore_classification_data")
+@EqualsAndHashCode(callSuper = true)
+public class TrialSievePoreClassificationData extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("分类id")
+    private Long classId;
+
+    @ApiModelProperty("筛孔尺寸")
+    private String sievePoreSize;
+
+    @ApiModelProperty("上限")
+    private String upperLimit;
+
+    @ApiModelProperty("下限")
+    private String lowerLimit;
+
+    @ApiModelProperty("标准")
+    private String standard;
+
+    @ApiModelProperty("限制区界限最大")
+    private String maxLimitBoundary;
+
+    @ApiModelProperty("限制区界限最小")
+    private String minLimitBoundary;
+
+    @ApiModelProperty("控制点界限最大")
+    private String maxLimitControl;
+
+    @ApiModelProperty("控制点界限最小")
+    private String minLimitControl;
+
+    @ApiModelProperty("排序")
+    private String sort;
+
+}

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

@@ -0,0 +1,31 @@
+package org.springblade.manager.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+
+@Data
+@TableName("m_trial_compaction_evaluation_param")
+@EqualsAndHashCode(callSuper = true)
+public class TrialCompactionEvaluationParam extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("N值")
+    private String valueN;
+
+    @ApiModelProperty("保证率99%")
+    private String assuranceRateNinetyNinePercent;
+
+    @ApiModelProperty("保证率95%")
+    private String assuranceRateNinetyFivePercent;
+
+    @ApiModelProperty("保证率90%")
+    private String assuranceRateNinetyPercent;
+
+    @ApiModelProperty("排序")
+    private String sort;
+
+}

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

@@ -0,0 +1,23 @@
+package org.springblade.manager.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+@Data
+@TableName("m_trial_temperature_density_param")
+@EqualsAndHashCode(callSuper = true)
+public class TrialTemperatureDensityParam extends BaseEntity {
+
+    @ApiModelProperty("温度")
+    private String temperature;
+
+    @ApiModelProperty("水密度")
+    private String waterDensity;
+
+    @ApiModelProperty("排序")
+    private String sort;
+
+}

blade-service/blade-business/src/main/java/org/springblade/business/controller/TrialSievePoreController.java

@@ -0,0 +1,86 @@
+package org.springblade.business.controller;
+
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springblade.business.entity.TrialSievePoreClassification;
+import org.springblade.business.entity.TrialSievePoreClassificationData;
+import org.springblade.business.service.ITrialSievePoreClassificationDataService;
+import org.springblade.business.service.ITrialSievePoreClassificationService;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@RestController
+@AllArgsConstructor
+@RequestMapping("/sieve/pore")
+@Api(value = "试验筛孔", tags = "试验筛孔接口")
+public class TrialSievePoreController extends BladeController {
+
+    private final ITrialSievePoreClassificationService iTrialSievePoreClassificationService;
+    private final ITrialSievePoreClassificationDataService iTrialSievePoreClassificationDataService;
+
+    @GetMapping("/classification/detail")
+    @ApiOperationSupport(order = 1)
+    @ApiOperation(value = "筛孔分类详情", notes = "传入id")
+    public R<TrialSievePoreClassification> classificationDetail(@Valid @RequestParam Long id) {
+        return R.data(iTrialSievePoreClassificationService.classificationDetail(id));
+    }
+
+    @PostMapping("/classification/submit")
+    @ApiOperationSupport(order = 2)
+    @ApiOperation(value = "筛孔分类新增或修改", notes = "传入TrialSievePoreClassification")
+    public R<Object> classificationSubmit(@RequestBody TrialSievePoreClassification obj) {
+        return R.status(iTrialSievePoreClassificationService.classificationSubmit(obj));
+    }
+
+    @PostMapping("/classification/remove")
+    @ApiOperationSupport(order = 3)
+    @ApiOperation(value = "筛孔分类删除", notes = "传入id")
+    public R<Object> classificationRemove(@Valid @RequestParam Long id) {
+        return R.status(iTrialSievePoreClassificationService.deleteLogic(Func.toLongList(String.valueOf(id))));
+    }
+
+    @GetMapping("/classification/list")
+    @ApiOperationSupport(order = 4)
+    @ApiOperation(value = "筛孔分类列表查询", notes = "传入合同段id")
+    public R<List<TrialSievePoreClassification>> classificationList(@Valid @RequestParam Long contractId) {
+        return R.data(iTrialSievePoreClassificationService.classificationList(contractId));
+    }
+
+    @GetMapping("/data/detail")
+    @ApiOperationSupport(order = 5)
+    @ApiOperation(value = "筛孔尺寸数据详情", notes = "传入id")
+    public R<TrialSievePoreClassificationData> dataDetail(@Valid @RequestParam Long id) {
+        return R.data(iTrialSievePoreClassificationDataService.dataDetail(id));
+    }
+
+    @PostMapping("/data/submit")
+    @ApiOperationSupport(order = 6)
+    @ApiOperation(value = "筛孔尺寸数据新增或修改", notes = "传入TrialSievePoreClassificationData")
+    public R<Object> dataSubmit(@RequestBody TrialSievePoreClassificationData obj) {
+        return R.status(iTrialSievePoreClassificationDataService.dataSubmit(obj));
+    }
+
+    @PostMapping("/data/remove")
+    @ApiOperationSupport(order = 7)
+    @ApiOperation(value = "筛孔尺寸数据删除", notes = "传入id")
+    public R<Object> dataRemove(@Valid @RequestParam Long id) {
+        return R.status(iTrialSievePoreClassificationDataService.deleteLogic(Func.toLongList(String.valueOf(id))));
+    }
+
+    @GetMapping("/data/page")
+    @ApiOperationSupport(order = 8)
+    @ApiOperation(value = "筛孔尺寸数据分页查询", notes = "传入size、current、分类classId")
+    public R<Object> dataPage(Query query, TrialSievePoreClassificationData obj) {
+        return R.data(iTrialSievePoreClassificationDataService.dataPage(Condition.getPage(query), obj));
+    }
+
+}

blade-service/blade-business/src/main/java/org/springblade/business/mapper/TrialSievePoreClassificationDataMapper.java

@@ -0,0 +1,8 @@
+package org.springblade.business.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springblade.business.entity.TrialSievePoreClassificationData;
+
+public interface TrialSievePoreClassificationDataMapper extends BaseMapper<TrialSievePoreClassificationData> {
+
+}

blade-service/blade-business/src/main/java/org/springblade/business/mapper/TrialSievePoreClassificationDataMapper.xml

@@ -0,0 +1,27 @@
+<?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="org.springblade.business.mapper.TrialSievePoreClassificationDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="ResultEntityMap" type="org.springblade.business.entity.TrialSievePoreClassificationData">
+        <result column="id" property="id"/>
+        <result column="class_id" property="classId"/>
+        <result column="sieve_pore_size" property="sievePoreSize"/>
+        <result column="upper_limit" property="upperLimit"/>
+        <result column="lower_limit" property="lowerLimit"/>
+        <result column="standard" property="standard"/>
+        <result column="max_limit_boundary" property="maxLimitBoundary"/>
+        <result column="min_limit_boundary" property="minLimitBoundary"/>
+        <result column="max_limit_control" property="maxLimitControl"/>
+        <result column="min_limit_control" property="minLimitControl"/>
+        <result column="sort" property="sort"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+    </resultMap>
+
+</mapper>

blade-service/blade-business/src/main/java/org/springblade/business/mapper/TrialSievePoreClassificationMapper.java

@@ -0,0 +1,7 @@
+package org.springblade.business.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springblade.business.entity.TrialSievePoreClassification;
+
+public interface TrialSievePoreClassificationMapper extends BaseMapper<TrialSievePoreClassification> {
+}

blade-service/blade-business/src/main/java/org/springblade/business/mapper/TrialSievePoreClassificationMapper.xml

@@ -0,0 +1,20 @@
+<?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="org.springblade.business.mapper.TrialSievePoreClassificationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="ResultEntityMap" type="org.springblade.business.entity.TrialSievePoreClassification">
+        <result column="id" property="id"/>
+        <result column="contract_id" property="contractId"/>
+        <result column="name" property="name"/>
+        <result column="sort" property="sort"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+    </resultMap>
+
+</mapper>

blade-service/blade-business/src/main/java/org/springblade/business/service/ITrialSievePoreClassificationDataService.java

@@ -0,0 +1,16 @@
+package org.springblade.business.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.business.entity.TrialSievePoreClassificationData;
+import org.springblade.core.mp.base.BaseService;
+
+
+public interface ITrialSievePoreClassificationDataService extends BaseService<TrialSievePoreClassificationData> {
+
+    TrialSievePoreClassificationData dataDetail(Long id);
+
+    boolean dataSubmit(TrialSievePoreClassificationData obj);
+
+    Object dataPage(IPage<TrialSievePoreClassificationData> page, TrialSievePoreClassificationData obj);
+
+}

blade-service/blade-business/src/main/java/org/springblade/business/service/ITrialSievePoreClassificationService.java

@@ -0,0 +1,16 @@
+package org.springblade.business.service;
+
+import org.springblade.business.entity.TrialSievePoreClassification;
+import org.springblade.core.mp.base.BaseService;
+
+import java.util.List;
+
+public interface ITrialSievePoreClassificationService extends BaseService<TrialSievePoreClassification> {
+
+    TrialSievePoreClassification classificationDetail(Long id);
+
+    boolean classificationSubmit(TrialSievePoreClassification obj);
+
+    List<TrialSievePoreClassification> classificationList(Long contractId);
+
+}

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TrialContainerClassificationServiceImpl.java

@@ -294,11 +294,7 @@ public class TrialContainerClassificationServiceImpl
 
             //解析构造插入数据
             for (List<Map<String, Object>> list : lists) {
-                for (int i = 0; i < list.size(); i++) {
-                    if (i == 0) {
-                        //跳过title
-                        continue;
-                    }
+                for (int i = 1; i < list.size(); i++) {
                     StringBuilder values = new StringBuilder();
                     for (Map.Entry<String, Object> col : list.get(i).entrySet()) {
                         values.append("'").append(ObjectUtil.isNotEmpty(col.getValue()) ? col.getValue() : null).append("',");

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TrialSievePoreClassificationServiceDataImpl.java

@@ -0,0 +1,42 @@
+package org.springblade.business.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.AllArgsConstructor;
+import org.springblade.business.entity.TrialSievePoreClassificationData;
+import org.springblade.business.mapper.TrialSievePoreClassificationDataMapper;
+import org.springblade.business.service.ITrialSievePoreClassificationDataService;
+import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.tool.utils.ObjectUtil;
+import org.springframework.stereotype.Service;
+
+
+@Service
+@AllArgsConstructor
+public class TrialSievePoreClassificationServiceDataImpl
+        extends BaseServiceImpl<TrialSievePoreClassificationDataMapper, TrialSievePoreClassificationData>
+        implements ITrialSievePoreClassificationDataService {
+
+    @Override
+    public TrialSievePoreClassificationData dataDetail(Long id) {
+        return baseMapper.selectById(id);
+    }
+
+    @Override
+    public boolean dataSubmit(TrialSievePoreClassificationData obj) {
+        return this.saveOrUpdate(obj);
+    }
+
+    @Override
+    public Object dataPage(IPage<TrialSievePoreClassificationData> page, TrialSievePoreClassificationData obj) {
+        if (ObjectUtil.isEmpty(obj.getClassId())) {
+            throw new ServiceException("未获取到筛孔分类信息，操作失败");
+        }
+        QueryWrapper<TrialSievePoreClassificationData> queryWrapper = Condition.getQueryWrapper(obj);
+        queryWrapper.lambda().eq(TrialSievePoreClassificationData::getClassId, obj.getClassId());
+        return this.page(page, queryWrapper.lambda().orderBy(true, true, TrialSievePoreClassificationData::getCreateTime));
+    }
+
+}

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TrialSievePoreClassificationServiceImpl.java

@@ -0,0 +1,34 @@
+package org.springblade.business.service.impl;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.AllArgsConstructor;
+import org.springblade.business.entity.TrialSievePoreClassification;
+import org.springblade.business.mapper.TrialSievePoreClassificationMapper;
+import org.springblade.business.service.ITrialSievePoreClassificationService;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+@AllArgsConstructor
+public class TrialSievePoreClassificationServiceImpl
+        extends BaseServiceImpl<TrialSievePoreClassificationMapper, TrialSievePoreClassification>
+        implements ITrialSievePoreClassificationService {
+
+    @Override
+    public TrialSievePoreClassification classificationDetail(Long id) {
+        return baseMapper.selectById(id);
+    }
+
+    @Override
+    public boolean classificationSubmit(TrialSievePoreClassification obj) {
+        return this.saveOrUpdate(obj);
+    }
+
+    @Override
+    public List<TrialSievePoreClassification> classificationList(Long contractId) {
+        return baseMapper.selectList(Wrappers.<TrialSievePoreClassification>lambdaQuery().eq(TrialSievePoreClassification::getContractId, contractId).orderBy(false, true, TrialSievePoreClassification::getCreateTime));
+    }
+
+}

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

@@ -0,0 +1,109 @@
+package org.springblade.manager.controller;
+
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.manager.entity.TrialCompactionEvaluationParam;
+import org.springblade.manager.entity.TrialTemperatureDensityParam;
+import org.springblade.manager.excel.TrialCompactionEvaluationParamExcel;
+import org.springblade.manager.excel.TrialCompactionEvaluationParamExcelImporter;
+import org.springblade.manager.excel.TrialTemperatureDensityParamExcel;
+import org.springblade.manager.excel.TrialTemperatureDensityParamExcelImporter;
+import org.springblade.manager.service.ITrialCompactionEvaluationParamService;
+import org.springblade.manager.service.ITrialTemperatureDensityParamService;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.validation.Valid;
+
+@RestController
+@AllArgsConstructor
+@RequestMapping("/trial/param")
+@Api(value = "试验参数配置", tags = "试验参数配置接口")
+public class TrialParamConfigurationController extends BladeController {
+
+    private final ITrialCompactionEvaluationParamService iTrialCompactionEvaluationParamService;
+    private final ITrialTemperatureDensityParamService iTrialTemperatureDensityParamService;
+
+    @GetMapping("/compaction/detail")
+    @ApiOperationSupport(order = 1)
+    @ApiOperation(value = "压实度详情", notes = "传入id")
+    public R<TrialCompactionEvaluationParam> compactionDetail(@Valid @RequestParam Long id) {
+        return R.data(iTrialCompactionEvaluationParamService.compactionDetail(id));
+    }
+
+    @GetMapping("/compaction/page")
+    @ApiOperationSupport(order = 2)
+    @ApiOperation(value = "压实度分页查询", notes = "传入size、current")
+    public R<Object> compactionPage(Query query, TrialCompactionEvaluationParam obj) {
+        return R.data(iTrialCompactionEvaluationParamService.compactionPage(Condition.getPage(query), obj));
+    }
+
+    @PostMapping("/compaction/submit")
+    @ApiOperationSupport(order = 3)
+    @ApiOperation(value = "压实度新增或修改", notes = "传入TrialCompactionEvaluationParam")
+    public R<Object> compactionSubmit(@RequestBody TrialCompactionEvaluationParam obj) {
+        return R.status(iTrialCompactionEvaluationParamService.compactionSubmit(obj));
+    }
+
+    @PostMapping("/compaction/remove")
+    @ApiOperationSupport(order = 4)
+    @ApiOperation(value = "压实度批量删除", notes = "传入ids")
+    public R<Object> compactionRemove(@Valid @RequestParam Long ids) {
+        return R.status(iTrialCompactionEvaluationParamService.deleteLogic(Func.toLongList(String.valueOf(ids))));
+    }
+
+    @PostMapping("/compaction/import-excel")
+    @ApiOperationSupport(order = 5)
+    @ApiOperation(value = "压实度导入excel", notes = "传入file、覆盖isCovered=1")
+    public R<Object> compactionImport(MultipartFile file, Integer isCovered) {
+        TrialCompactionEvaluationParamExcelImporter importer = new TrialCompactionEvaluationParamExcelImporter(iTrialCompactionEvaluationParamService, isCovered == 1);
+        ExcelUtil.save(file, importer, TrialCompactionEvaluationParamExcel.class);
+        return R.success("操作成功");
+    }
+
+    @GetMapping("/temperature-density/detail")
+    @ApiOperationSupport(order = 6)
+    @ApiOperation(value = "温度及密度详情", notes = "传入id")
+    public R<TrialTemperatureDensityParam> temperatureAndDensityDetail(@Valid @RequestParam Long id) {
+        return R.data(iTrialTemperatureDensityParamService.temperatureAndDensityDetail(id));
+    }
+
+    @GetMapping("/temperature-density/page")
+    @ApiOperationSupport(order = 7)
+    @ApiOperation(value = "温度及密度分页查询", notes = "传入size、current")
+    public R<Object> temperatureAndDensityPage(Query query, TrialTemperatureDensityParam obj) {
+        return R.data(iTrialTemperatureDensityParamService.temperatureAndDensityPage(Condition.getPage(query), obj));
+    }
+
+    @PostMapping("/temperature-density/submit")
+    @ApiOperationSupport(order = 8)
+    @ApiOperation(value = "温度及密度新增或修改", notes = "传入TrialTemperatureDensityParam")
+    public R<Object> temperatureAndDensitySubmit(@RequestBody TrialTemperatureDensityParam obj) {
+        return R.status(iTrialTemperatureDensityParamService.temperatureAndDensitySubmit(obj));
+    }
+
+    @PostMapping("/temperature-density/remove")
+    @ApiOperationSupport(order = 9)
+    @ApiOperation(value = "温度及密度批量删除", notes = "传入ids")
+    public R<Object> temperatureAndDensityRemove(@Valid @RequestParam Long ids) {
+        return R.status(iTrialTemperatureDensityParamService.deleteLogic(Func.toLongList(String.valueOf(ids))));
+    }
+
+    @PostMapping("/temperature-density/import-excel")
+    @ApiOperationSupport(order = 10)
+    @ApiOperation(value = "温度及密度导入excel", notes = "传入file、覆盖isCovered=1")
+    public R<Object> temperatureAndDensityImport(MultipartFile file, Integer isCovered) {
+        TrialTemperatureDensityParamExcelImporter importer = new TrialTemperatureDensityParamExcelImporter(iTrialTemperatureDensityParamService, isCovered == 1);
+        ExcelUtil.save(file, importer, TrialTemperatureDensityParamExcel.class);
+        return R.success("操作成功");
+    }
+
+}

blade-service/blade-manager/src/main/java/org/springblade/manager/excel/TrialCompactionEvaluationParamExcel.java

@@ -0,0 +1,31 @@
+package org.springblade.manager.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+@Data
+@ColumnWidth(16)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class TrialCompactionEvaluationParamExcel implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ExcelProperty("N值")
+    private String valueN;
+
+    @ExcelProperty("保证率99%")
+    private String assuranceRateNinetyNinePercent;
+
+    @ExcelProperty("保证率95%")
+    private String assuranceRateNinetyFivePercent;
+
+    @ExcelProperty("保证率90%")
+    private String assuranceRateNinetyPercent;
+
+}

blade-service/blade-manager/src/main/java/org/springblade/manager/excel/TrialCompactionEvaluationParamExcelImporter.java

@@ -0,0 +1,20 @@
+package org.springblade.manager.excel;
+
+import lombok.RequiredArgsConstructor;
+import org.springblade.core.excel.support.ExcelImporter;
+import org.springblade.manager.service.ITrialCompactionEvaluationParamService;
+
+import java.util.List;
+
+@RequiredArgsConstructor
+public class TrialCompactionEvaluationParamExcelImporter implements ExcelImporter<TrialCompactionEvaluationParamExcel> {
+
+    private final ITrialCompactionEvaluationParamService service;
+    private final Boolean isCovered;
+
+    @Override
+    public void save(List<TrialCompactionEvaluationParamExcel> data) {
+        service.importData(data, isCovered);
+    }
+
+}

blade-service/blade-manager/src/main/java/org/springblade/manager/excel/TrialTemperatureDensityParamExcel.java

@@ -0,0 +1,24 @@
+package org.springblade.manager.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@ColumnWidth(16)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class TrialTemperatureDensityParamExcel implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ExcelProperty("温度")
+    private String temperature;
+
+    @ExcelProperty("密度")
+    private String waterDensity;
+
+}

blade-service/blade-manager/src/main/java/org/springblade/manager/excel/TrialTemperatureDensityParamExcelImporter.java

@@ -0,0 +1,20 @@
+package org.springblade.manager.excel;
+
+import lombok.RequiredArgsConstructor;
+import org.springblade.core.excel.support.ExcelImporter;
+import org.springblade.manager.service.ITrialTemperatureDensityParamService;
+
+import java.util.List;
+
+@RequiredArgsConstructor
+public class TrialTemperatureDensityParamExcelImporter implements ExcelImporter<TrialTemperatureDensityParamExcel> {
+
+    private final ITrialTemperatureDensityParamService service;
+    private final Boolean isCovered;
+
+
+    @Override
+    public void save(List<TrialTemperatureDensityParamExcel> data) {
+        service.importData(data, isCovered);
+    }
+}

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/TrialCompactionEvaluationParamMapper.java

@@ -0,0 +1,9 @@
+package org.springblade.manager.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springblade.manager.entity.TrialCompactionEvaluationParam;
+
+public interface TrialCompactionEvaluationParamMapper extends BaseMapper<TrialCompactionEvaluationParam> {
+
+}

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/TrialCompactionEvaluationParamMapper.xml

@@ -0,0 +1,20 @@
+<?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="org.springblade.manager.mapper.TrialCompactionEvaluationParamMapper">
+    <resultMap id="ResultMap" type="org.springblade.manager.entity.TrialCompactionEvaluationParam">
+        <result column="id" property="id"/>
+        <result column="value_n" property="valueN"/>
+        <result column="assurance_rate_ninety_nine_percent" property="assuranceRateNinetyNinePercent"/>
+        <result column="assurance_rate_ninety_five_percent" property="assuranceRateNinetyFivePercent"/>
+        <result column="assurance_rate_ninety_percent" property="assuranceRateNinetyPercent"/>
+        <result column="sort" property="sort"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+    </resultMap>
+
+</mapper>

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/TrialTemperatureDensityParamMapper.java

@@ -0,0 +1,7 @@
+package org.springblade.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springblade.manager.entity.TrialTemperatureDensityParam;
+
+public interface TrialTemperatureDensityParamMapper extends BaseMapper<TrialTemperatureDensityParam> {
+}

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/TrialTemperatureDensityParamMapper.xml

@@ -0,0 +1,17 @@
+<?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="org.springblade.manager.mapper.TrialTemperatureDensityParamMapper">
+    <resultMap id="ResultMap" type="org.springblade.manager.entity.TrialTemperatureDensityParam">
+        <result column="id" property="id"/>
+        <result column="temperature" property="temperature"/>
+        <result column="water_density" property="waterDensity"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+    </resultMap>
+
+</mapper>

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

@@ -0,0 +1,20 @@
+package org.springblade.manager.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseService;
+import org.springblade.manager.entity.TrialCompactionEvaluationParam;
+import org.springblade.manager.excel.TrialCompactionEvaluationParamExcel;
+
+import java.util.List;
+
+public interface ITrialCompactionEvaluationParamService extends BaseService<TrialCompactionEvaluationParam> {
+
+    TrialCompactionEvaluationParam compactionDetail(Long id);
+
+    Object compactionPage(IPage<TrialCompactionEvaluationParam> page, TrialCompactionEvaluationParam obj);
+
+    boolean compactionSubmit(TrialCompactionEvaluationParam obj);
+
+    void importData(List<TrialCompactionEvaluationParamExcel> data, Boolean isCovered);
+
+}

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

@@ -0,0 +1,20 @@
+package org.springblade.manager.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseService;
+import org.springblade.manager.entity.TrialTemperatureDensityParam;
+import org.springblade.manager.excel.TrialTemperatureDensityParamExcel;
+
+import java.util.List;
+
+public interface ITrialTemperatureDensityParamService extends BaseService<TrialTemperatureDensityParam> {
+
+    TrialTemperatureDensityParam temperatureAndDensityDetail(Long id);
+
+    Object temperatureAndDensityPage(IPage<TrialTemperatureDensityParam> page, TrialTemperatureDensityParam obj);
+
+    boolean temperatureAndDensitySubmit(TrialTemperatureDensityParam obj);
+
+    void importData(List<TrialTemperatureDensityParamExcel> data, Boolean isCovered);
+
+}

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

@@ -0,0 +1,54 @@
+package org.springblade.manager.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.AllArgsConstructor;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.manager.entity.TrialCompactionEvaluationParam;
+import org.springblade.manager.excel.TrialCompactionEvaluationParamExcel;
+import org.springblade.manager.mapper.TrialCompactionEvaluationParamMapper;
+import org.springblade.manager.service.ITrialCompactionEvaluationParamService;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+@AllArgsConstructor
+public class TrialCompactionEvaluationParamServiceImpl
+        extends BaseServiceImpl<TrialCompactionEvaluationParamMapper, TrialCompactionEvaluationParam>
+        implements ITrialCompactionEvaluationParamService {
+
+    @Override
+    public TrialCompactionEvaluationParam compactionDetail(Long id) {
+        return baseMapper.selectById(id);
+    }
+
+    @Override
+    public Object compactionPage(IPage<TrialCompactionEvaluationParam> page, TrialCompactionEvaluationParam obj) {
+        QueryWrapper<TrialCompactionEvaluationParam> queryWrapper = Condition.getQueryWrapper(obj);
+        return this.page(page, queryWrapper.lambda().orderBy(true, true, TrialCompactionEvaluationParam::getCreateTime));
+    }
+
+    @Override
+    public boolean compactionSubmit(TrialCompactionEvaluationParam obj) {
+        return this.saveOrUpdate(obj);
+    }
+
+    @Override
+    public void importData(List<TrialCompactionEvaluationParamExcel> data, Boolean isCovered) {
+        List<TrialCompactionEvaluationParam> list = new ArrayList<>();
+        data.forEach(excel -> {
+            TrialCompactionEvaluationParam obj = BeanUtil.copy(excel, TrialCompactionEvaluationParam.class);
+            list.add(obj);
+        });
+        if (isCovered) {
+            this.saveOrUpdateBatch(list);
+        } else {
+            this.saveBatch(list);
+        }
+    }
+
+}

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

@@ -0,0 +1,54 @@
+package org.springblade.manager.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.AllArgsConstructor;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.manager.entity.TrialTemperatureDensityParam;
+import org.springblade.manager.excel.TrialTemperatureDensityParamExcel;
+import org.springblade.manager.mapper.TrialTemperatureDensityParamMapper;
+import org.springblade.manager.service.ITrialTemperatureDensityParamService;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+@AllArgsConstructor
+public class TrialTemperatureDensityParamServiceImpl
+        extends BaseServiceImpl<TrialTemperatureDensityParamMapper, TrialTemperatureDensityParam>
+        implements ITrialTemperatureDensityParamService {
+
+    @Override
+    public TrialTemperatureDensityParam temperatureAndDensityDetail(Long id) {
+        return baseMapper.selectById(id);
+    }
+
+    @Override
+    public Object temperatureAndDensityPage(IPage<TrialTemperatureDensityParam> page, TrialTemperatureDensityParam obj) {
+        QueryWrapper<TrialTemperatureDensityParam> queryWrapper = Condition.getQueryWrapper(obj);
+        return this.page(page, queryWrapper.lambda().orderBy(true, true, TrialTemperatureDensityParam::getCreateTime));
+    }
+
+    @Override
+    public boolean temperatureAndDensitySubmit(TrialTemperatureDensityParam obj) {
+        return this.saveOrUpdate(obj);
+    }
+
+    @Override
+    public void importData(List<TrialTemperatureDensityParamExcel> data, Boolean isCovered) {
+        List<TrialTemperatureDensityParam> list = new ArrayList<>();
+        data.forEach(excel -> {
+            TrialTemperatureDensityParam obj = BeanUtil.copy(excel, TrialTemperatureDensityParam.class);
+            list.add(obj);
+        });
+        if (isCovered) {
+            this.saveOrUpdateBatch(list);
+        } else {
+            this.saveBatch(list);
+        }
+    }
+
+}