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

fix: 调整任务优先级

Browse Source
This commit is contained in:
han0
2024-07-08 10:40:23 +08:00
parent a30edc2d46
commit 9c91f40d91
10 changed files with 587 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/mjkf/xinke/main/common/property/PathProperty.java Normal file
View File

@@ -0,0 +1,13 @@
package mjkf.xinke.main.common.property;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
@Data
@ConfigurationProperties(prefix = "path")
@Component
public class PathProperty {
private String historyFile;
}

79
src/main/java/mjkf/xinke/main/constant/MaterialTaskType.java
View File

@@ -15,46 +15,46 @@ public class MaterialTaskType {
// 三明钢铁
public static final Integer SANMING_STEEL = 301;
// 材料信息
public static final Integer FUZHOU_TRANSPORTATION_BUREAU = 40101; // todo 福州交通局
public static final Integer LONGYAN_TRANSPORTATION_BUREAU = 40102; // todo 龙岩交通局
public static final Integer NANPING_TRANSPORTATION_BUREAU = 40103; // todo 南平交通局
public static final Integer NINGDE_TRANSPORTATION_BUREAU = 40104; // todo 宁德交通局
public static final Integer PINTAN_TRANSPORTATION_BUREAU = 40105; // todo 平潭交通局
public static final Integer PUTIAN_TRANSPORTATION_BUREAU = 40106; // todo 莆田交通局
public static final Integer QUANZHOU_TRANSPORTATION_BUREAU = 40107; // todo 泉州交通局
public static final Integer SANMING_TRANSPORTATION_BUREAU = 40108; // todo 三明交通局
public static final Integer XIAMEN_TRANSPORTATION_BUREAU = 40109; // todo 厦门交通局
public static final Integer ZHANGZHOU_TRANSPORTATION_BUREAU = 40110; // todo 漳州交通局
public static final Integer ZHANGZHOUKFQ_TRANSPORTATION_BUREAU = 40111; // todo 漳州开发区交通局
public static final Integer FUZHOU_TRANSPORTATION_BUREAU = 40101; // todo-1 福州交通局
public static final Integer LONGYAN_TRANSPORTATION_BUREAU = 40102; // todo-1 龙岩交通局
public static final Integer NANPING_TRANSPORTATION_BUREAU = 40103; // todo-1 南平交通局
public static final Integer NINGDE_TRANSPORTATION_BUREAU = 40104; // todo-1 宁德交通局
public static final Integer PINTAN_TRANSPORTATION_BUREAU = 40105; // todo-1 平潭交通局
public static final Integer PUTIAN_TRANSPORTATION_BUREAU = 40106; // todo-1 莆田交通局
public static final Integer QUANZHOU_TRANSPORTATION_BUREAU = 40107; // todo-1 泉州交通局
public static final Integer SANMING_TRANSPORTATION_BUREAU = 40108; // todo-1 三明交通局
public static final Integer XIAMEN_TRANSPORTATION_BUREAU = 40109; // todo-1 厦门交通局
public static final Integer ZHANGZHOU_TRANSPORTATION_BUREAU = 40110; // todo-1 漳州交通局
public static final Integer ZHANGZHOUKFQ_TRANSPORTATION_BUREAU = 40111; // todo-1 漳州开发区交通局
public static final Integer FUZHOU_HIGHWAY_BUREAU = 40201; // todo 福州公路局
public static final Integer LONGYAN_HIGHWAY_BUREAU = 40202; // todo 龙岩公路局
public static final Integer NANPING_HIGHWAY_BUREAU = 40203; // todo 南平公路局
public static final Integer NINGDE_HIGHWAY_BUREAU = 40204; // todo 宁德公路局
public static final Integer PINTAN_HIGHWAY_BUREAU = 40205; // todo 平潭公路局
public static final Integer PUTIAN_HIGHWAY_BUREAU = 40206; // todo 莆田公路局
public static final Integer QUANZHOU_HIGHWAY_BUREAU = 40207; // todo 泉州公路局
public static final Integer SANMING_HIGHWAY_BUREAU = 40208; // todo 三明公路局
public static final Integer XIAMEN_HIGHWAY_BUREAU = 40209; // todo 厦门公路局
public static final Integer ZHANGZHOU_HIGHWAY_BUREAU = 40210; // todo 漳州公路局
public static final Integer ZHANGZHOUKFQ_HIGHWAY_BUREAU = 40211; // todo 漳州开发区公路局
public static final Integer FUZHOU_HIGHWAY_BUREAU = 40201; // todo-1 福州公路局
public static final Integer LONGYAN_HIGHWAY_BUREAU = 40202; // todo-1 龙岩公路局
public static final Integer NANPING_HIGHWAY_BUREAU = 40203; // todo-1 南平公路局
public static final Integer NINGDE_HIGHWAY_BUREAU = 40204; // todo-1 宁德公路局
public static final Integer PINTAN_HIGHWAY_BUREAU = 40205; // todo-1 平潭公路局
public static final Integer PUTIAN_HIGHWAY_BUREAU = 40206; // todo-1 莆田公路局
public static final Integer QUANZHOU_HIGHWAY_BUREAU = 40207; // todo-1 泉州公路局
public static final Integer SANMING_HIGHWAY_BUREAU = 40208; // todo-1 三明公路局
public static final Integer XIAMEN_HIGHWAY_BUREAU = 40209; // todo-1 厦门公路局
public static final Integer ZHANGZHOU_HIGHWAY_BUREAU = 40210; // todo-1 漳州公路局
public static final Integer ZHANGZHOUKFQ_HIGHWAY_BUREAU = 40211; // todo-1 漳州开发区公路局
// 地市调查表
public static final Integer FUZHOU_SURVEY = 501; // todo 福州调查表
public static final Integer LONGYAN_SURVEY = 502; // todo 龙岩调查表
public static final Integer NANPING_SURVEY = 503; // todo 南平调查表
public static final Integer NINGDE_SURVEY = 504; // todo 宁德调查表
public static final Integer PINTAN_SURVEY = 505; // todo 平潭调查表
public static final Integer PUTIAN_SURVEY = 506; // todo 莆田调查表
public static final Integer QUANZHOU_SURVEY = 507; // todo 泉州调查表
public static final Integer SANMING_SURVEY = 508; // todo 三明调查表
public static final Integer XIAMEN_SURVEY = 509; // todo 厦门调查表
public static final Integer ZHANGZHOU_SURVEY = 510; // todo 漳州调查表
public static final Integer ZHANGZHOUKFQ_SURVEY = 511; // todo 漳州开发区调查表
public static final Integer FUZHOU_SURVEY = 501; // todo-1 福州调查表
public static final Integer LONGYAN_SURVEY = 502; // todo-1 龙岩调查表
public static final Integer NANPING_SURVEY = 503; // todo-1 南平调查表
public static final Integer NINGDE_SURVEY = 504; // todo-1 宁德调查表
public static final Integer PINTAN_SURVEY = 505; // todo-1 平潭调查表
public static final Integer PUTIAN_SURVEY = 506; // todo-1 莆田调查表
public static final Integer QUANZHOU_SURVEY = 507; // todo-1 泉州调查表
public static final Integer SANMING_SURVEY = 508; // todo-1 三明调查表
public static final Integer XIAMEN_SURVEY = 509; // todo-1 厦门调查表
public static final Integer ZHANGZHOU_SURVEY = 510; // todo-1 漳州调查表
public static final Integer ZHANGZHOUKFQ_SURVEY = 511; // todo-1 漳州开发区调查表
// 其他省份
public static final Integer OTHER_ZHEJIANG = 601; // 浙江
public static final Integer OTHER_GIANLZHOU = 602; // 广州
public static final Integer OTHER_YUNNAN = 603; // 云南
public static final Integer OTHER_JIANGXI = 604; // todo 江西
public static final Integer OTHER_JIANGXI = 604; // todo-2 江西
// 住建厅
public static final Integer FUJIAN_DEPARTMENT = 701;
// 发改委
@@ -81,7 +81,7 @@ public class MaterialTaskType {
public static final Integer LOCAL_ZHANGZHOU = 1108; // 漳州
// 网络价格
public static final Integer NETWORK = 1201; // todo 网络价格
public static final Integer NETWORK = 1201; // todo-1 网络价格
public static final List<Integer> list = List.of(
NETWORK,
@@ -173,5 +173,14 @@ public class MaterialTaskType {
);
return dataFromSpiderTypes.contains(type);
}
/**
* todo-1 数据展示模块 地市暂不切换
* todo-1 十一个地市接口
* todo-1 采集结果“产地”改成“品牌产商”
* todo-1 传采集数据网络价格树变动
* todo-1 趋势图一年每月打点
* todo-1 项目材料价格预算“最高(低)总金额”携带上价格的月份
* todo-1 项目材料价格预算计算数值没有小数点
*/
}

2
src/main/java/mjkf/xinke/main/controller/MaterialController.java
View File

@@ -47,7 +47,7 @@ public class MaterialController {
query.eq(Material::getType, type);
List<Map<String, Object>> maps = materialService.listMaps(query);
maps = maps.stream().map(map -> convertKeysToLowercase(map)).collect(Collectors.toList());
// todo 列转树改为泛型对象入参
// todo-3 列转树改为泛型对象入参
List<Map<String, Object>> result = CommonUtil.listToTree(maps, Material.Fields.id, StrUtil.toUnderlineCase(Material.Fields.parentId), "00.00.00.00");
return FuHttpResponse.Builder().dataResponse(result).build();
}