wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-10-29 10:51:00 +08:00
parent e221f008b0 7c205644f4
commit 6a16440840
5 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
renren-admin/src/main/java/io/renren/modules/sys/controller/SysDictTypeController.java
View File

@ -10,6 +10,7 @@ import io.renren.common.validator.group.DefaultGroup;
import io.renren.common.validator.group.UpdateGroup;
import io.renren.modules.sys.dto.SysDictTypeDTO;
import io.renren.modules.sys.entity.DictType;
import io.renren.modules.sys.service.SysDictDataService;
import io.renren.modules.sys.service.SysDictTypeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@ -21,6 +22,7 @@ import springfox.documentation.annotations.ApiIgnore;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* 字典类型
@ -31,6 +33,8 @@ import java.util.Map;
public class SysDictTypeController {
@Autowired
private SysDictTypeService sysDictTypeService;
@Autowired
private SysDictDataService sysDictDataService;
@GetMapping("page")
@ApiOperation("字典类型分页查询")
@ -41,13 +45,18 @@ public class SysDictTypeController {
@ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "dictType", value = "字典类型", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "dictName", value = "字典名称", paramType = "query", dataType = "String")
@ApiImplicitParam(name = "dictName", value = "字典名称", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "dictLabel", value = "字典标签", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "dictValue", value = "字典值", paramType = "query", dataType = "String")
})
// @RequiresPermissions("sys:dict:page")
public Result<PageData<SysDictTypeDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params) {
//字典类型
PageData<SysDictTypeDTO> page = sysDictTypeService.page(params);
page.setList(page.getList().stream().map(index -> {
index.setSysDictDataDTOList(sysDictDataService.selectByDictTypeId(index.getId().toString()));
return index;
}).collect(Collectors.toList())); //
return new Result<PageData<SysDictTypeDTO>>().ok(page);
}
@ -57,7 +66,7 @@ public class SysDictTypeController {
// @RequiresPermissions("sys:dict:info")
public Result<SysDictTypeDTO> get(@PathVariable("id") Long id) {
SysDictTypeDTO data = sysDictTypeService.get(id);
data.setSysDictDataDTOList(sysDictDataService.selectByDictTypeId(data.getId().toString()));
return new Result<SysDictTypeDTO>().ok(data);
}

6
renren-admin/src/main/java/io/renren/modules/sys/dto/SysDictTypeDTO.java
View File

@ -14,6 +14,7 @@ import javax.validation.constraints.NotNull;
import javax.validation.constraints.Null;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
* 字典类型
@ -50,4 +51,9 @@ public class SysDictTypeDTO implements Serializable {
@ApiModelProperty(value = "更新时间")
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
private Date updateDate;
@ApiModelProperty(value = "对应字典数据")
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
List<SysDictDataDTO> sysDictDataDTOList;
}

3
renren-admin/src/main/java/io/renren/modules/sys/service/SysDictDataService.java
View File

@ -5,6 +5,7 @@ import io.renren.common.service.BaseService;
import io.renren.modules.sys.dto.SysDictDataDTO;
import io.renren.modules.sys.entity.SysDictDataEntity;
import java.util.List;
import java.util.Map;
/**
@ -22,4 +23,6 @@ public interface SysDictDataService extends BaseService<SysDictDataEntity> {
void delete(Long[] ids);
List<SysDictDataDTO> selectByDictTypeId(String dictTypeId);
}

9
renren-admin/src/main/java/io/renren/modules/sys/service/impl/SysDictDataServiceImpl.java
View File

@ -14,7 +14,9 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* 字典类型
@ -75,4 +77,11 @@ public class SysDictDataServiceImpl extends BaseServiceImpl<SysDictDataDao, SysD
deleteBatchIds(Arrays.asList(ids));
}
@Override
public List<SysDictDataDTO> selectByDictTypeId(String dictTypeId) {
QueryWrapper<SysDictDataEntity> wrapper = new QueryWrapper<>();
wrapper.eq("dict_type_id", dictTypeId);
return baseDao.selectList(wrapper).stream().map(index -> ConvertUtils.sourceToTarget(index, SysDictDataDTO.class)).collect(Collectors.toList());
}
}

6
renren-admin/src/main/java/io/renren/modules/sys/service/impl/SysDictTypeServiceImpl.java
View File

@ -43,10 +43,14 @@ public class SysDictTypeServiceImpl extends BaseServiceImpl<SysDictTypeDao, SysD
String dictType = (String) params.get("dictType");
String dictName = (String) params.get("dictName");
String dictLabel = (String) params.get("dictLabel");
String dictValue = (String) params.get("dictValue");
QueryWrapper<SysDictTypeEntity> wrapper = new QueryWrapper<>();
wrapper.like(StringUtils.isNotBlank(dictType), "dict_type", dictType);
wrapper.like(StringUtils.isNotBlank(dictName), "dict_name", dictName);
wrapper.exists(StringUtils.isNotBlank(dictLabel), String.format("SELECT 1 FROM sys_dict_data sdd WHERE sdd.dict_type_id = sys_dict_type.id AND sdd.dict_label LIKE CONCAT( '%', '%s', '%' ) ", dictLabel));
wrapper.exists(StringUtils.isNotBlank(dictValue), String.format("SELECT 1 FROM sys_dict_data sdd WHERE sdd.dict_type_id = sys_dict_type.id AND sdd.dict_value =1", dictValue));
return wrapper;
}