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-09-09 09:24:48 +08:00
parent f6cdb1b44d
commit a6f795a23d
19 changed files with 63 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/mjkf/xinke/main/constant/HttpErrorResponseEnum.java
View File

@@ -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),

11
src/main/java/mjkf/xinke/main/controller/BudgetController.java
View File

@@ -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 趋势表加入调查表数据
}

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

@@ -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<Material> 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 (

12
src/main/java/mjkf/xinke/main/model/db/Material.java
View File

@@ -138,18 +138,16 @@ public class Material extends Model<Material> {
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();

69
src/main/java/mjkf/xinke/main/model/vo/MaterialCreateRequest.java
View File

@@ -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;
}
}

1
src/main/java/mjkf/xinke/main/service/AsphaltDomesticService.java
View File

@@ -50,7 +50,6 @@ public class AsphaltDomesticService extends DataService<BaseMapper<AsphaltDomest
query.like(AsphaltDomestic::getName, name);
}
if (materialId != null) {
// todo
// query.eq(SteelSection::getMaterialId, materialId);
}
return query;

1
src/main/java/mjkf/xinke/main/service/AsphaltImportedService.java
View File

@@ -50,7 +50,6 @@ public class AsphaltImportedService extends DataService<BaseMapper<AsphaltImport
query.like(AsphaltImported::getName, name);
}
if (materialId != null) {
// todo
// query.eq(SteelSection::getMaterialId, materialId);
}
return query;

1
src/main/java/mjkf/xinke/main/service/CementService.java
View File

@@ -59,7 +59,6 @@ public class CementService extends DataService<BaseMapper<Cement>, Cement> {
query.like(Cement::getName, name);
}
if (materialId != null) {
// todo
// query.eq(SteelSection::getMaterialId, materialId);
}
return query;

1
src/main/java/mjkf/xinke/main/service/DataFujianService.java
View File

@@ -27,7 +27,6 @@ public class DataFujianService extends DataService<BaseMapper<DataFujian>, DataF
query.like(DataFujian::getName, name);
}
if (materialId != null) {
// todo
// query.eq(SteelSection::getMaterialId, materialId);
}
return query;

1
src/main/java/mjkf/xinke/main/service/DataGuangdongService.java
View File

@@ -28,7 +28,6 @@ public class DataGuangdongService extends DataService<BaseMapper<DataGuangdong>,
query.like(DataGuangdong::getName, name);
}
if (materialId != null) {
// todo
// query.eq(SteelSection::getMaterialId, materialId);
}
return query;

1
src/main/java/mjkf/xinke/main/service/DataService.java
View File

@@ -108,7 +108,6 @@ public abstract class DataService<M extends BaseMapper<T>, T> extends ServiceImp
List group = groupMap.get(groupKey);
result.add(this.statisticItemFromGroup(group));
}
// todo 排序
return result;
}

1
src/main/java/mjkf/xinke/main/service/DataZhejiangService.java
View File

@@ -30,7 +30,6 @@ public class DataZhejiangService extends DataService<BaseMapper<DataZhejiang>,
query.like(DataZhejiang::getName, name);
}
if (materialId != null) {
// todo
// query.eq(SteelSection::getMaterialId, materialId);
}
return query;

1
src/main/java/mjkf/xinke/main/service/MaterialTaskService.java
View File

@@ -91,7 +91,6 @@ public class MaterialTaskService extends ServiceImpl<BaseMapper<MaterialTask>, M
list = fuzhouHighwayBureauService.saveOrUpdateByIndexBatch(rows, data);
} else {
System.out.println("MaterialTaskService.importData | 未识别的任务类型");
// todo-3 异常处理：未识别的类型
return false;
}
// 保存数据副本

1
src/main/java/mjkf/xinke/main/service/OilService.java
View File

@@ -47,7 +47,6 @@ public class OilService extends DataService<BaseMapper<Oil>, Oil> {
query.like(Oil::getName, name);
}
if (materialId != null) {
// todo
// query.eq(SteelSection::getMaterialId, materialId);
}
return query;

1
src/main/java/mjkf/xinke/main/service/SanmingSteelService.java
View File

@@ -54,7 +54,6 @@ public class SanmingSteelService extends DataService<BaseMapper<SanmingSteel>, S
query.like(SanmingSteel::getName, name);
}
if (materialId != null) {
// todo
// query.eq(SteelSection::getMaterialId, materialId);
}
return query;

1
src/main/java/mjkf/xinke/main/service/SteelPlateService.java
View File

@@ -63,7 +63,6 @@ public class SteelPlateService extends DataService<BaseMapper<SteelPlate>, Steel
query.like(SteelPlate::getName, name);
}
if (materialId != null) {
// todo
// query.eq(SteelSection::getMaterialId, materialId);
}
return query;

1
src/main/java/mjkf/xinke/main/service/SteelRebarService.java
View File

@@ -59,7 +59,6 @@ public class SteelRebarService extends DataService<BaseMapper<SteelRebar>, Steel
query.like(SteelRebar::getName, name);
}
if (materialId != null) {
// todo
// query.eq(SteelRebar::getMaterialId, materialId);
}
return query;

1
src/main/java/mjkf/xinke/main/service/SteelSectionService.java
View File

@@ -60,7 +60,6 @@ public class SteelSectionService extends DataService<BaseMapper<SteelSection>, S
query.like(SteelSection::getName, name);
}
if (materialId != null) {
// todo
// query.eq(SteelSection::getMaterialId, materialId);
}
return query;

1
src/main/java/mjkf/xinke/main/service/SteelStrandService.java
View File

@@ -60,7 +60,6 @@ public class SteelStrandService extends DataService<BaseMapper<SteelStrand>, Ste
query.like(SteelStrand::getName, name);
}
if (materialId != null) {
// todo
// query.eq(SteelSection::getMaterialId, materialId);
}
return query;