root/material-manage-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 新增获取混凝土比例树接口

Browse Source
This commit is contained in:
han0
2025-01-15 10:50:44 +08:00
parent 14b29c67c3
commit a629de05c4
2 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/mjkf/xinke/main/modular/ratioconcrete/controller/RatioConcreteController.java
View File

@@ -24,6 +24,8 @@ import mjkf.xinke.main.modular.ratioconcrete.service.RatioConcreteService;
import javax.annotation.Resource;
import javax.validation.Valid;
import javax.validation.constraints.NotEmpty;
import java.util.Map;
import java.util.stream.Collectors;
@Api(tags = "混凝土比例控制器")
@ApiSupport(author = "SNOWY_TEAM", order = 1)
@@ -42,6 +44,27 @@ public class RatioConcreteController {
return CommonResult.data(ratioConcreteService.page(ratioConcretePageParam));
}
@ApiOperationSupport(order = 1)
@ApiOperation("获取混凝土比例树")
@GetMapping("/main/ratioconcrete/tree")
public CommonResult<Map<String, ?>> tree(RatioConcretePageParam ratioConcretePageParam) {
var query = ratioConcreteService.getQuery(ratioConcretePageParam);
var items = ratioConcreteService.list(query);
var tree = items.stream().collect(Collectors.groupingBy(
RatioConcrete::getName,
Collectors.groupingBy(
RatioConcrete::getRockSize,
Collectors.groupingBy(
RatioConcrete::getConcreteStrength,
Collectors.groupingBy(RatioConcrete::getCementStrength)
)
)
));
return CommonResult.data(tree);
}
@ApiOperationSupport(order = 2)
@ApiOperation("添加混凝土比例")
@CommonLog("添加混凝土比例")

19
src/main/resources/_sql/init/mysql/v0.6.sql
View File

@@ -17,24 +17,7 @@ create table RATIO_CONCRETE (
) 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);