ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

微调

Browse Source
This commit is contained in:
caozehui
2024-11-11 14:41:21 +08:00
parent 42472dd496
commit 712ebfaf24
7 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
system/src/main/java/com/njcn/gather/system/dictionary/controller/DictTreeController.java
View File

@@ -58,14 +58,12 @@ public class DictTreeController extends BaseController {
}
}
/**
* 修改
* @param dicParam 修改参数
*/
@OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.UPDATE)
@PutMapping("/update")
@PostMapping("/update")
@ApiOperation("修改")
@ApiImplicitParam(name = "dicParam", value = "数据", required = true)
public HttpResult<Boolean> update(@RequestBody @Validated DictTreeParam.DictTreeUpdateParam dicParam) {
@@ -84,7 +82,7 @@ public class DictTreeController extends BaseController {
* @param id id
*/
@OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.DELETE)
@DeleteMapping("/delete")
@PostMapping("/delete")
@ApiOperation("删除")
@ApiImplicitParam(name = "id", value = "id", required = true)
public HttpResult<Boolean> delete(@RequestParam @Validated String id) {
@@ -131,14 +129,13 @@ public class DictTreeController extends BaseController {
}
@OperateInfo(info = LogEnum.SYSTEM_COMMON)
@PostMapping("/queryByid")
@PostMapping("/queryLastLevelById")
@ApiOperation("根据id查询字典树最底层")
public HttpResult<List<DictTreeVO>> queryLastLevelById(@RequestParam("id") String id) {
String methodDescribe = getMethodDescribe("queryLastLevelById");
LogUtil.njcnDebug(log, "{}，字典数据为：{}", methodDescribe, id);
List<DictTreeVO> result = dictTreeService.queryLastLevelById(id);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
@OperateInfo(info = LogEnum.SYSTEM_COMMON)

2
system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictDataServiceImpl.java
View File

@@ -54,6 +54,8 @@ public class DictDataServiceImpl extends ServiceImpl<DictDataMapper, DictData> i
//没有排序参数，默认根据sort字段排序，没有排序字段的，根据updateTime更新时间排序
queryWrapper.orderBy(true, true, "sys_dict_data.sort").orderByDesc("sys_dict_data.update_time");
}
} else {
queryWrapper.orderBy(true, true, "sys_dict_data.sort").orderByDesc("sys_dict_data.update_time");
}
queryWrapper.ne("sys_dict_data.state", DataStateEnum.DELETED.getCode())
.eq("sys_dict_data.type_id", queryParam.getTypeId());

2
system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictPqServiceImpl.java
View File

@@ -44,6 +44,8 @@ public class DictPqServiceImpl extends ServiceImpl<DictPqMapper, DictPq> impleme
//没有排序参数，默认根据sort字段排序，没有排序字段的，根据updateTime更新时间排序
queryWrapper.orderBy(true, true, "sys_dict_pq.sort").orderByDesc("sys_dict_pq.update_time");
}
} else {
queryWrapper.orderBy(true, true, "sys_dict_pq.sort").orderByDesc("sys_dict_pq.update_time");
}
queryWrapper.ne("sys_dict_pq.state", DataStateEnum.DELETED.getCode());
return this.baseMapper.selectPage(new Page<>(PageFactory.getPageNum(queryParam), PageFactory.getPageSize(queryParam)), queryWrapper);

2
system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictTypeServiceImpl.java
View File

@@ -44,6 +44,8 @@ public class DictTypeServiceImpl extends ServiceImpl<DictTypeMapper, DictType> i
//没有排序参数，默认根据sort字段排序，没有排序字段的，根据updateTime更新时间排序
queryWrapper.orderBy(true, true, "sys_dict_type.sort").orderByDesc("sys_dict_type.update_time");
}
} else {
queryWrapper.orderBy(true, true, "sys_dict_type.sort").orderByDesc("sys_dict_type.update_time");
}
queryWrapper.ne("sys_dict_type.state", DataStateEnum.DELETED.getCode());
return this.baseMapper.selectPage(new Page<>(PageFactory.getPageNum(queryParam), PageFactory.getPageSize(queryParam)), queryWrapper);