Browse Source

字典的查询和校验的框架方法

2024年11月29日14:24:38
qingyuan_dev_new
lishuai 1 year ago
parent
commit
b64a223e19
  1. 5
      modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamIndustryService.java
  2. 15
      modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamIndustryServiceImpl.java
  3. 12
      modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamHsDictController.java
  4. 15
      modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamIndustryDictController.java
  5. 28
      modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamProdProcessDictController.java
  6. 5
      modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamHsDictService.java
  7. 12
      modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamProdProcessDictService.java
  8. 6
      modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamHsDictServiceImpl.java
  9. 36
      modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamProdProcessDictServiceImpl.java

5
modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamIndustryService.java

@ -5,14 +5,17 @@ import com.thing.cbam.baesInfoExcel.dto.CbamIndustryDTO;
import com.thing.cbam.baesInfoExcel.entity.CbamIndustryEntity;
import com.thing.common.orm.service.IBaseService;
import java.util.LinkedHashMap;
public interface CbamIndustryService extends IBaseService<CbamIndustryEntity> {
CbamIndustryDTO findById(Long id);
void saveEntity(CbamIndustryDTO dto);
LinkedHashMap<String, Object> validateMsg(Long hyId,Long startTime,Long endTime);
}

15
modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamIndustryServiceImpl.java

@ -22,6 +22,7 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@ -84,4 +85,18 @@ public class CbamIndustryServiceImpl extends BaseServiceImpl<CbamIndustryMapper,
cbamMaterialService.saveBatch(ConvertUtils.sourceToTarget(cbamMaterialList, CbamMaterialEntity.class));
}
}
@Override
public LinkedHashMap<String, Object> validateMsg(Long hyId,Long startTime,Long endTime) {
LinkedHashMap<String, Object> resMap = new LinkedHashMap<>();
//1.所属行业不能为空并且是行业字典的值
return null;
}
}

12
modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamHsDictController.java

@ -1,6 +1,7 @@
package com.thing.cbam.dict.controller;
import com.thing.cbam.dict.dto.CbamHsDictDTO;
import com.thing.cbam.dict.dto.CbamProdProcessDictDTO;
import com.thing.cbam.dict.service.CbamHsDictService;
import com.thing.common.core.annotation.LogOperation;
import com.thing.common.core.constants.Constant;
@ -20,6 +21,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
/**
@ -86,6 +88,16 @@ public class CbamHsDictController {
return new Result<>();
}
@GetMapping("hs/{code}")
@Operation(summary="信息")
public Result<List<CbamHsDictDTO>> getByHsCode(@PathVariable("code") String code){
List<CbamHsDictDTO> cbamHsDictDTOS = cbamHsDictService.getByHsCode(code);
return new Result<List<CbamHsDictDTO>>().ok(cbamHsDictDTOS);
}
/**
*@GetMapping("export")
*@Operation(summary="导出")

15
modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamIndustryDictController.java

@ -20,6 +20,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
/**
@ -49,6 +50,20 @@ public class CbamIndustryDictController {
return new Result<PageData<CbamIndustryDictDTO>>().ok(page);
}
@GetMapping("list")
@Operation(summary="列表")
@Parameters({
@Parameter(name = Constant.PAGE, description = "当前页码,从1开始", required = true) ,
@Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) ,
@Parameter(name = Constant.ORDER_FIELD, description = "排序字段") ,
@Parameter(name = Constant.ORDER, description = "排序方式,可选值(asc、desc)")
})
public Result<List<CbamIndustryDictDTO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> params){
List<CbamIndustryDictDTO> list = cbamIndustryDictService.listAs(params, CbamIndustryDictDTO.class);
return new Result<List<CbamIndustryDictDTO>>().ok(list);
}
@GetMapping("{id}")
@Operation(summary="信息")
public Result<CbamIndustryDictDTO> get(@PathVariable("id") Long id){

28
modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamProdProcessDictController.java

@ -20,6 +20,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
/**
@ -56,6 +57,33 @@ public class CbamProdProcessDictController {
return new Result<CbamProdProcessDictDTO>().ok(data);
}
@GetMapping("prod/{industryId}")
@Operation(summary="信息")
public Result<List<CbamProdProcessDictDTO>> getByIndustryId(@PathVariable("industryId") Long industryId){
List<CbamProdProcessDictDTO> cbamProdProcessDictDTOS = cbamProdProcessDictService.getByIndustryId(industryId);
return new Result<List<CbamProdProcessDictDTO>>().ok(cbamProdProcessDictDTOS);
}
@GetMapping("process/{prodId}")
@Operation(summary="信息")
public Result<List<CbamProdProcessDictDTO>> getByProdId(@PathVariable("prodId") Long prodId){
List<CbamProdProcessDictDTO> cbamProdProcessDictDTOS = cbamProdProcessDictService.getByProdId(prodId);
return new Result<List<CbamProdProcessDictDTO>>().ok(cbamProdProcessDictDTOS);
}
@PostMapping("process/list")
@Operation(summary="信息")
public Result<List<CbamProdProcessDictDTO>> getByProdIds(@RequestBody List<Long> prodIds){
List<CbamProdProcessDictDTO> cbamProdProcessDictDTOS = cbamProdProcessDictService.getByProdIds(prodIds);
return new Result<List<CbamProdProcessDictDTO>>().ok(cbamProdProcessDictDTOS);
}
@PostMapping
@Operation(summary="保存")
@LogOperation("保存")

5
modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamHsDictService.java

@ -1,8 +1,11 @@
package com.thing.cbam.dict.service;
import com.thing.cbam.dict.dto.CbamHsDictDTO;
import com.thing.cbam.dict.entity.CbamHsDictEntity;
import com.thing.common.orm.service.IBaseService;
import java.util.List;
/**
* hs字典表
@ -12,4 +15,6 @@ import com.thing.common.orm.service.IBaseService;
*/
public interface CbamHsDictService extends IBaseService<CbamHsDictEntity> {
List<CbamHsDictDTO> getByHsCode(String code);
}

12
modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamProdProcessDictService.java

@ -1,7 +1,11 @@
package com.thing.cbam.dict.service;
import com.thing.cbam.dict.dto.CbamProdProcessDictDTO;
import com.thing.cbam.dict.entity.CbamProdProcessDictEntity;
import com.thing.common.orm.service.IBaseService;
import org.springframework.web.bind.annotation.PathVariable;
import java.util.List;
/**
@ -12,4 +16,12 @@ import com.thing.common.orm.service.IBaseService;
*/
public interface CbamProdProcessDictService extends IBaseService<CbamProdProcessDictEntity> {
List<CbamProdProcessDictDTO> getByIndustryId(Long industryId);
List<CbamProdProcessDictDTO> getByProdId(Long prodId);
List<CbamProdProcessDictDTO> getByProdIds(List<Long> prodIds);
}

6
modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamHsDictServiceImpl.java

@ -1,6 +1,7 @@
package com.thing.cbam.dict.service.impl;
import com.mybatisflex.core.query.QueryWrapper;
import com.thing.cbam.dict.dto.CbamHsDictDTO;
import com.thing.cbam.dict.entity.CbamHsDictEntity;
import com.thing.cbam.dict.mapper.CbamHsDictMapper;
import com.thing.cbam.dict.service.CbamHsDictService;
@ -8,6 +9,7 @@ import com.thing.common.orm.service.impl.BaseServiceImpl;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
/**
@ -26,4 +28,8 @@ public class CbamHsDictServiceImpl extends BaseServiceImpl<CbamHsDictMapper, Cba
}
@Override
public List<CbamHsDictDTO> getByHsCode(String code) {
return mapper.selectListByQueryAs(new QueryWrapper().eq(CbamHsDictEntity::getCode, code), CbamHsDictDTO.class);
}
}

36
modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamProdProcessDictServiceImpl.java

@ -1,14 +1,20 @@
package com.thing.cbam.dict.service.impl;
import com.mybatisflex.core.query.QueryWrapper;
import com.thing.cbam.dict.dto.CbamProdProcessDictDTO;
import com.thing.cbam.dict.entity.CbamProdProcessDictEntity;
import com.thing.cbam.dict.mapper.CbamProdProcessDictMapper;
import com.thing.cbam.dict.service.CbamProdProcessDictService;
import com.thing.common.core.constants.Constant;
import com.thing.common.orm.service.impl.BaseServiceImpl;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
import java.util.Objects;
/**
* 原料生产过程---工艺路线映射表
@ -26,4 +32,34 @@ public class CbamProdProcessDictServiceImpl extends BaseServiceImpl<CbamProdProc
}
@Override
public List<CbamProdProcessDictDTO> getByIndustryId(Long industryId) {
return getByIndustryIdAndType(industryId, null,"yl", Constant.ASC);
}
@Override
public List<CbamProdProcessDictDTO> getByProdId(Long prodId) {
return getByIndustryIdAndType(prodId, null,"gylx", Constant.ASC);
}
@Override
public List<CbamProdProcessDictDTO> getByProdIds(List<Long> prodIds) {
return getByIndustryIdAndType(null, prodIds,"gylx", Constant.ASC);
}
public List<CbamProdProcessDictDTO> getByIndustryIdAndType(Long pidId,List<Long> pidIds, String type, String order) {
boolean asc = true;
if (StringUtils.equalsIgnoreCase(Constant.DESC, order)) {
asc = false;
}
QueryWrapper queryWrapper = QueryWrapper.create()
.eq(CbamProdProcessDictEntity::getPidId, pidId, Objects::nonNull)
.eq(CbamProdProcessDictEntity::getPidId, pidIds, CollectionUtils::isNotEmpty)
.eq(CbamProdProcessDictEntity::getType, type)
.orderBy(CbamProdProcessDictEntity::getSort, asc);
return mapper.selectListByQueryAs(queryWrapper, CbamProdProcessDictDTO.class);
}
}
Loading…
Cancel
Save