增加字典模块-表名axzo_dictionary更新成nanopart_dictionary

This commit is contained in:
xudawei 2024-05-06 11:51:46 +08:00
parent 8a9e52baf6
commit 8833fc5a78
2 changed files with 18 additions and 6 deletions

View File

@ -16,6 +16,7 @@ import com.google.common.collect.Maps;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@ -49,13 +50,24 @@ public class DictionaryController implements DictionaryApi {
@Override @Override
public Map<String, List<QueryByDictTypeResp>> queryByBatchType(@RequestBody @Valid QueryByBatchDictTypeReq req) { public Map<String, List<QueryByDictTypeResp>> queryByBatchType(@RequestBody @Valid QueryByBatchDictTypeReq req) {
List<Dictionary> list = dictionaryService.query(BeanUtil.copyProperties(req, QueryDictReq.class)); List<Dictionary> list = dictionaryService.query(BeanUtil.copyProperties(req, QueryDictReq.class));
if (CollectionUtils.isEmpty(list)) {
return Maps.newHashMap();
}
Map<String, List<Dictionary>> map = list.stream().collect(Collectors.groupingBy(Dictionary::getDictType, Collectors.toList())); Map<String, List<Dictionary>> map = list.stream().collect(Collectors.groupingBy(Dictionary::getDictType, Collectors.toList()));
return this.buildDictTypeMap(map);
}
/**
* 构建QueryByDictTypeResp集合Map
*/
private Map<String, List<QueryByDictTypeResp>> buildDictTypeMap(Map<String, List<Dictionary>> map) {
Map<String, List<QueryByDictTypeResp>> resultMap = Maps.newHashMap(); Map<String, List<QueryByDictTypeResp>> resultMap = Maps.newHashMap();
map.forEach((dictType, dictList) -> { if (!CollectionUtils.isEmpty(map)) {
List<QueryByDictTypeResp> respList = BeanUtil.copyToList(dictList, QueryByDictTypeResp.class); map.forEach((dictType, dictList) -> {
resultMap.put(dictType, respList); List<QueryByDictTypeResp> respList = BeanUtil.copyToList(dictList, QueryByDictTypeResp.class);
}); resultMap.put(dictType, respList);
});
}
return resultMap; return resultMap;
} }
} }

View File

@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
@Accessors(chain = true) @Accessors(chain = true)
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@TableName(value = "axzo_dictionary", autoResultMap = true) @TableName(value = "nanopart_dictionary", autoResultMap = true)
public class Dictionary extends BaseEntity<Dictionary> { public class Dictionary extends BaseEntity<Dictionary> {
/** /**
@ -42,7 +42,7 @@ public class Dictionary extends BaseEntity<Dictionary> {
private String dictValue; private String dictValue;
/** /**
* 排序 * 排序:倒序,值越大越靠前
*/ */
@TableField(value = "order_by") @TableField(value = "order_by")
private Integer orderBy; private Integer orderBy;