展示区域+标签内容修改
This commit is contained in:
xiejunyu
+17
-27
@@ -1,15 +1,14 @@
|
||||
package com.jero.modules.system.controller;
|
||||
|
||||
|
||||
import com.alibaba.fastjson.JSONArray;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.jero.common.api.vo.Result;
|
||||
import com.jero.common.aspect.annotation.AutoLog;
|
||||
import com.jero.common.constant.CacheConstant;
|
||||
import com.jero.common.constant.CommonConstant;
|
||||
import com.jero.common.constant.enums.CutEnum;
|
||||
import com.jero.common.system.query.QueryGenerator;
|
||||
import com.jero.common.system.vo.DictModel;
|
||||
import com.jero.common.system.vo.LoginUser;
|
||||
@@ -73,41 +72,32 @@ public class SysDictController {
|
||||
|
||||
@RequestMapping(value = "/page", method = RequestMethod.GET)
|
||||
@ApiOperation(value = "字典控制器-分页列表查询", notes = "字典控制器-分页列表查询")
|
||||
public Result<?> queryPageList(@RequestParam(name = "cut") String cut,
|
||||
//public Result<IPage<SysDict>> queryPageList(@RequestParam(name = "cut") String cut,
|
||||
SysDict sysDict, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
public Result<IPage<SysDict>> queryPageList(SysDict sysDict, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) {
|
||||
Result<IPage<SysDict>> result = new Result<IPage<SysDict>>();
|
||||
QueryWrapper<SysDict> queryWrapper = QueryGenerator.initQueryWrapper(sysDict, req.getParameterMap());
|
||||
if(StringUtils.isNotBlank("create_time")) {
|
||||
queryWrapper.orderByDesc("create_time");
|
||||
}
|
||||
Page<SysDict> page = new Page<SysDict>(pageNo, pageSize);
|
||||
/* IPage<SysDict> pageList = sysDictService.page(page, queryWrapper);
|
||||
IPage<SysDict> pageList = sysDictService.page(page, queryWrapper);
|
||||
log.debug("查询当前页："+pageList.getCurrent());
|
||||
log.debug("查询当前页数量："+pageList.getSize());
|
||||
log.debug("查询结果数量："+pageList.getRecords().size());
|
||||
log.debug("数据总数："+pageList.getTotal());
|
||||
result.setSuccess(true);
|
||||
result.setResult(pageList);*/
|
||||
//中英切换-属性类型列
|
||||
List<Map<String, Object>> pageList = sysDictService.selectPageInfo(page, queryWrapper);
|
||||
if (CutEnum.CN.getValue().equals(cut)) {
|
||||
return Result.OK(pageList);
|
||||
} else {
|
||||
JSONArray jsonArray = new JSONArray();
|
||||
jsonArray.addAll(pageList);
|
||||
List<SysDict> list = jsonArray.toJavaList(SysDict.class);
|
||||
list.stream().forEach(f -> f.setAttributeTypeName(f.getAttributeTypeEnName()));
|
||||
result.setResult(pageList);
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
/* String mid = String.valueOf(pageSize);
|
||||
JSONArray json = JSONArray.parseArray(mid);
|
||||
List<OnlCgformTag> aList = json.toJavaList(OnlCgformTag.class);*/
|
||||
//IPage p= (IPage) list;//list.addAll(aList)
|
||||
return Result.OK(list);
|
||||
}
|
||||
//return result;
|
||||
/**
|
||||
* 标签内容-分页查询
|
||||
* @param params
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "标签内容-分页列表查询")
|
||||
@ApiOperation(value="标签内容-分页列表查询", notes="区域管理表-分页列表查询")
|
||||
@PostMapping(value = "/tagDictPage")
|
||||
public Result<?> queryPageList(@RequestBody Map<String,Object> params) {
|
||||
IPage<SysDict> pageList=sysDictService.queryPageList(params);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
+2
-3
@@ -1,6 +1,5 @@
|
||||
package com.jero.modules.system.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
@@ -159,9 +158,9 @@ public interface SysDictMapper extends BaseMapper<SysDict> {
|
||||
"d.dict_name,d.dict_code,d.description,d.del_flag,d.type,\n" +
|
||||
"d.dict_en_name,d.is_tag_dict,d.is_read_only,d.attribute_type as attribute_type_value,\n" +
|
||||
"i.item_text as attribute_type_name,i.en_name as attribute_type_en_name\n" +
|
||||
"\n" +
|
||||
"from sys_dict as d\n" +
|
||||
"left join sys_dict_item as i on d.attribute_type=i.item_value\n" +
|
||||
"where i.dict_id=\"1494570247913512962\"")
|
||||
IPage<Map<String,Object>> selectPageInfo(Page page, Wrapper<SysDict> queryWrapper);
|
||||
//IPage<Map<String,Object>> selectPageInfo(Page page, Wrapper<SysDict> queryWrapper);
|
||||
IPage<SysDict> queryPageList(IPage page,@Param("params") Map<String,Object> params);
|
||||
}
|
||||
|
||||
+4
-1
@@ -1,6 +1,7 @@
|
||||
package com.jero.modules.system.service;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.jero.common.system.vo.DictModel;
|
||||
@@ -161,5 +162,7 @@ public interface ISysDictService extends IService<SysDict> {
|
||||
*/
|
||||
Integer queryExitData(SysDict sysDict);
|
||||
|
||||
List<Map<String, Object>> selectPageInfo(Page page, Wrapper<SysDict> queryWrapper);
|
||||
//List<Map<String, Object>> selectPageInfo(Page page, Wrapper<SysDict> queryWrapper);
|
||||
|
||||
IPage<SysDict> queryPageList(Map<String, Object> params);
|
||||
}
|
||||
|
||||
+20
-2
@@ -1,6 +1,5 @@
|
||||
package com.jero.modules.system.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
@@ -384,11 +383,30 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
|
||||
return count;
|
||||
}
|
||||
|
||||
@Override
|
||||
/*@Override
|
||||
public List<Map<String, Object>> selectPageInfo(Page page, Wrapper<SysDict> queryWrapper) {
|
||||
IPage<Map<String, Object>> info= sysDictMapper.selectPageInfo(page, queryWrapper);
|
||||
List<Map<String, Object>> list = info.getRecords().stream().collect(Collectors.toList());
|
||||
return list;
|
||||
}*/
|
||||
|
||||
/**
|
||||
* 标签内容-分页查询
|
||||
*
|
||||
* @param params
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public IPage<SysDict> queryPageList(Map<String, Object> params) {
|
||||
Integer pageNo= Integer.valueOf(params.get("pageNo").toString());
|
||||
Integer pageSize= Integer.valueOf(params.get("pageSize").toString());
|
||||
IPage<SysDict> page=new Page(pageNo,pageSize);
|
||||
//中英切换-属性类型列
|
||||
if(CutEnum.EN.getValue().equals(params.get("cut").toString())){
|
||||
params.put("attributeTypeName",params.get("attributeTypeEnName"));
|
||||
}
|
||||
IPage<SysDict> result=sysDictMapper.queryPageList(page,params);
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user