WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

标签+展示区域+标签内容-中英切换修改

Browse Source
This commit is contained in:
xiejunyu
2022-03-06 22:20:37 +08:00
parent eb8febe825
commit 72b97a9126
17 changed files with 167 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java
+15 -1
View File
@@ -108,7 +108,21 @@ public class SysCategoryController {
}
return Result.OK(sysCategory);
}
/**树形结构搜索条件-名称
*
* @param
* @return
*/
@AutoLog(value = "标签内容-树形结构-通过sysDictId查询")
@ApiOperation(value="标签内容-树形结构-通过sysDictId查询", notes="标签内容-树形结构-通过sysDictId查询")
@GetMapping(value = "/queryBySysName")
public Result<?> queryBySysName(@RequestParam(name="id",required=true) String sysName) {
List<SysCategory> sysCategory = sysCategoryService.queryBySysName(sysName);
if(sysCategory==null) {
return Result.error("未找到对应数据");
}
return Result.OK(sysCategory);
}
/**
* 添加
* @param sysCategory
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java
+25 -4
View File
@@ -1,6 +1,7 @@
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;
@@ -8,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result;
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;
@@ -71,7 +73,9 @@ public class SysDictController {
@RequestMapping(value = "/page", method = RequestMethod.GET)
@ApiOperation(value = "字典控制器-分页列表查询", notes = "字典控制器-分页列表查询")
public Result<IPage<SysDict>> queryPageList(SysDict sysDict, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
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,
@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());
@@ -79,14 +83,31 @@ public class SysDictController {
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);
return result;
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()));
/* 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;
}
/**
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDict.java
+14
View File
@@ -1,6 +1,7 @@
package com.jero.modules.system.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.jero.common.aspect.annotation.Dict;
@@ -111,4 +112,17 @@ public class SysDict implements Serializable {
@Dict(dicCode = "attribute_type")
private java.lang.String attributeType;
/**属性类型名称*/
@TableField(exist = false)
@Excel(name = "属性类型名称", width = 15,dictTable = "sys_dict_item", dicText = "item_text", dicCode ="item_text")
@Dict(dictTable = "sys_dict_item", dicText = "item_text", dicCode ="item_text")
@ApiModelProperty(value = "属性类型名称")
private java.lang.String attributeTypeName;
/**数据字典英文名-属性类型英文名*/
@TableField(exist = false)
@Excel(name = "属性类型英文名", width = 15,dictTable = "sys_dict_item", dicText = "en_name", dicCode ="en_name")
@Dict(dictTable = "sys_dict_item", dicText = "en_name", dicCode ="en_name")
@ApiModelProperty(value = "属性类型英文名")
private java.lang.String attributeTypeEnName;
}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictMapper.java
+13
View File
@@ -1,5 +1,6 @@
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;
@@ -151,4 +152,16 @@ public interface SysDictMapper extends BaseMapper<SysDict> {
*/
@Deprecated
public Page<DictModel> queryDictTablePageList(Page page, @Param("query") DictQuery query);
@Select("select d.id,d.create_by,d.create_time,d.update_by,d.update_time,\n" +
"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);
}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java
+2
View File
@@ -71,4 +71,6 @@ public interface ISysCategoryService extends IService<SysCategory> {
* @return
*/
List<SysCategoryTreeVO> getSysCategoryTree();
List<SysCategory> queryBySysName(String sysName);
}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictService.java
+3
View File
@@ -1,5 +1,7 @@
package com.jero.modules.system.service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.common.system.vo.DictModel;
import com.jero.common.system.vo.DictQuery;
@@ -159,4 +161,5 @@ public interface ISysDictService extends IService<SysDict> {
*/
Integer queryExitData(SysDict sysDict);
List<Map<String, Object>> selectPageInfo(Page page, Wrapper<SysDict> queryWrapper);
}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java
+8 -1
View File
@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.api.vo.Result;
import com.jero.common.constant.FillRuleConstant;
import com.jero.common.exception.JeroBootException;
import com.jero.common.util.FillRuleUtil;
@@ -220,6 +219,12 @@ public class SysCategoryServiceImpl extends ServiceImpl<SysCategoryMapper, SysCa
return list(queryWrapper);
}
@Override
public List<SysCategory> queryBySysName(String sysName) {
QueryWrapper<SysCategory> queryWrapper=new QueryWrapper<>();
queryWrapper.like("name",sysName);
return list(queryWrapper);
}
@Override
public List<SysCategoryTreeVO> getSysCategoryTree() {
try {
@@ -234,4 +239,6 @@ public class SysCategoryServiceImpl extends ServiceImpl<SysCategoryMapper, SysCa
throw new JeroBootException("查询树形结构失败！");
}
}
}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java
+7 -1
View File
@@ -1,5 +1,6 @@
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;
@@ -382,5 +383,10 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
return count;
}
@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;
}
}