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

fix: ci
Some checks failed
ci / build (push) Failing after 5s
Details

Browse Source
This commit is contained in:
han0
2025-10-13 17:36:03 +08:00
parent 179a14f26b
commit 5d2770f4de
8 changed files with 480 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

357
src/main/resources/_sql/init/mysql/material_manage_asphalt_domestic.sql Normal file
View File

@@ -0,0 +1,357 @@
CREATE TABLE material_manage.asphalt_domestic
(
ID int(11) PRIMARY KEY NOT NULL AUTO_INCREMENT,
NAME varchar(128) COMMENT '名称',
PRICE decimal(16,4) COMMENT '价格',
DATE date COMMENT '日期',
`FROM` date COMMENT '数据来源'
);
CREATE UNIQUE INDEX Idx_key ON material_manage.asphalt_domestic (NAME, DATE, `FROM`);
CREATE TABLE material_manage.asphalt_imported
(
ID int(11) PRIMARY KEY NOT NULL AUTO_INCREMENT,
NAME varchar(128) COMMENT '名称',
PRICE decimal(16,4) COMMENT '价格',
DATE date COMMENT '日期'
);
CREATE UNIQUE INDEX Idx_key ON material_manage.asphalt_imported (NAME, DATE);
CREATE TABLE material_manage.asphalt_modifier
(
ID int(11) PRIMARY KEY NOT NULL AUTO_INCREMENT,
NAME varchar(128) COMMENT '名称',
SPEC varchar(128) COMMENT '规格',
PRICE decimal(16,4) COMMENT '价格',
DATE date COMMENT '日期'
);
CREATE UNIQUE INDEX Idx_key ON material_manage.asphalt_modifier (NAME, SPEC, DATE);
CREATE TABLE material_manage.budget
(
ID int(11) PRIMARY KEY NOT NULL AUTO_INCREMENT,
NAME varchar(128) COMMENT '名称',
AMOUNT int(11) COMMENT '总数',
MIN_AMOUNT int(11) COMMENT '最小值',
MAX_AMOUNT int(11) COMMENT '最大值',
YEAR int(11) COMMENT '年份',
MONTHS text COMMENT '月份',
DATE date COMMENT '日期'
);
CREATE TABLE material_manage.budget_item
(
ID int(11) PRIMARY KEY NOT NULL AUTO_INCREMENT,
BUDGET_ID int(11) COMMENT '预算id',
NAME varchar(128) COMMENT '名称',
META text COMMENT '数据',
QUANTITY int(11) COMMENT '数量',
UNIT text COMMENT '单位',
UNIT_PRICE int(11) COMMENT '单价',
TOTAL_PRICE int(11) COMMENT '总价'
);
CREATE TABLE material_manage.cement
(
ID int(11) PRIMARY KEY NOT NULL AUTO_INCREMENT,
NAME varchar(128) COMMENT '名称',
SPEC varchar(128) COMMENT '规格',
PACK varchar(64) COMMENT '包装',
SOURCE varchar(64) COMMENT '产地',
PRICE decimal(16,4) COMMENT '价格',
FLUCTUATING decimal(16,4) COMMENT '浮动',
DATE date COMMENT '日期'
);
CREATE UNIQUE INDEX Idx_key ON material_manage.cement (NAME, SPEC, PACK, SOURCE, DATE);
CREATE TABLE material_manage.data_fujian
(
ID int(11) PRIMARY KEY NOT NULL AUTO_INCREMENT,
NUMBER varchar(128) COMMENT '编码',
NAME varchar(128) COMMENT '名称',
SPEC varchar(128) COMMENT '规格',
UNIT varchar(128) COMMENT '单位',
PRICE_WITHOUT_TAX decimal(16,4) COMMENT '除价格',
PRICE decimal(16,4) COMMENT '含税价',
CATEGORY varchar(128) COMMENT '分类',
YEAR int(11) COMMENT '年份',
MONTH int(11) COMMENT '月份',
CITY varchar(128) COMMENT '地市',
DATE date COMMENT '日期'
);
CREATE UNIQUE INDEX Idx_key ON material_manage.data_fujian (YEAR, MONTH, CITY, NAME, SPEC);
CREATE TABLE material_manage.data_guangdong
(
ID int(11) PRIMARY KEY NOT NULL AUTO_INCREMENT,
URL varchar(512) COMMENT '下载地址',
NAME varchar(128) COMMENT '名称',
SOURCE varchar(128) COMMENT '来源',
DATE date COMMENT '日期'
);
CREATE UNIQUE INDEX Idx_key ON material_manage.data_guangdong (NAME, DATE);
CREATE TABLE material_manage.data_network
(
ID int(11) PRIMARY KEY NOT NULL AUTO_INCREMENT,
MATERIAL_ID varchar(128),
SPEC varchar(128),
UNIT varchar(128),
BRAND varchar(128),
NAME varchar(128),
PRICE decimal(16,4),
SOURCE varchar(128),
REMARK text,
DATE date,
REGION varchar(64)
);
CREATE UNIQUE INDEX Idx_key ON material_manage.data_network (NAME, SPEC, REGION, DATE);
CREATE TABLE material_manage.data_zhejiang
(
ID int(11) PRIMARY KEY NOT NULL AUTO_INCREMENT,
URL varchar(512) COMMENT '下载地址',
NAME varchar(128) COMMENT '名称',
SOURCE varchar(128) COMMENT '来源',
DATE date COMMENT '日期'
);
CREATE UNIQUE INDEX Idx_key ON material_manage.data_zhejiang (NAME, DATE);
CREATE TABLE material_manage.fujian_survey
(
ID int(11) PRIMARY KEY NOT NULL AUTO_INCREMENT,
NAME varchar(128) COMMENT '名称',
SPEC varchar(128) COMMENT '规格',
PRICE decimal(16,4) COMMENT '价格',
DATE date COMMENT '日期',
MATERIAL_ID varchar(128) COMMENT '材料id',
UNIT varchar(128) COMMENT '单位',
BRAND varchar(128) COMMENT '品牌',
TAX int(11) COMMENT '税率',
REGION varchar(128) COMMENT '地区'
);
CREATE UNIQUE INDEX Idx_key ON material_manage.fujian_survey (NAME, SPEC, DATE, REGION);
CREATE TABLE material_manage.fuzhou_highway_bureau
(
ID int(11) PRIMARY KEY NOT NULL AUTO_INCREMENT,
NAME varchar(128) COMMENT '名称',
SPEC varchar(128) COMMENT '规格',
PRICE decimal(16,4) COMMENT '价格',
DATE date COMMENT '日期',
MATERIAL_ID varchar(128) COMMENT '材料id',
UNIT varchar(128) COMMENT '单位',
BRAND varchar(128) COMMENT '品牌',
REGION varchar(128) COMMENT '地区'
);
CREATE UNIQUE INDEX Idx_key ON material_manage.fuzhou_highway_bureau (NAME, SPEC, DATE, REGION);
CREATE TABLE material_manage.fuzhou_transportation_bureau
(
ID int(11) PRIMARY KEY NOT NULL AUTO_INCREMENT,
NAME varchar(128) COMMENT '名称',
SPEC varchar(128) COMMENT '规格',
PRICE decimal(16,4) COMMENT '价格',
DATE date COMMENT '日期',
MATERIAL_ID varchar(128) COMMENT '材料id',
UNIT varchar(128) COMMENT '单位',
BRAND varchar(128) COMMENT '品牌',
REGION varchar(128) COMMENT '地区'
);
CREATE UNIQUE INDEX Idx_key ON material_manage.fuzhou_transportation_bureau (NAME, SPEC, DATE, REGION);
CREATE TABLE material_manage.local_material
(
ID int(11) PRIMARY KEY NOT NULL AUTO_INCREMENT,
NAME varchar(128) COMMENT '名称',
CITY varchar(128) COMMENT '地市',
COUNTY varchar(128) COMMENT '区县',
MATERIAL_ID varchar(128) COMMENT '材料id',
SPEC varchar(128) COMMENT '规格',
UNIT varchar(128) COMMENT '单位',
PRICE decimal(16,4) COMMENT '价格',
PRICE_WITHOUT_TAX decimal(16,4) COMMENT '除税价',
DATE date COMMENT '日期',
POSITION varchar(256) COMMENT '位置',
REMARK text COMMENT '备注'
);
CREATE UNIQUE INDEX Idx_key ON material_manage.local_material (NAME, SPEC, CITY, COUNTY, DATE);
CREATE TABLE material_manage.material
(
ID varchar(128) PRIMARY KEY NOT NULL,
PARENT_ID varchar(128),
CATEGORY1 varchar(128) COMMENT '分类1',
CATEGORY2 varchar(128) COMMENT '分类2',
CATEGORY3 varchar(128) COMMENT '分类3',
CATEGORY4 varchar(128) COMMENT '分类4',
NAME varchar(128) COMMENT '名称',
UNIT varchar(128) COMMENT '单位',
SPEC varchar(128) COMMENT '规格',
TAX int(11) COMMENT '税率（%）',
IS_BUILTIN int(11) COMMENT '是否初始内建类型（不允许删除）',
TYPE int(11) COMMENT '材料类别（主材、地材）',
IS_TREE int(11) COMMENT '是否树',
SORT int(11) COMMENT '排序',
CODE varchar(20) COMMENT '材料编码',
ROUND_BIT int(11) COMMENT '保留小数位数',
ROUND_METHOD varchar(20) COMMENT '保留小数具体方法',
update_user_id varchar(64) COMMENT '最后更新人id',
update_user_name varchar(64) COMMENT '最后更新人名称',
update_time datetime COMMENT '最后更新时间',
create_user_id varchar(64) COMMENT '创建人id',
create_user_name varchar(64) COMMENT '创建人名称',
create_time datetime COMMENT '创建时间',
delete_user_id varchar(64) COMMENT '删除人id',
delete_user_name varchar(64) COMMENT '删除人名称',
delete_time datetime COMMENT '删除时间'
);
CREATE TABLE material_manage.material_task
(
ID int(11) PRIMARY KEY NOT NULL AUTO_INCREMENT,
NAME varchar(128) COMMENT '任务名称',
STATUS int(11) COMMENT '状态（待采集、已采集、采集中）',
FILE varchar(256) COMMENT '文件路径',
TYPE int(11) COMMENT '类型（网络爬取、文件上传）',
YEAR int(11) COMMENT '采集年份',
MONTH int(11) COMMENT '采集月份',
CONTENT mediumtext COMMENT '数据内容',
update_user_id varchar(64) COMMENT '最后更新人id',
update_user_name varchar(64) COMMENT '最后更新人名称',
update_time datetime COMMENT '最后更新时间',
create_user_id varchar(64) COMMENT '创建人id',
create_user_name varchar(64) COMMENT '创建人名称',
create_time datetime COMMENT '创建时间',
delete_user_id varchar(64) COMMENT '删除人id',
delete_user_name varchar(64) COMMENT '删除人名称',
delete_time datetime COMMENT '删除时间'
);
CREATE TABLE material_manage.oil
(
ID int(11) PRIMARY KEY NOT NULL AUTO_INCREMENT,
NAME varchar(128) COMMENT '名称',
PRICE decimal(16,4) COMMENT '价格',
DATE date COMMENT '日期'
);
CREATE UNIQUE INDEX Idx_key ON material_manage.oil (NAME, DATE);
CREATE TABLE material_manage.price_publish
(
ID int(11) PRIMARY KEY NOT NULL AUTO_INCREMENT,
YEAR int(11) COMMENT '统计年份',
MONTH int(11) COMMENT '统计月份',
MATERIAL_ID varchar(128) COMMENT '编号',
NAME varchar(128) COMMENT '材料名称',
SPEC varchar(128) COMMENT '规格',
PRICE decimal(16,4) COMMENT '价格',
PRICE_FUZHOU decimal(16,4) COMMENT '福州价格',
PRICE_XIAMEN decimal(16,4) COMMENT '厦门价格',
PRICE_PUTIAN decimal(16,4) COMMENT '莆田价格',
PRICE_SANMING decimal(16,4) COMMENT '三明价格',
PRICE_QUANZHOU decimal(16,4) COMMENT '泉州价格',
PRICE_ZHANGZHOU decimal(16,4) COMMENT '漳州价格',
PRICE_NANPIN decimal(16,4) COMMENT '南平价格',
PRICE_LONGYAN decimal(16,4) COMMENT '龙岩价格',
PRICE_NINGDE decimal(16,4) COMMENT '宁德价格',
PRICE_PINTAN decimal(16,4) COMMENT '平潭价格',
PRICE_ZHANGZHOUKFQ decimal(16,4) COMMENT '漳州开发区价格',
TAX decimal(4,2) COMMENT '税率',
STATUS int(11) COMMENT '状态',
TYPE int(11) COMMENT '类型',
UNIT varchar(128) COMMENT '单位',
DISPLAY_DIGIT int(11) COMMENT '显示小数位数',
update_user_id varchar(64) COMMENT '最后更新人id',
update_user_name varchar(64) COMMENT '最后更新人名称',
update_time datetime COMMENT '最后更新时间',
create_user_id varchar(64) COMMENT '创建人id',
create_user_name varchar(64) COMMENT '创建人名称',
create_time datetime COMMENT '创建时间',
delete_user_id varchar(64) COMMENT '删除人id',
delete_user_name varchar(64) COMMENT '删除人名称',
delete_time datetime COMMENT '删除时间'
);
CREATE TABLE material_manage.price_result
(
ID int(11) PRIMARY KEY NOT NULL AUTO_INCREMENT,
MATERIAL_ID varchar(128) COMMENT '编号',
NAME varchar(128) COMMENT '材料名称',
YEAR int(11) COMMENT '统计年份',
MONTH int(11) COMMENT '统计月份',
PRICE_FTB decimal(16,4) COMMENT '福州交通局价格',
FLUCTUATING_FTB decimal(16,4) COMMENT '福州交通局浮动',
PRICE_SS decimal(16,4) COMMENT '三明钢铁价格',
FLUCTUATING_SS decimal(16,4) COMMENT '三明钢铁浮动',
PRICE_FHB decimal(16,4) COMMENT '福州公路局价格',
FLUCTUATING_FHB decimal(16,4) COMMENT '福州公路局浮动',
PRICE_NETWORK decimal(16,4) COMMENT '网络价格',
FLUCTUATING_NETWORK decimal(16,4) COMMENT '网络浮动',
PRICE_SURVEY decimal(16,4) COMMENT '调查价格',
FLUCTUATING_SURVEY decimal(16,4) COMMENT '调查浮动',
PRICE_LAST_MONTH decimal(16,4) COMMENT '上月发布价格',
PRICE_CALCULATE decimal(16,4) COMMENT '计算价格',
PRICE_RECOMMEND decimal(16,4) COMMENT '推荐价格',
FLUCTUATING_RECOMMEND decimal(16,4) COMMENT '推荐浮动',
PRICE_FUJIAN decimal(16,4) COMMENT '住建厅价格',
FLUCTUATING_FUJIAN decimal(16,4) COMMENT '住建厅浮动',
WEIGHT_FTB decimal(16,4),
WEIGHT_SS decimal(16,4),
WEIGHT_FHB decimal(16,4),
WEIGHT_NETWORK decimal(16,4),
WEIGHT_SURVEY decimal(16,4),
SPEC varchar(128) COMMENT '规格',
UNIT varchar(128) COMMENT '单位',
DISPLAY_DIGIT int(11) COMMENT '显示小数位数',
update_user_id varchar(64) COMMENT '最后更新人id',
update_user_name varchar(64) COMMENT '最后更新人名称',
update_time datetime COMMENT '最后更新时间',
create_user_id varchar(64) COMMENT '创建人id',
create_user_name varchar(64) COMMENT '创建人名称',
create_time datetime COMMENT '创建时间',
delete_user_id varchar(64) COMMENT '删除人id',
delete_user_name varchar(64) COMMENT '删除人名称',
delete_time datetime COMMENT '删除时间'
);
CREATE TABLE material_manage.sanming_steel
(
ID int(11) PRIMARY KEY NOT NULL AUTO_INCREMENT,
NAME varchar(128) COMMENT '名称',
SPEC varchar(128) COMMENT '规格',
MATERIAL varchar(64) COMMENT '材质',
PRICE decimal(16,4) COMMENT '价格',
FLUCTUATING decimal(16,4) COMMENT '浮动',
DATE date COMMENT '日期'
);
CREATE UNIQUE INDEX Idx_key ON material_manage.sanming_steel (NAME, SPEC, DATE);
CREATE TABLE material_manage.steel_plate
(
ID int(11) PRIMARY KEY NOT NULL AUTO_INCREMENT,
NAME varchar(128) COMMENT '名称',
SPEC varchar(128) COMMENT '规格',
MATERIAL varchar(64) COMMENT '材质',
SOURCE varchar(64) COMMENT '产地',
PRICE decimal(16,4) COMMENT '价格',
FLUCTUATING decimal(16,4) COMMENT '浮动',
DATE date COMMENT '日期'
);
CREATE UNIQUE INDEX Idx_key ON material_manage.steel_plate (NAME, SPEC, MATERIAL, SOURCE, DATE);
CREATE TABLE material_manage.steel_rebar
(
ID int(11) PRIMARY KEY NOT NULL AUTO_INCREMENT,
NAME varchar(128) COMMENT '名称',
SPEC varchar(128) COMMENT '规格',
MATERIAL varchar(64) COMMENT '材质',
SOURCE varchar(64) COMMENT '产地',
PRICE decimal(16,4) COMMENT '价格',
FLUCTUATING decimal(16,4) COMMENT '浮动',
DATE date COMMENT '日期'
);
CREATE UNIQUE INDEX Idx_key ON material_manage.steel_rebar (NAME, SPEC, MATERIAL, SOURCE, DATE);
CREATE TABLE material_manage.steel_section
(
ID int(11) PRIMARY KEY NOT NULL AUTO_INCREMENT,
NAME varchar(128) COMMENT '名称',
SPEC varchar(128) COMMENT '规格',
MATERIAL varchar(64) COMMENT '材质',
SOURCE varchar(64) COMMENT '产地',
PRICE decimal(16,4) COMMENT '价格',
FLUCTUATING decimal(16,4) COMMENT '浮动',
DATE date COMMENT '日期'
);
CREATE UNIQUE INDEX Idx_key ON material_manage.steel_section (NAME, SPEC, MATERIAL, SOURCE, DATE);
CREATE TABLE material_manage.steel_strand
(
ID int(11) PRIMARY KEY NOT NULL AUTO_INCREMENT,
NAME varchar(128) COMMENT '名称',
SPEC varchar(128) COMMENT '规格',
MATERIAL varchar(64) COMMENT '材质',
SOURCE varchar(64) COMMENT '产地',
PRICE decimal(16,4) COMMENT '价格',
FLUCTUATING decimal(16,4) COMMENT '浮动',
DATE date COMMENT '日期'
);
CREATE UNIQUE INDEX Idx_key ON material_manage.steel_strand (NAME, SPEC, MATERIAL, SOURCE, DATE);

18
src/main/resources/application-dev.yml
View File

@@ -4,17 +4,18 @@ spring:
datasource:
master:
driver-class-name: com.mysql.cj.jdbc.Driver
password: Xxs123456
url: jdbc:mysql://192.168.1.3:4306/material_manage?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&useInformationSchema=true
username: root
# password: XKKFB123456!
# url: jdbc:mysql://60.204.172.162:9306/material_manage?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&useInformationSchema=true
# password: Xxs123456
# url: jdbc:mysql://192.168.1.3:4306/material_manage?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&useInformationSchema=true
# username: root
password: XKKFB123456!
url: jdbc:mysql://8.138.239.222:20306/material_manage?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&useInformationSchema=true
username: root
redis:
database: 4
host: 127.0.0.1
password: ''
host: 192.168.1.3
password: Xxs123456
port: 6379
timeout: 10s
server:
port: 19882
@@ -25,7 +26,8 @@ main:
api:
host:
data-tool: http://localhost:7778
data-tool: http://localhost:17778
stirling-pdf: http://localhost:20081
path:
predict-file-dir: C:\Users\Administrator\Documents\WeChat Files\wslshanlin\FileStorage\File\2024-07

2
src/main/resources/application-huawei.yml
View File

@@ -19,7 +19,7 @@ main:
api:
host:
data-tool: http://material_api:7072
data-tool: http://material-api:7778
stirling-pdf: http://stirling-pdf:8080
path: