提交 61ac2692 编写于 作者: sq3536's avatar sq3536

数据字典局部刷新

上级 10a37506
...@@ -3,14 +3,18 @@ package cn.ibizlab.api.rest.extensions; ...@@ -3,14 +3,18 @@ package cn.ibizlab.api.rest.extensions;
import cn.ibizlab.api.dto.DictCatalogDTO; import cn.ibizlab.api.dto.DictCatalogDTO;
import cn.ibizlab.api.mapping.DictCatalogMapping; import cn.ibizlab.api.mapping.DictCatalogMapping;
import cn.ibizlab.core.dict.domain.DictCatalog; import cn.ibizlab.core.dict.domain.DictCatalog;
import cn.ibizlab.core.dict.domain.DictOption;
import cn.ibizlab.core.dict.extensions.service.DictCoreService; import cn.ibizlab.core.dict.extensions.service.DictCoreService;
import cn.ibizlab.core.dict.extensions.vo.Catalog; import cn.ibizlab.core.dict.extensions.vo.Catalog;
import cn.ibizlab.core.dict.extensions.vo.CodeItem;
import cn.ibizlab.core.dict.extensions.vo.CodeList; import cn.ibizlab.core.dict.extensions.vo.CodeList;
import cn.ibizlab.core.dict.extensions.vo.Option; import cn.ibizlab.core.dict.extensions.vo.Option;
import cn.ibizlab.core.dict.filter.DictCatalogSearchContext; import cn.ibizlab.core.dict.filter.DictCatalogSearchContext;
import cn.ibizlab.core.dict.service.IDictCatalogService; import cn.ibizlab.core.dict.service.IDictCatalogService;
import cn.ibizlab.core.dict.service.IDictOptionService;
import cn.ibizlab.util.annotation.VersionCheck; import cn.ibizlab.util.annotation.VersionCheck;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
...@@ -22,9 +26,14 @@ import org.springframework.http.HttpStatus; ...@@ -22,9 +26,14 @@ import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.sql.Wrapper;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
@Slf4j @Slf4j
@RestController @RestController
...@@ -34,6 +43,9 @@ public class DictCoreResource { ...@@ -34,6 +43,9 @@ public class DictCoreResource {
@Autowired @Autowired
private IDictCatalogService dictcatalogService; private IDictCatalogService dictcatalogService;
@Autowired
private IDictOptionService optionService;
@Autowired @Autowired
@Lazy @Lazy
private DictCatalogMapping dictcatalogMapping; private DictCatalogMapping dictcatalogMapping;
...@@ -55,6 +67,23 @@ public class DictCoreResource { ...@@ -55,6 +67,23 @@ public class DictCoreResource {
return ResponseEntity.status(HttpStatus.OK).body(catalog.getOptions()); return ResponseEntity.status(HttpStatus.OK).body(catalog.getOptions());
} }
@RequestMapping(method = RequestMethod.POST, value = "/dictionarys/catalogs/{code}/options")
public ResponseEntity<List<Option>> getOptions(@PathVariable("code") String code,@RequestBody List<String> values) {
List<Option> list = new ArrayList<>();
optionService.list(Wrappers.<DictOption>lambdaQuery().eq(DictOption::getCatalog,code).in(DictOption::getValue,values).orderByAsc(DictOption::getShoworder)).forEach(item ->
{
Map<String,Object> extension = new HashMap<>();
if(!StringUtils.isEmpty(item.getExtension()))
extension = JSONObject.parseObject(item.getExtension(),Map.class);
list.add(new Option().setValue(item.getValue()).setId(item.getValue())
.setDisabled(((item.getDisabled()!=null && item.getDisabled()==1)||(item.getExpired()!=null && item.getExpired()==1))?true:false)
.setFilter(item.getFilter()).setIconClass(item.getIconClass()).setLabel(item.getLabel()).setParent(item.getParent()).setExtension(extension)
);
}
);
return ResponseEntity.status(HttpStatus.OK).body(list);
}
@RequestMapping(method = RequestMethod.GET, value = "/dictionarys/codelist/{code}") @RequestMapping(method = RequestMethod.GET, value = "/dictionarys/codelist/{code}")
public ResponseEntity<CodeList> getCodeList(@PathVariable("code") String code) { public ResponseEntity<CodeList> getCodeList(@PathVariable("code") String code) {
CodeList catalog = dictCoreService.getCodeListCatalog(code); CodeList catalog = dictCoreService.getCodeListCatalog(code);
...@@ -62,6 +91,24 @@ public class DictCoreResource { ...@@ -62,6 +91,24 @@ public class DictCoreResource {
} }
@RequestMapping(method = RequestMethod.POST, value = "/dictionarys/codelist/{code}/items")
public ResponseEntity<List<CodeItem>> getCodeItems(@PathVariable("code") String code, @RequestBody List<String> values) {
List<CodeItem> list = new ArrayList<>();
optionService.list(Wrappers.<DictOption>lambdaQuery().eq(DictOption::getCatalog,code).in(DictOption::getValue,values).orderByAsc(DictOption::getShoworder)).forEach(item ->
{
Map<String,Object> extension = new HashMap<>();
if(!StringUtils.isEmpty(item.getExtension()))
extension = JSONObject.parseObject(item.getExtension(),Map.class);
list.add(new CodeItem().setValue(item.getValue()).setId(item.getValue())
.setDisabled(((item.getDisabled()!=null && item.getDisabled()==1)||(item.getExpired()!=null && item.getExpired()==1))?true:false)
.setFilter(item.getFilter()).setIconClass(item.getIconClass()).setLabel(item.getLabel()).setParent(item.getParent()).setExtension(extension)
);
}
);
return ResponseEntity.status(HttpStatus.OK).body(list);
}
@RequestMapping(method = RequestMethod.POST, value = "/dictionarys/catalogs") @RequestMapping(method = RequestMethod.POST, value = "/dictionarys/catalogs")
public ResponseEntity<Boolean> save(@RequestBody DictCatalogDTO dictcatalogdto) { public ResponseEntity<Boolean> save(@RequestBody DictCatalogDTO dictcatalogdto) {
return ResponseEntity.status(HttpStatus.OK).body(dictcatalogService.save(dictcatalogMapping.toDomain(dictcatalogdto))); return ResponseEntity.status(HttpStatus.OK).body(dictcatalogService.save(dictcatalogMapping.toDomain(dictcatalogdto)));
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册