From 14b29c67c3ce39039f2f655ed146a21027519d65 Mon Sep 17 00:00:00 2001 From: han0 Date: Wed, 15 Jan 2025 10:32:00 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=B7=B7=E5=87=9D?= =?UTF-8?q?=E5=9C=9F=E6=AF=94=E4=BE=8B=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/RatioConcreteController.java | 84 +++++++++++++ .../ratioconcrete/entity/RatioConcrete.java | 88 ++++++++++++++ .../enums/RatioConcreteEnum.java | 23 ++++ .../mapper/RatioConcreteMapper.java | 14 +++ .../mapper/mapping/RatioConcreteMapper.xml | 5 + .../param/RatioConcreteAddParam.java | 55 +++++++++ .../param/RatioConcreteEditParam.java | 60 ++++++++++ .../param/RatioConcreteIdParam.java | 24 ++++ .../param/RatioConcretePageParam.java | 56 +++++++++ .../service/RatioConcreteService.java | 96 +++++++++++++++ src/main/resources/_sql/init/mysql/v0.6.sql | 112 ++++++++++++++++++ src/main/resources/application-test.yml | 1 + 12 files changed, 618 insertions(+) create mode 100644 src/main/java/mjkf/xinke/main/modular/ratioconcrete/controller/RatioConcreteController.java create mode 100644 src/main/java/mjkf/xinke/main/modular/ratioconcrete/entity/RatioConcrete.java create mode 100644 src/main/java/mjkf/xinke/main/modular/ratioconcrete/enums/RatioConcreteEnum.java create mode 100644 src/main/java/mjkf/xinke/main/modular/ratioconcrete/mapper/RatioConcreteMapper.java create mode 100644 src/main/java/mjkf/xinke/main/modular/ratioconcrete/mapper/mapping/RatioConcreteMapper.xml create mode 100644 src/main/java/mjkf/xinke/main/modular/ratioconcrete/param/RatioConcreteAddParam.java create mode 100644 src/main/java/mjkf/xinke/main/modular/ratioconcrete/param/RatioConcreteEditParam.java create mode 100644 src/main/java/mjkf/xinke/main/modular/ratioconcrete/param/RatioConcreteIdParam.java create mode 100644 src/main/java/mjkf/xinke/main/modular/ratioconcrete/param/RatioConcretePageParam.java create mode 100644 src/main/java/mjkf/xinke/main/modular/ratioconcrete/service/RatioConcreteService.java create mode 100644 src/main/resources/_sql/init/mysql/v0.6.sql diff --git a/src/main/java/mjkf/xinke/main/modular/ratioconcrete/controller/RatioConcreteController.java b/src/main/java/mjkf/xinke/main/modular/ratioconcrete/controller/RatioConcreteController.java new file mode 100644 index 0000000..4ab1d39 --- /dev/null +++ b/src/main/java/mjkf/xinke/main/modular/ratioconcrete/controller/RatioConcreteController.java @@ -0,0 +1,84 @@ +package mjkf.xinke.main.modular.ratioconcrete.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.github.xiaoymin.knife4j.annotations.ApiSupport; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +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.RequestBody; +import org.springframework.web.bind.annotation.RestController; +import mjkf.xinke.common.annotation.CommonLog; +import mjkf.xinke.common.pojo.CommonResult; +import mjkf.xinke.common.pojo.CommonValidList; +import mjkf.xinke.main.modular.ratioconcrete.entity.RatioConcrete; +import mjkf.xinke.main.modular.ratioconcrete.param.RatioConcreteAddParam; +import mjkf.xinke.main.modular.ratioconcrete.param.RatioConcreteEditParam; +import mjkf.xinke.main.modular.ratioconcrete.param.RatioConcreteIdParam; +import mjkf.xinke.main.modular.ratioconcrete.param.RatioConcretePageParam; +import mjkf.xinke.main.modular.ratioconcrete.service.RatioConcreteService; + +import javax.annotation.Resource; +import javax.validation.Valid; +import javax.validation.constraints.NotEmpty; + +@Api(tags = "混凝土比例控制器") +@ApiSupport(author = "SNOWY_TEAM", order = 1) +@RestController +@Validated +public class RatioConcreteController { + + @Resource + private RatioConcreteService ratioConcreteService; + + @ApiOperationSupport(order = 1) + @ApiOperation("获取混凝土比例分页") + @SaCheckPermission("/main/ratioconcrete/page") + @GetMapping("/main/ratioconcrete/page") + public CommonResult> page(RatioConcretePageParam ratioConcretePageParam) { + return CommonResult.data(ratioConcreteService.page(ratioConcretePageParam)); + } + + @ApiOperationSupport(order = 2) + @ApiOperation("添加混凝土比例") + @CommonLog("添加混凝土比例") + @SaCheckPermission("/main/ratioconcrete/add") + @PostMapping("/main/ratioconcrete/add") + public CommonResult add(@RequestBody @Valid RatioConcreteAddParam ratioConcreteAddParam) { + ratioConcreteService.add(ratioConcreteAddParam); + return CommonResult.ok(); + } + + @ApiOperationSupport(order = 3) + @ApiOperation("编辑混凝土比例") + @CommonLog("编辑混凝土比例") + @SaCheckPermission("/main/ratioconcrete/edit") + @PostMapping("/main/ratioconcrete/edit") + public CommonResult edit(@RequestBody @Valid RatioConcreteEditParam ratioConcreteEditParam) { + ratioConcreteService.edit(ratioConcreteEditParam); + return CommonResult.ok(); + } + + @ApiOperationSupport(order = 4) + @ApiOperation("删除混凝土比例") + @CommonLog("删除混凝土比例") + @SaCheckPermission("/main/ratioconcrete/delete") + @PostMapping("/main/ratioconcrete/delete") + public CommonResult delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空") + CommonValidList ratioConcreteIdParamList) { + ratioConcreteService.delete(ratioConcreteIdParamList); + return CommonResult.ok(); + } + + @ApiOperationSupport(order = 5) + @ApiOperation("获取混凝土比例详情") + @SaCheckPermission("/main/ratioconcrete/detail") + @GetMapping("/main/ratioconcrete/detail") + public CommonResult detail(@Valid RatioConcreteIdParam ratioConcreteIdParam) { + return CommonResult.data(ratioConcreteService.detail(ratioConcreteIdParam)); + } + +} diff --git a/src/main/java/mjkf/xinke/main/modular/ratioconcrete/entity/RatioConcrete.java b/src/main/java/mjkf/xinke/main/modular/ratioconcrete/entity/RatioConcrete.java new file mode 100644 index 0000000..76dc48d --- /dev/null +++ b/src/main/java/mjkf/xinke/main/modular/ratioconcrete/entity/RatioConcrete.java @@ -0,0 +1,88 @@ + +package mjkf.xinke.main.modular.ratioconcrete.entity; + +import com.baomidou.mybatisplus.annotation.*; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 混凝土比例实体 + * + * @author han0 + * @date 2025/01/15 10:23 + **/ +@Getter +@Setter +@TableName("ratio_concrete") +public class RatioConcrete { + + /** id */ + @TableId + @ApiModelProperty(value = "id", position = 1) + private String id; + + /** 名称 */ + @ApiModelProperty(value = "名称", position = 2) + private String name; + + /** 粒径 */ + @ApiModelProperty(value = "粒径", position = 3) + private String rockSize; + + /** 混凝土强度等级 */ + @ApiModelProperty(value = "混凝土强度等级", position = 4) + private String concreteStrength; + + /** 水泥强度等级 */ + @ApiModelProperty(value = "水泥强度等级", position = 5) + private String cementStrength; + + /** 水泥 */ + @ApiModelProperty(value = "水泥", position = 6) + private String ratioCement; + + /** 中粗砂 */ + @ApiModelProperty(value = "中粗砂", position = 7) + private String ratioSand; + + /** 碎砾石 */ + @ApiModelProperty(value = "碎砾石", position = 8) + private String ratioRock; + + /** 片石 */ + @ApiModelProperty(value = "片石", position = 9) + private String ratioRubble; + + /** 租户id */ + @ApiModelProperty(value = "租户id", position = 10) + private String tenantId; + + /** 删除标志 */ + @ApiModelProperty(value = "删除标志", position = 11) + @TableLogic + @TableField(fill = FieldFill.INSERT) + private String deleteFlag; + + /** 创建时间 */ + @ApiModelProperty(value = "创建时间", position = 12) + @TableField(fill = FieldFill.INSERT) + private Date createTime; + + /** 创建用户 */ + @ApiModelProperty(value = "创建用户", position = 13) + @TableField(fill = FieldFill.INSERT) + private String createUser; + + /** 更新时间 */ + @ApiModelProperty(value = "更新时间", position = 14) + @TableField(fill = FieldFill.UPDATE) + private Date updateTime; + + /** 更新人 */ + @ApiModelProperty(value = "更新人", position = 15) + @TableField(fill = FieldFill.UPDATE) + private String updateUser; +} diff --git a/src/main/java/mjkf/xinke/main/modular/ratioconcrete/enums/RatioConcreteEnum.java b/src/main/java/mjkf/xinke/main/modular/ratioconcrete/enums/RatioConcreteEnum.java new file mode 100644 index 0000000..84c3fbf --- /dev/null +++ b/src/main/java/mjkf/xinke/main/modular/ratioconcrete/enums/RatioConcreteEnum.java @@ -0,0 +1,23 @@ + +package mjkf.xinke.main.modular.ratioconcrete.enums; + +import lombok.Getter; + +/** + * 混凝土比例枚举 + * + * @author han0 + * @date 2025/01/15 10:23 + **/ +@Getter +public enum RatioConcreteEnum { + + /** 测试 */ + TEST("TEST"); + + private final String value; + + RatioConcreteEnum(String value) { + this.value = value; + } +} diff --git a/src/main/java/mjkf/xinke/main/modular/ratioconcrete/mapper/RatioConcreteMapper.java b/src/main/java/mjkf/xinke/main/modular/ratioconcrete/mapper/RatioConcreteMapper.java new file mode 100644 index 0000000..3ae7305 --- /dev/null +++ b/src/main/java/mjkf/xinke/main/modular/ratioconcrete/mapper/RatioConcreteMapper.java @@ -0,0 +1,14 @@ + +package mjkf.xinke.main.modular.ratioconcrete.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import mjkf.xinke.main.modular.ratioconcrete.entity.RatioConcrete; + +/** + * 混凝土比例Mapper接口 + * + * @author han0 + * @date 2025/01/15 10:23 + **/ +public interface RatioConcreteMapper extends BaseMapper { +} diff --git a/src/main/java/mjkf/xinke/main/modular/ratioconcrete/mapper/mapping/RatioConcreteMapper.xml b/src/main/java/mjkf/xinke/main/modular/ratioconcrete/mapper/mapping/RatioConcreteMapper.xml new file mode 100644 index 0000000..c1f6b0b --- /dev/null +++ b/src/main/java/mjkf/xinke/main/modular/ratioconcrete/mapper/mapping/RatioConcreteMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/src/main/java/mjkf/xinke/main/modular/ratioconcrete/param/RatioConcreteAddParam.java b/src/main/java/mjkf/xinke/main/modular/ratioconcrete/param/RatioConcreteAddParam.java new file mode 100644 index 0000000..cb674ca --- /dev/null +++ b/src/main/java/mjkf/xinke/main/modular/ratioconcrete/param/RatioConcreteAddParam.java @@ -0,0 +1,55 @@ + +package mjkf.xinke.main.modular.ratioconcrete.param; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 混凝土比例添加参数 + * + * @author han0 + * @date 2025/01/15 10:23 + **/ +@Getter +@Setter +public class RatioConcreteAddParam { + + /** 名称 */ + @ApiModelProperty(value = "名称", position = 2) + private String name; + + /** 粒径 */ + @ApiModelProperty(value = "粒径", position = 3) + private String rockSize; + + /** 混凝土强度等级 */ + @ApiModelProperty(value = "混凝土强度等级", position = 4) + private String concreteStrength; + + /** 水泥强度等级 */ + @ApiModelProperty(value = "水泥强度等级", position = 5) + private String cementStrength; + + /** 水泥 */ + @ApiModelProperty(value = "水泥", position = 6) + private String ratioCement; + + /** 中粗砂 */ + @ApiModelProperty(value = "中粗砂", position = 7) + private String ratioSand; + + /** 碎砾石 */ + @ApiModelProperty(value = "碎砾石", position = 8) + private String ratioRock; + + /** 片石 */ + @ApiModelProperty(value = "片石", position = 9) + private String ratioRubble; + +} diff --git a/src/main/java/mjkf/xinke/main/modular/ratioconcrete/param/RatioConcreteEditParam.java b/src/main/java/mjkf/xinke/main/modular/ratioconcrete/param/RatioConcreteEditParam.java new file mode 100644 index 0000000..276fa83 --- /dev/null +++ b/src/main/java/mjkf/xinke/main/modular/ratioconcrete/param/RatioConcreteEditParam.java @@ -0,0 +1,60 @@ + +package mjkf.xinke.main.modular.ratioconcrete.param; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 混凝土比例编辑参数 + * + * @author han0 + * @date 2025/01/15 10:23 + **/ +@Getter +@Setter +public class RatioConcreteEditParam { + + /** id */ + @ApiModelProperty(value = "id", required = true, position = 1) + @NotBlank(message = "id不能为空") + private String id; + + /** 名称 */ + @ApiModelProperty(value = "名称", position = 2) + private String name; + + /** 粒径 */ + @ApiModelProperty(value = "粒径", position = 3) + private String rockSize; + + /** 混凝土强度等级 */ + @ApiModelProperty(value = "混凝土强度等级", position = 4) + private String concreteStrength; + + /** 水泥强度等级 */ + @ApiModelProperty(value = "水泥强度等级", position = 5) + private String cementStrength; + + /** 水泥 */ + @ApiModelProperty(value = "水泥", position = 6) + private String ratioCement; + + /** 中粗砂 */ + @ApiModelProperty(value = "中粗砂", position = 7) + private String ratioSand; + + /** 碎砾石 */ + @ApiModelProperty(value = "碎砾石", position = 8) + private String ratioRock; + + /** 片石 */ + @ApiModelProperty(value = "片石", position = 9) + private String ratioRubble; + +} diff --git a/src/main/java/mjkf/xinke/main/modular/ratioconcrete/param/RatioConcreteIdParam.java b/src/main/java/mjkf/xinke/main/modular/ratioconcrete/param/RatioConcreteIdParam.java new file mode 100644 index 0000000..837bd6a --- /dev/null +++ b/src/main/java/mjkf/xinke/main/modular/ratioconcrete/param/RatioConcreteIdParam.java @@ -0,0 +1,24 @@ + +package mjkf.xinke.main.modular.ratioconcrete.param; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +import javax.validation.constraints.NotBlank; + +/** + * 混凝土比例Id参数 + * + * @author han0 + * @date 2025/01/15 10:23 + **/ +@Getter +@Setter +public class RatioConcreteIdParam { + + /** id */ + @ApiModelProperty(value = "id", required = true) + @NotBlank(message = "id不能为空") + private String id; +} diff --git a/src/main/java/mjkf/xinke/main/modular/ratioconcrete/param/RatioConcretePageParam.java b/src/main/java/mjkf/xinke/main/modular/ratioconcrete/param/RatioConcretePageParam.java new file mode 100644 index 0000000..0d27804 --- /dev/null +++ b/src/main/java/mjkf/xinke/main/modular/ratioconcrete/param/RatioConcretePageParam.java @@ -0,0 +1,56 @@ + +package mjkf.xinke.main.modular.ratioconcrete.param; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 混凝土比例查询参数 + * + * @author han0 + * @date 2025/01/15 10:23 + **/ +@Getter +@Setter +public class RatioConcretePageParam { + + /** 当前页 */ + @ApiModelProperty(value = "当前页码") + private Integer current; + + /** 每页条数 */ + @ApiModelProperty(value = "每页条数") + private Integer size; + + /** 排序字段 */ + @ApiModelProperty(value = "排序字段，字段驼峰名称，如：userName") + private String sortField; + + /** 排序方式 */ + @ApiModelProperty(value = "排序方式，升序：ASCEND；降序：DESCEND") + private String sortOrder; + + /** 关键词 */ + @ApiModelProperty(value = "关键词") + private String searchKey; + + /** 名称 */ + @ApiModelProperty(value = "名称") + private String name; + + /** 粒径 */ + @ApiModelProperty(value = "粒径") + private String rockSize; + + /** 混凝土强度等级 */ + @ApiModelProperty(value = "混凝土强度等级") + private String concreteStrength; + + /** 水泥强度等级 */ + @ApiModelProperty(value = "水泥强度等级") + private String cementStrength; + +} diff --git a/src/main/java/mjkf/xinke/main/modular/ratioconcrete/service/RatioConcreteService.java b/src/main/java/mjkf/xinke/main/modular/ratioconcrete/service/RatioConcreteService.java new file mode 100644 index 0000000..231e3fb --- /dev/null +++ b/src/main/java/mjkf/xinke/main/modular/ratioconcrete/service/RatioConcreteService.java @@ -0,0 +1,96 @@ + +package mjkf.xinke.main.modular.ratioconcrete.service; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollStreamUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import mjkf.xinke.common.enums.CommonSortOrderEnum; +import mjkf.xinke.common.exception.CommonException; +import mjkf.xinke.common.page.CommonPageRequest; +import mjkf.xinke.main.modular.ratioconcrete.entity.RatioConcrete; +import mjkf.xinke.main.modular.ratioconcrete.param.RatioConcreteAddParam; +import mjkf.xinke.main.modular.ratioconcrete.param.RatioConcreteEditParam; +import mjkf.xinke.main.modular.ratioconcrete.param.RatioConcreteIdParam; +import mjkf.xinke.main.modular.ratioconcrete.param.RatioConcretePageParam; + +import java.io.Serializable; +import java.util.List; + +/** + * 混凝土比例Service 类 + **/ +@Service +public class RatioConcreteService extends ServiceImpl, RatioConcrete> { + + + public Page page(RatioConcretePageParam ratioConcretePageParam) { + QueryWrapper queryWrapper = this.getQuery(ratioConcretePageParam); + return this.page(CommonPageRequest.defaultPage(), queryWrapper); + } + + public QueryWrapper getQuery(RatioConcretePageParam ratioConcretePageParam) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + if(ObjectUtil.isNotEmpty(ratioConcretePageParam.getName())) { + queryWrapper.lambda().like(RatioConcrete::getName, ratioConcretePageParam.getName()); + } + if(ObjectUtil.isNotEmpty(ratioConcretePageParam.getRockSize())) { + queryWrapper.lambda().like(RatioConcrete::getRockSize, ratioConcretePageParam.getRockSize()); + } + if(ObjectUtil.isNotEmpty(ratioConcretePageParam.getConcreteStrength())) { + queryWrapper.lambda().like(RatioConcrete::getConcreteStrength, ratioConcretePageParam.getConcreteStrength()); + } + if(ObjectUtil.isNotEmpty(ratioConcretePageParam.getCementStrength())) { + queryWrapper.lambda().like(RatioConcrete::getCementStrength, ratioConcretePageParam.getCementStrength()); + } + if(ObjectUtil.isAllNotEmpty(ratioConcretePageParam.getSortField(), ratioConcretePageParam.getSortOrder())) { + CommonSortOrderEnum.validate(ratioConcretePageParam.getSortOrder()); + queryWrapper.orderBy(true, ratioConcretePageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()), + StrUtil.toUnderlineCase(ratioConcretePageParam.getSortField())); + } else { + queryWrapper.lambda().orderByAsc(RatioConcrete::getId); + } + return queryWrapper; + } + + @Transactional(rollbackFor = Exception.class) + public RatioConcrete add(RatioConcreteAddParam ratioConcreteAddParam) { + RatioConcrete ratioConcrete = BeanUtil.toBean(ratioConcreteAddParam, RatioConcrete.class); + this.save(ratioConcrete); + return ratioConcrete; + } + + @Transactional(rollbackFor = Exception.class) + public RatioConcrete edit(RatioConcreteEditParam ratioConcreteEditParam) { + RatioConcrete ratioConcrete = this.queryEntity(ratioConcreteEditParam.getId()); + BeanUtil.copyProperties(ratioConcreteEditParam, ratioConcrete); + this.updateById(ratioConcrete); + return ratioConcrete; + } + + @Transactional(rollbackFor = Exception.class) + public void delete(List ratioConcreteIdParamList) { + for (var id : CollStreamUtil.toList(ratioConcreteIdParamList, RatioConcreteIdParam::getId)) { + this.removeById(id); + } + } + + public RatioConcrete detail(RatioConcreteIdParam ratioConcreteIdParam) { + return this.queryEntity(ratioConcreteIdParam.getId()); + } + + public RatioConcrete queryEntity(Serializable id) { + RatioConcrete ratioConcrete = this.getById(id); + if(ObjectUtil.isEmpty(ratioConcrete)) { + throw new CommonException("混凝土比例不存在，id值为：{}", id); + } + return ratioConcrete; + } + +} diff --git a/src/main/resources/_sql/init/mysql/v0.6.sql b/src/main/resources/_sql/init/mysql/v0.6.sql new file mode 100644 index 0000000..5002b60 --- /dev/null +++ b/src/main/resources/_sql/init/mysql/v0.6.sql @@ -0,0 +1,112 @@ +create table RATIO_CONCRETE ( + ID varchar(32) not null comment 'id' primary key, + NAME varchar(128) not null comment '名称', + ROCK_SIZE varchar(128) default 0 comment '粒径', + CONCRETE_STRENGTH varchar(128) default 0 comment '混凝土强度等级', + CEMENT_STRENGTH varchar(128) default 0 comment '水泥强度等级', + RATIO_CEMENT varchar(128) default 0 comment '水泥', + RATIO_SAND varchar(128) default 0 comment '中粗砂', + RATIO_ROCK varchar(128) default 0 comment '碎砾石', + RATIO_RUBBLE varchar(128) default 0 comment '片石', + TENANT_ID varchar(20) null comment '租户id', + DELETE_FLAG varchar(255) null comment '删除标志', + CREATE_TIME datetime null comment '创建时间', + CREATE_USER varchar(20) null comment '创建用户', + UPDATE_TIME datetime null comment '更新时间', + UPDATE_USER varchar(20) null comment '更新人' +) comment '混凝土比例'; + + +CREATE TABLE material_manage.RATIO_CONCRETE +( + ID varchar(32) PRIMARY KEY NOT NULL COMMENT 'id', + NAME varchar(128) NOT NULL COMMENT '名称', + ROCK_SIZE varchar(128) DEFAULT '0' COMMENT '粒径', + CONCRETE_STRENGTH varchar(128) DEFAULT '0' COMMENT '混凝土强度等级', + CEMENT_STRENGTH varchar(128) DEFAULT '0' COMMENT '水泥强度等级', + RATIO_CEMENT varchar(128) DEFAULT '0' COMMENT '水泥', + RATIO_SAND varchar(128) DEFAULT '0' COMMENT '中粗砂', + RATIO_ROCK varchar(128) DEFAULT '0' COMMENT '碎砾石', + RATIO_RUBBLE varchar(128) DEFAULT '0' COMMENT '片石', + TENANT_ID varchar(20) COMMENT '租户id', + DELETE_FLAG varchar(255) COMMENT '删除标志', + CREATE_TIME datetime COMMENT '创建时间', + CREATE_USER varchar(20) COMMENT '创建用户', + UPDATE_TIME datetime COMMENT '更新时间', + UPDATE_USER varchar(20) COMMENT '更新人' +); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('1', '水下混凝土', '碎（砾）石最大粒径40mm', 'C20', '32.5', '368', '0.52', '0.71', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('10', '喷射混凝土', '碎（砾）石最大粒径20mm', 'C20', '32.5', '445', '0.61', '0.57', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('11', '喷射混凝土', '碎（砾）石最大粒径20mm', 'C25', '32.5', '469', '0.6', '0.57', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('12', '喷射混凝土', '碎（砾）石最大粒径20mm', 'C30', '32.5', '510', '0.59', '0.56', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('13', '片石混凝土', '碎（砾）石最大粒径80mm', 'C10', '32.5', '180', '0.49', '0.071', '0.215', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('14', '片石混凝土', '碎（砾）石最大粒径80mm', 'C15', '32.5', '215', '0.47', '0.71', '0.215', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('15', '片石混凝土', '碎（砾）石最大粒径80mm', 'C20', '32.5', '240', '0.46', '0.7', '0.215', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('16', '普通混凝土', '砂砾石最大粒径（80mm）', 'C10', '32.5', '212', '0.058', '0.83', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('17', '普通混凝土', '砂砾石最大粒径（80mm）', 'C15', '32.5', '253', '0.55', '0.83', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('18', '普通混凝土', '砂砾石最大粒径（80mm）', 'C20', '32.5', '282', '0.54', '0.83', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('19', '普通混凝土', '砂砾石最大粒径（20mm）', 'C10', '32.5', '238', '0.51', '0.85', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('2', '水下混凝土', '碎（砾）石最大粒径40mm', 'C25', '32.5', '427', '0.51', '0.69', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('20', '普通混凝土', '砂砾石最大粒径（20mm）', 'C15', '32.5', '286', '0.51', '0.82', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('21', '普通混凝土', '砂砾石最大粒径（20mm）', 'C20', '32.5', '315', '0.49', '0.82', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('22', '普通混凝土', '砂砾石最大粒径（20mm）', 'C25', '32.5', '368', '0.48', '0.8', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('23', '普通混凝土', '砂砾石最大粒径（20mm）', 'C30', '32.5', '406', '0.46', '0.79', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('24', '普通混凝土', '砂砾石最大粒径（20mm）', 'C30', '42.5', '388', '0.48', '0.79', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('25', '普通混凝土', '砂砾石最大粒径（20mm）', 'C35', '32.5', '450', '0.45', '0.78', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('26', '普通混凝土', '砂砾石最大粒径（20mm）', 'C35', '42.5', '405', '0.47', '0.79', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('27', '普通混凝土', '砂砾石最大粒径（20mm）', 'C40', '32.5', '488', '0.43', '0.78', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('28', '普通混凝土', '砂砾石最大粒径（20mm）', 'C40', '42.5', '443', '0.45', '0.79', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('29', '普通混凝土', '砂砾石最大粒径（20mm）', 'C40', '52.5', '399', '0.47', '0.79', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('3', '水下混凝土', '碎（砾）石最大粒径40mm', 'C30', '32.5', '460', '0.51', '0.67', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('30', '普通混凝土', '砂砾石最大粒径（20mm）', 'C45', '42.5', '482', '0.45', '0.77', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('31', '普通混凝土', '砂砾石最大粒径（20mm）', 'C45', '52.5', '439', '0.45', '0.79', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('32', '普通混凝土', '砂砾石最大粒径（20mm）', 'C50', '42.5', '524', '0.44', '0.75', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('33', '普通混凝土', '砂砾石最大粒径（20mm）', 'C50', '52.5', '479', '0.42', '0.79', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('34', '普通混凝土', '砂砾石最大粒径（20mm）', 'C55', '52.5', '516', '0.42', '0.74', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('35', '普通混凝土', '砂砾石最大粒径（20mm）', 'C60', '52.5', '539', '0.41', '0.71', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('36', '普通混凝土', '砂砾石最大粒径（40mm）', 'C10', '32.5', '225', '0.51', '0.87', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('37', '普通混凝土', '砂砾石最大粒径（40mm）', 'C15', '32.5', '267', '0.5', '0.85', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('38', '普通混凝土', '砂砾石最大粒径（40mm）', 'C20', '32.5', '298', '0.49', '0.84', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('39', '普通混凝土', '砂砾石最大粒径（40mm）', 'C25', '32.5', '335', '0.48', '0.83', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('4', '水下混凝土', '碎（砾）石最大粒径40mm', 'C35', '32.5', '505', '0.49', '0.66', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('40', '普通混凝土', '砂砾石最大粒径（40mm）', 'C30', '32.5', '377', '0.46', '0.83', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('41', '普通混凝土', '砂砾石最大粒径（40mm）', 'C30', '42.5', '355', '0.46', '0.84', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('42', '普通混凝土', '砂砾石最大粒径（40mm）', 'C35', '32.5', '418', '0.45', '0.82', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('43', '普通混凝土', '砂砾石最大粒径（40mm）', 'C35', '42.5', '372', '0.46', '0.83', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('44', '普通混凝土', '砂砾石最大粒径（40mm）', 'C40', '32.5', '461', '0.43', '0.81', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('45', '普通混凝土', '砂砾石最大粒径（40mm）', 'C40', '42.5', '416', '0.44', '0.83', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('46', '普通混凝土', '砂砾石最大粒径（40mm）', 'C40', '52.5', '359', '0.46', '0.84', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('47', '普通混凝土', '砂砾石最大粒径（40mm）', 'C45', '42.5', '440', '0.44', '0.81', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('48', '普通混凝土', '砂砾石最大粒径（40mm）', 'C45', '52.5', '399', '0.44', '0.84', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('49', '普通混凝土', '砂砾石最大粒径（40mm）', 'C50', '42.5', '487', '0.43', '0.79', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('5', '防水混凝土', '碎（砾）石最大粒径40mm', 'C25', '32.5', '368', '0.49', '0.8', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('50', '普通混凝土', '砂砾石最大粒径（40mm）', 'C50', '52.5', '430', '0.41', '0.84', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('51', '普通混凝土', '砂砾石最大粒径（40mm）', 'C55', '52.5', '451', '0.41', '0.83', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('52', '泵送混凝土', '砂砾石最大粒径（20mm）', 'C15', '32.5', '321', '0.59', '0.75', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('53', '泵送混凝土', '砂砾石最大粒径（20mm）', 'C20', '32.5', '354', '0.57', '0.75', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('54', '泵送混凝土', '砂砾石最大粒径（20mm）', 'C25', '32.5', '407', '0.56', '0.71', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('55', '泵送混凝土', '砂砾石最大粒径（20mm）', 'C30', '32.5', '443', '0.55', '0.7', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('56', '泵送混凝土', '砂砾石最大粒径（20mm）', 'C35', '32.5', '491', '0.54', '0.69', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('57', '泵送混凝土', '砂砾石最大粒径（20mm）', 'C35', '42.5', '431', '0.56', '0.7', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('58', '泵送混凝土', '砂砾石最大粒径（20mm）', 'C40', '32.5', '538', '0.52', '0.67', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('59', '泵送混凝土', '砂砾石最大粒径（20mm）', 'C40', '42.5', '471', '0.54', '0.69', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('6', '防水混凝土', '碎（砾）石最大粒径40mm', 'C30', '32.5', '398', '0.46', '0.84', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('60', '泵送混凝土', '砂砾石最大粒径（20mm）', 'C45', '42.5', '512', '0.54', '0.67', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('61', '泵送混凝土', '砂砾石最大粒径（20mm）', 'C50', '42.5', '554', '0.53', '0.66', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('62', '泵送混凝土', '砂砾石最大粒径（20mm）', 'C55', '52.5', '546', '0.51', '0.65', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('63', '泵送混凝土', '砂砾石最大粒径（20mm）', 'C60', '52.5', '570', '0.5', '0.62', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('64', '泵送混凝土', '砂砾石最大粒径（40mm）', 'C10', '32.5', '236', '0.66', '0.73', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('65', '泵送混凝土', '砂砾石最大粒径（40mm）', 'C15', '32.5', '302', '0.59', '0.77', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('66', '泵送混凝土', '砂砾石最大粒径（40mm）', 'C20', '32.5', '325', '0.59', '0.75', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('67', '泵送混凝土', '砂砾石最大粒径（40mm）', 'C25', '32.5', '372', '0.58', '0.73', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('68', '泵送混凝土', '砂砾石最大粒径（40mm）', 'C30', '32.5', '420', '0.56', '0.73', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('69', '泵送混凝土', '砂砾石最大粒径（40mm）', 'C35', '32.5', '461', '0.54', '0.72', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('7', '防水混凝土', '碎（砾）石最大粒径40mm', 'C35', '42.5', '385', '0.47', '0.83', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('70', '泵送混凝土', '砂砾石最大粒径（40mm）', 'C35', '42.5', '403', '0.57', '0.72', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('71', '泵送混凝土', '砂砾石最大粒径（40mm）', 'C40', '32.5', '505', '0.52', '0.7', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('72', '泵送混凝土', '砂砾石最大粒径（40mm）', 'C40', '42.5', '440', '0.55', '0.71', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('73', '泵送混凝土', '砂砾石最大粒径（40mm）', 'C45', '42.5', '478', '0.56', '0.68', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('74', '泵送混凝土', '砂砾石最大粒径（40mm）', 'C50', '42.5', '505', '0.55', '0.67', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('75', '泵送混凝土', '砂砾石最大粒径（40mm）', 'C55', '52.5', '498', '0.55', '0.65', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('8', '防水混凝土', '碎（砾）石最大粒径40mm', 'C40', '42.5', '434', '0.46', '0.81', '0', '-1', 'NOT_DELETE', null, null, null, null); +INSERT INTO material_manage.RATIO_CONCRETE (ID, NAME, ROCK_SIZE, CONCRETE_STRENGTH, CEMENT_STRENGTH, RATIO_CEMENT, RATIO_SAND, RATIO_ROCK, RATIO_RUBBLE, TENANT_ID, DELETE_FLAG, CREATE_TIME, CREATE_USER, UPDATE_TIME, UPDATE_USER) VALUES ('9', '喷射混凝土', '碎（砾）石最大粒径20mm', 'C15', '32.5', '435', '0.61', '0.58', '0', '-1', 'NOT_DELETE', null, null, null, null); \ No newline at end of file diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index f60d2d5..decb556 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -20,6 +20,7 @@ main: api: host: data-tool: http://192.168.1.3:7778 + stirling-pdf: http://192.168.1.3:20081 path: predict-file-dir: /files/predict/ \ No newline at end of file