From a6f795a23d75b34d843f48deb761ec300472898a Mon Sep 17 00:00:00 2001 From: han0 Date: Mon, 9 Sep 2024 09:24:48 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8F=98=E6=9B=B4=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=9D=90=E6=96=99=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/constant/HttpErrorResponseEnum.java | 1 + .../main/controller/BudgetController.java | 11 ++- .../main/controller/MaterialController.java | 24 +++---- .../mjkf/xinke/main/model/db/Material.java | 12 ++-- .../main/model/vo/MaterialCreateRequest.java | 69 ++++++++++--------- .../main/service/AsphaltDomesticService.java | 1 - .../main/service/AsphaltImportedService.java | 1 - .../xinke/main/service/CementService.java | 1 - .../xinke/main/service/DataFujianService.java | 1 - .../main/service/DataGuangdongService.java | 1 - .../mjkf/xinke/main/service/DataService.java | 1 - .../main/service/DataZhejiangService.java | 1 - .../main/service/MaterialTaskService.java | 1 - .../mjkf/xinke/main/service/OilService.java | 1 - .../main/service/SanmingSteelService.java | 1 - .../xinke/main/service/SteelPlateService.java | 1 - .../xinke/main/service/SteelRebarService.java | 1 - .../main/service/SteelSectionService.java | 1 - .../main/service/SteelStrandService.java | 1 - 19 files changed, 63 insertions(+), 68 deletions(-) diff --git a/src/main/java/mjkf/xinke/main/constant/HttpErrorResponseEnum.java b/src/main/java/mjkf/xinke/main/constant/HttpErrorResponseEnum.java index ad55b90..3ea9264 100644 --- a/src/main/java/mjkf/xinke/main/constant/HttpErrorResponseEnum.java +++ b/src/main/java/mjkf/xinke/main/constant/HttpErrorResponseEnum.java @@ -23,6 +23,7 @@ public enum HttpErrorResponseEnum implements NcHttpErrorResponseInterface { MATERIAL_PARENT_ID_INVALID("材料 parent_id 无效", 1005, HttpStatus.SC_NOT_FOUND), MATERIAL_TASK_NOT_FOUND("找不到指定材料采集任务", 1006, HttpStatus.SC_NOT_FOUND), MATERIAL_RESULT_NOT_FOUND("找不到指定材料采集结果", 1007, HttpStatus.SC_NOT_FOUND), + MATERIAL_CATEGORY_INVALID("材料分类无效", 1007, HttpStatus.SC_NOT_FOUND), PRICE_RESULT_YEAR_MONTH_NEEDED("缺少年份或月份", 1101, HttpStatus.SC_NOT_FOUND), PRICE_RESULT_NOT_FOUND("未找到对应数据", 1102, HttpStatus.SC_NOT_FOUND), diff --git a/src/main/java/mjkf/xinke/main/controller/BudgetController.java b/src/main/java/mjkf/xinke/main/controller/BudgetController.java index b8d582e..563ac8a 100644 --- a/src/main/java/mjkf/xinke/main/controller/BudgetController.java +++ b/src/main/java/mjkf/xinke/main/controller/BudgetController.java @@ -154,5 +154,14 @@ public class BudgetController { return FuHttpResponse.Builder().dataResponse(budgetItemList).build(); } - // todo-2 在价格发布创建时补全材料id + // todo-1 新增材料 编码替换 + // todo-1 发布编码替换 + // todo-1 公众网站数据 + // todo-1 公众网站历史数据 + // todo-1 料场位置管理 + // todo-1 地图里程数据 + // todo-1 价格权重调整 + // todo-1 外省数据上传 + // todo-1 外省数据价格对比 + // todo-1 趋势表加入调查表数据 } diff --git a/src/main/java/mjkf/xinke/main/controller/MaterialController.java b/src/main/java/mjkf/xinke/main/controller/MaterialController.java index 36fec31..4c9496b 100644 --- a/src/main/java/mjkf/xinke/main/controller/MaterialController.java +++ b/src/main/java/mjkf/xinke/main/controller/MaterialController.java @@ -38,6 +38,7 @@ public class MaterialController { @Resource MaterialService materialService; + @Deprecated @ApiOperation("获取材料树") @GetMapping("/tree") public HttpResponse getTree ( @@ -66,21 +67,16 @@ public class MaterialController { @ApiOperation("获取材料列表") @GetMapping("/") public HttpResponse list ( - @ApiParam(value = "关键字") @RequestParam(value="key_word", required=false) String keyWord, - @ApiParam(value = "父节点id") @RequestParam("parent_id") String parentId + @ApiParam(value = "关键字") @RequestParam(value="key_word", required=false) String keyWord +// @ApiParam(value = "父节点id") @RequestParam("parent_id") String parentId ) { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); - query.eq(Material::getIsTree, 0); - if (parentId != null) { - query.eq(Material::getParentId, parentId); - } +// query.eq(Material::getIsTree, 0); +// if (parentId != null) { +// query.eq(Material::getParentId, parentId); +// } if (keyWord != null && ObjectUtil.isNotEmpty(keyWord)) { - query.and(q -> q - .like(Material::getCategory1, keyWord).or() - .like(Material::getCategory2, keyWord).or() - .like(Material::getCategory3, keyWord).or() - .like(Material::getCategory4, keyWord) - ); + query.like(Material::getName, keyWord); } var result = materialService.list(query); @@ -114,7 +110,8 @@ public class MaterialController { params.check(); var user = StpLoginUserUtil.getLoginUser(); - var data = materialService.getById(params.getId()); + var id = params.buildId(); + var data = materialService.getById(id); if (data != null) { throw new NcHttpException(HttpErrorResponseEnum.MATERIAL_ID_REPEAT); } @@ -145,6 +142,7 @@ public class MaterialController { return FuHttpResponse.Builder().dataResponse(data).build(); } + @Deprecated @ApiOperation("生成编号") @PostMapping("/id") public HttpResponse createId ( diff --git a/src/main/java/mjkf/xinke/main/model/db/Material.java b/src/main/java/mjkf/xinke/main/model/db/Material.java index 6eae6be..c97445b 100644 --- a/src/main/java/mjkf/xinke/main/model/db/Material.java +++ b/src/main/java/mjkf/xinke/main/model/db/Material.java @@ -138,18 +138,16 @@ public class Material extends Model { public Material() {} public Material(MaterialCreateRequest params, SaBaseLoginUser user) { - this.id = params.getId(); - this.parentId = params.getParentId(); -// this.category1 = params.getCategory1(); -// this.category2 = params.getCategory2(); -// this.category3 = params.getCategory3(); -// this.category4 = params.getCategory4(); + this.id = params.buildId(); + this.category1 = params.getCategory1(); + this.category2 = params.getCategory2(); + this.category3 = params.getCategory3(); + this.category4 = params.getCategory4(); this.name = params.getName(); this.unit = params.getUnit(); this.spec = params.getSpec(); this.tax = params.getTax(); this.type = params.getType(); - this.isTree = params.getIsTree(); this.updateTime = LocalDateTime.now(); this.createTime = LocalDateTime.now(); this.createUserName = user.getName(); diff --git a/src/main/java/mjkf/xinke/main/model/vo/MaterialCreateRequest.java b/src/main/java/mjkf/xinke/main/model/vo/MaterialCreateRequest.java index 6cbfb0d..4fb5912 100644 --- a/src/main/java/mjkf/xinke/main/model/vo/MaterialCreateRequest.java +++ b/src/main/java/mjkf/xinke/main/model/vo/MaterialCreateRequest.java @@ -1,8 +1,6 @@ package mjkf.xinke.main.model.vo; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.fasterxml.jackson.annotation.JsonProperty; +import cn.hutool.core.util.ObjectUtil; import com.jgy.xxs.core.http.exp.NcHttpException; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -11,24 +9,17 @@ import mjkf.xinke.main.constant.HttpErrorResponseEnum; @Data public class MaterialCreateRequest { - @TableId(value = "ID", type = IdType.AUTO) - private String id; + @ApiModelProperty("分类1") + private String category1; - @ApiModelProperty("父级id") - @JsonProperty(value = "parent_id") - private String parentId; + @ApiModelProperty("分类2") + private String category2; -// @ApiModelProperty("分类1") -// private String category1; -// -// @ApiModelProperty("分类2") -// private String category2; -// -// @ApiModelProperty("分类3") -// private String category3; -// -// @ApiModelProperty("分类4") -// private String category4; + @ApiModelProperty("分类3") + private String category3; + + @ApiModelProperty("分类4") + private String category4; @ApiModelProperty("名称") private String name; @@ -45,24 +36,36 @@ public class MaterialCreateRequest { @ApiModelProperty("类型") private Integer type; - @ApiModelProperty("是否树") - @JsonProperty(value = "is_tree") - private Integer isTree; - - public void check() throws Exception{ - String flag = this.parentId.replace(".00", ""); - if (!this.id.contains(flag)) { - throw new NcHttpException(HttpErrorResponseEnum.MATERIAL_ID_INVALID); + public void check() throws Exception { + if (ObjectUtil.isEmpty(category1) || category1.chars().count() != 2) { + throw new NcHttpException(HttpErrorResponseEnum.MATERIAL_CATEGORY_INVALID); } - if ((int) this.id.chars().filter(c -> c == '.').count() != 3) { - throw new NcHttpException(HttpErrorResponseEnum.MATERIAL_ID_INVALID); + if (ObjectUtil.isEmpty(category2) || category2.chars().count() != 2) { + throw new NcHttpException(HttpErrorResponseEnum.MATERIAL_CATEGORY_INVALID); } - if ((int) this.parentId.chars().filter(c -> c == '.').count() != 3) { - throw new NcHttpException(HttpErrorResponseEnum.MATERIAL_PARENT_ID_INVALID); + if (ObjectUtil.isEmpty(category3) || category3.chars().count() != 3) { + throw new NcHttpException(HttpErrorResponseEnum.MATERIAL_CATEGORY_INVALID); } - if (this.parentId.chars().filter(c -> c == '0').count() < this.id.chars().filter(c -> c == '0').count()) { - throw new NcHttpException(HttpErrorResponseEnum.MATERIAL_ID_INVALID); + if (ObjectUtil.isNotEmpty(category4) && category4.chars().count() != 3) { + throw new NcHttpException(HttpErrorResponseEnum.MATERIAL_CATEGORY_INVALID); + } + if (ObjectUtil.isEmpty(spec)) { + throw new NcHttpException(HttpErrorResponseEnum.MATERIAL_CATEGORY_INVALID); + } + if (ObjectUtil.isEmpty(tax)) { + throw new NcHttpException(HttpErrorResponseEnum.MATERIAL_CATEGORY_INVALID); + } + if (ObjectUtil.isEmpty(type)) { + throw new NcHttpException(HttpErrorResponseEnum.MATERIAL_CATEGORY_INVALID); } } + public String buildId() { + var id = category1 + category2 + category3; + if (ObjectUtil.isNotEmpty(category4)) { + id = id + category4; + } + return id; + } + } diff --git a/src/main/java/mjkf/xinke/main/service/AsphaltDomesticService.java b/src/main/java/mjkf/xinke/main/service/AsphaltDomesticService.java index 3ac715c..0551aa0 100644 --- a/src/main/java/mjkf/xinke/main/service/AsphaltDomesticService.java +++ b/src/main/java/mjkf/xinke/main/service/AsphaltDomesticService.java @@ -50,7 +50,6 @@ public class AsphaltDomesticService extends DataService, Cement> { query.like(Cement::getName, name); } if (materialId != null) { - // todo // query.eq(SteelSection::getMaterialId, materialId); } return query; diff --git a/src/main/java/mjkf/xinke/main/service/DataFujianService.java b/src/main/java/mjkf/xinke/main/service/DataFujianService.java index 3cc7aed..095c5d5 100644 --- a/src/main/java/mjkf/xinke/main/service/DataFujianService.java +++ b/src/main/java/mjkf/xinke/main/service/DataFujianService.java @@ -27,7 +27,6 @@ public class DataFujianService extends DataService, DataF query.like(DataFujian::getName, name); } if (materialId != null) { - // todo // query.eq(SteelSection::getMaterialId, materialId); } return query; diff --git a/src/main/java/mjkf/xinke/main/service/DataGuangdongService.java b/src/main/java/mjkf/xinke/main/service/DataGuangdongService.java index 77e1191..3799c03 100644 --- a/src/main/java/mjkf/xinke/main/service/DataGuangdongService.java +++ b/src/main/java/mjkf/xinke/main/service/DataGuangdongService.java @@ -28,7 +28,6 @@ public class DataGuangdongService extends DataService, query.like(DataGuangdong::getName, name); } if (materialId != null) { - // todo // query.eq(SteelSection::getMaterialId, materialId); } return query; diff --git a/src/main/java/mjkf/xinke/main/service/DataService.java b/src/main/java/mjkf/xinke/main/service/DataService.java index 987c245..7e49040 100644 --- a/src/main/java/mjkf/xinke/main/service/DataService.java +++ b/src/main/java/mjkf/xinke/main/service/DataService.java @@ -108,7 +108,6 @@ public abstract class DataService, T> extends ServiceImp List group = groupMap.get(groupKey); result.add(this.statisticItemFromGroup(group)); } - // todo 排序 return result; } diff --git a/src/main/java/mjkf/xinke/main/service/DataZhejiangService.java b/src/main/java/mjkf/xinke/main/service/DataZhejiangService.java index fbe0594..84e490d 100644 --- a/src/main/java/mjkf/xinke/main/service/DataZhejiangService.java +++ b/src/main/java/mjkf/xinke/main/service/DataZhejiangService.java @@ -30,7 +30,6 @@ public class DataZhejiangService extends DataService, query.like(DataZhejiang::getName, name); } if (materialId != null) { - // todo // query.eq(SteelSection::getMaterialId, materialId); } return query; diff --git a/src/main/java/mjkf/xinke/main/service/MaterialTaskService.java b/src/main/java/mjkf/xinke/main/service/MaterialTaskService.java index 5a25d1f..466af8a 100644 --- a/src/main/java/mjkf/xinke/main/service/MaterialTaskService.java +++ b/src/main/java/mjkf/xinke/main/service/MaterialTaskService.java @@ -91,7 +91,6 @@ public class MaterialTaskService extends ServiceImpl, M list = fuzhouHighwayBureauService.saveOrUpdateByIndexBatch(rows, data); } else { System.out.println("MaterialTaskService.importData | 未识别的任务类型"); - // todo-3 异常处理：未识别的类型 return false; } // 保存数据副本 diff --git a/src/main/java/mjkf/xinke/main/service/OilService.java b/src/main/java/mjkf/xinke/main/service/OilService.java index 6d7576b..2368a50 100644 --- a/src/main/java/mjkf/xinke/main/service/OilService.java +++ b/src/main/java/mjkf/xinke/main/service/OilService.java @@ -47,7 +47,6 @@ public class OilService extends DataService, Oil> { query.like(Oil::getName, name); } if (materialId != null) { - // todo // query.eq(SteelSection::getMaterialId, materialId); } return query; diff --git a/src/main/java/mjkf/xinke/main/service/SanmingSteelService.java b/src/main/java/mjkf/xinke/main/service/SanmingSteelService.java index 3d87c5f..5e10700 100644 --- a/src/main/java/mjkf/xinke/main/service/SanmingSteelService.java +++ b/src/main/java/mjkf/xinke/main/service/SanmingSteelService.java @@ -54,7 +54,6 @@ public class SanmingSteelService extends DataService, S query.like(SanmingSteel::getName, name); } if (materialId != null) { - // todo // query.eq(SteelSection::getMaterialId, materialId); } return query; diff --git a/src/main/java/mjkf/xinke/main/service/SteelPlateService.java b/src/main/java/mjkf/xinke/main/service/SteelPlateService.java index a30752c..2d77508 100644 --- a/src/main/java/mjkf/xinke/main/service/SteelPlateService.java +++ b/src/main/java/mjkf/xinke/main/service/SteelPlateService.java @@ -63,7 +63,6 @@ public class SteelPlateService extends DataService, Steel query.like(SteelPlate::getName, name); } if (materialId != null) { - // todo // query.eq(SteelSection::getMaterialId, materialId); } return query; diff --git a/src/main/java/mjkf/xinke/main/service/SteelRebarService.java b/src/main/java/mjkf/xinke/main/service/SteelRebarService.java index 6d503bc..cd4d09a 100644 --- a/src/main/java/mjkf/xinke/main/service/SteelRebarService.java +++ b/src/main/java/mjkf/xinke/main/service/SteelRebarService.java @@ -59,7 +59,6 @@ public class SteelRebarService extends DataService, Steel query.like(SteelRebar::getName, name); } if (materialId != null) { - // todo // query.eq(SteelRebar::getMaterialId, materialId); } return query; diff --git a/src/main/java/mjkf/xinke/main/service/SteelSectionService.java b/src/main/java/mjkf/xinke/main/service/SteelSectionService.java index 37795ee..848d074 100644 --- a/src/main/java/mjkf/xinke/main/service/SteelSectionService.java +++ b/src/main/java/mjkf/xinke/main/service/SteelSectionService.java @@ -60,7 +60,6 @@ public class SteelSectionService extends DataService, S query.like(SteelSection::getName, name); } if (materialId != null) { - // todo // query.eq(SteelSection::getMaterialId, materialId); } return query; diff --git a/src/main/java/mjkf/xinke/main/service/SteelStrandService.java b/src/main/java/mjkf/xinke/main/service/SteelStrandService.java index 65242c1..1413d59 100644 --- a/src/main/java/mjkf/xinke/main/service/SteelStrandService.java +++ b/src/main/java/mjkf/xinke/main/service/SteelStrandService.java @@ -60,7 +60,6 @@ public class SteelStrandService extends DataService, Ste query.like(SteelStrand::getName, name); } if (materialId != null) { - // todo // query.eq(SteelSection::getMaterialId, materialId); } return query;