yangjun
/
nursing_unit_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: yangjun:8730af08d193bc7615f45ca027d7f11917c8c296
Branches Tags
yangjun:master
..
compare: yangjun:c1db62d553f74001c6b8817b4d7805606476b009
Branches Tags
yangjun:master

2 Commits
8730af08d1 ... c1db62d553

Author SHA1 Message Date
1378012178@qq.com c1db62d553 Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_java 2025-04-03 09:46:11 +08:00
1378012178@qq.com f728a577e8 调整业务字典功能 2025-04-03 09:46:04 +08:00
21 changed files with 978 additions and 583 deletions
Show Stats Expand all files Collapse all files

167
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/controller/DictTypeController.java
View File

@ -1,167 +0,0 @@
package com.nu.modules.dictType.controller;
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.nu.modules.dictType.entity.DictType;
import com.nu.modules.dictType.service.IDictTypeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
/**
* @Description: 业务字典主表
* @Author: 张明远
* @Date: 2025-03-11
* @Version: V1.0
*/
@Api(tags="业务字典主表")
@RestController
@RequestMapping("/dictType/dictType")
@Slf4j
public class DictTypeController extends JeecgController<DictType, IDictTypeService> {
@Autowired
private IDictTypeService dictTypeService;
@GetMapping("/abc")
public String abc(){
return "abc";
}
/**
* 分页列表查询
*
* @param dictType
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "业务字典主表-分页列表查询")
@ApiOperation(value="业务字典主表-分页列表查询", notes="业务字典主表-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<DictType>> queryPageList(DictType dictType,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<DictType> queryWrapper = QueryGenerator.initQueryWrapper(dictType, req.getParameterMap());
Page<DictType> page = new Page<DictType>(pageNo, pageSize);
IPage<DictType> pageList = dictTypeService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param dictType
* @return
*/
@AutoLog(value = "业务字典主表-添加")
@ApiOperation(value="业务字典主表-添加", notes="业务字典主表-添加")
@RequiresPermissions("dictType:dict_type:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody DictType dictType) {
dictTypeService.save(dictType);
return Result.OK("添加成功！");
}
/**
* 编辑
*
* @param dictType
* @return
*/
@AutoLog(value = "业务字典主表-编辑")
@ApiOperation(value="业务字典主表-编辑", notes="业务字典主表-编辑")
@RequiresPermissions("dictType:dict_type:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody DictType dictType) {
dictTypeService.updateById(dictType);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "业务字典主表-通过id删除")
@ApiOperation(value="业务字典主表-通过id删除", notes="业务字典主表-通过id删除")
@RequiresPermissions("dictType:dict_type:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
dictTypeService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "业务字典主表-批量删除")
@ApiOperation(value="业务字典主表-批量删除", notes="业务字典主表-批量删除")
@RequiresPermissions("dictType:dict_type:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.dictTypeService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "业务字典主表-通过id查询")
@ApiOperation(value="业务字典主表-通过id查询", notes="业务字典主表-通过id查询")
@GetMapping(value = "/queryById")
public Result<DictType> queryById(@RequestParam(name="id",required=true) String id) {
DictType dictType = dictTypeService.getById(id);
if(dictType==null) {
return Result.error("未找到对应数据");
}
return Result.OK(dictType);
}
/**
* 导出excel
*
* @param request
* @param dictType
*/
@RequiresPermissions("dictType:dict_type:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, DictType dictType) {
return super.exportXls(request, dictType, DictType.class, "业务字典主表");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequiresPermissions("dictType:dict_type:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, DictType.class);
}
}

156
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/controller/DictTypeItemController.java
View File

@ -1,156 +0,0 @@
package com.nu.modules.dictType.controller;
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.nu.modules.dictType.entity.DictTypeItem;
import com.nu.modules.dictType.service.IDictTypeItemService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
/**
* @Description: dict_type_item
* @Author: 张明远
* @Date: 2025-03-12
* @Version: V1.0
*/
@Api(tags="dict_type_item")
@RestController
@RequestMapping("/dictType/dictTypeItem")
@Slf4j
public class DictTypeItemController extends JeecgController<DictTypeItem, IDictTypeItemService> {
@Autowired
private IDictTypeItemService dictTypeItemService;
/**
* 分页列表查询
*
* @param dictTypeItem
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "dict_type_item-分页列表查询")
@ApiOperation(value="dict_type_item-分页列表查询", notes="dict_type_item-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<DictTypeItem>> queryPageList(DictTypeItem dictTypeItem,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<DictTypeItem> queryWrapper = QueryGenerator.initQueryWrapper(dictTypeItem, req.getParameterMap());
Page<DictTypeItem> page = new Page<DictTypeItem>(pageNo, pageSize);
IPage<DictTypeItem> pageList = dictTypeItemService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param dictTypeItem
* @return
*/
@AutoLog(value = "dict_type_item-添加")
@ApiOperation(value="dict_type_item-添加", notes="dict_type_item-添加")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody DictTypeItem dictTypeItem) {
dictTypeItemService.save(dictTypeItem);
return Result.OK("添加成功！");
}
/**
* 编辑
*
* @param dictTypeItem
* @return
*/
@AutoLog(value = "dict_type_item-编辑")
@ApiOperation(value="dict_type_item-编辑", notes="dict_type_item-编辑")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody DictTypeItem dictTypeItem) {
dictTypeItemService.updateById(dictTypeItem);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "dict_type_item-通过id删除")
@ApiOperation(value="dict_type_item-通过id删除", notes="dict_type_item-通过id删除")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
dictTypeItemService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "dict_type_item-批量删除")
@ApiOperation(value="dict_type_item-批量删除", notes="dict_type_item-批量删除")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.dictTypeItemService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "dict_type_item-通过id查询")
@ApiOperation(value="dict_type_item-通过id查询", notes="dict_type_item-通过id查询")
@GetMapping(value = "/queryById")
public Result<DictTypeItem> queryById(@RequestParam(name="id",required=true) String id) {
DictTypeItem dictTypeItem = dictTypeItemService.getById(id);
if(dictTypeItem==null) {
return Result.error("未找到对应数据");
}
return Result.OK(dictTypeItem);
}
/**
* 导出excel
*
* @param request
* @param dictTypeItem
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, DictTypeItem dictTypeItem) {
return super.exportXls(request, dictTypeItem, DictTypeItem.class, "dict_type_item");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, DictTypeItem.class);
}
}

70
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/entity/DictType.java
View File

@ -1,70 +0,0 @@
package com.nu.modules.dictType.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/**
* @Description: 业务字典主表
* @Author: 张明远
* @Date: 2025-03-11
* @Version: V1.0
*/
@Data
@TableName("nu_dict_type")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="nu_dict_type对象", description="业务字典主表")
public class DictType implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id")
private String id;
/**字典名称*/
@Excel(name = "字典名称", width = 15)
@ApiModelProperty(value = "字典名称")
private String dictName;
/**字典编码*/
@Excel(name = "字典编码", width = 15)
@ApiModelProperty(value = "字典编码")
private String dictCode;
/**描述*/
@Excel(name = "描述", width = 15)
@ApiModelProperty(value = "描述")
private String description;
/**删除状态*/
@Excel(name = "删除状态", width = 15)
@ApiModelProperty(value = "删除状态")
@TableLogic
private Integer delFlag;
/**创建人*/
@ApiModelProperty(value = "创建人")
private String createBy;
/**创建时间*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建时间")
private Date createTime;
/**更新人*/
@ApiModelProperty(value = "更新人")
private String updateBy;
/**更新时间*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新时间")
private Date updateTime;
}

78
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/entity/DictTypeItem.java
View File

@ -1,78 +0,0 @@
package com.nu.modules.dictType.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/**
* @Description: dict_type_item
* @Author: 张明远
* @Date: 2025-03-12
* @Version: V1.0
*/
@Data
@TableName("nu_dict_type_item")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="nu_dict_type_item对象", description="dict_type_item")
public class DictTypeItem implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id")
private String id;
/**字典id*/
@Excel(name = "字典id", width = 15)
@ApiModelProperty(value = "字典id")
private String dictId;
/**字典项文本*/
@Excel(name = "字典项文本", width = 15)
@ApiModelProperty(value = "字典项文本")
private String itemText;
/**字典项值*/
@Excel(name = "字典项值", width = 15)
@ApiModelProperty(value = "字典项值")
private String itemValue;
/**描述*/
@Excel(name = "描述", width = 15)
@ApiModelProperty(value = "描述")
private String description;
/**排序*/
@Excel(name = "排序", width = 15)
@ApiModelProperty(value = "排序")
private Integer sortOrder;
/**状态（1启用 0不启用）*/
@Excel(name = "状态（0启用 1不启用）", width = 15)
@ApiModelProperty(value = "状态（0启用 1不启用）")
@Dict(dicCode = "iz_enabled")
private String status;
/**创建人*/
@ApiModelProperty(value = "创建人")
private String createBy;
/**创建时间*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建时间")
private Date createTime;
/**更新人*/
@ApiModelProperty(value = "更新人")
private String updateBy;
/**更新时间*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新时间")
private Date updateTime;
}

14
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/mapper/DictTypeItemMapper.java
View File

@ -1,14 +0,0 @@
package com.nu.modules.dictType.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nu.modules.dictType.entity.DictTypeItem;
/**
* @Description: dict_type_item
* @Author: 张明远
* @Date: 2025-03-12
* @Version: V1.0
*/
public interface DictTypeItemMapper extends BaseMapper<DictTypeItem> {
}

14
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/mapper/DictTypeMapper.java
View File

@ -1,14 +0,0 @@
package com.nu.modules.dictType.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nu.modules.dictType.entity.DictType;
/**
* @Description: 业务字典主表
* @Author: 张明远
* @Date: 2025-03-11
* @Version: V1.0
*/
public interface DictTypeMapper extends BaseMapper<DictType> {
}

5
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/mapper/xml/DictTypeItemMapper.xml
View File

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nu.modules.dictType.mapper.DictTypeItemMapper">
</mapper>

5
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/mapper/xml/DictTypeMapper.xml
View File

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nu.modules.dictType.mapper.DictTypeMapper">
</mapper>

14
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/service/IDictTypeItemService.java
View File

@ -1,14 +0,0 @@
package com.nu.modules.dictType.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.nu.modules.dictType.entity.DictTypeItem;
/**
* @Description: dict_type_item
* @Author: 张明远
* @Date: 2025-03-12
* @Version: V1.0
*/
public interface IDictTypeItemService extends IService<DictTypeItem> {
}

14
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/service/IDictTypeService.java
View File

@ -1,14 +0,0 @@
package com.nu.modules.dictType.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.nu.modules.dictType.entity.DictType;
/**
* @Description: 业务字典主表
* @Author: 张明远
* @Date: 2025-03-11
* @Version: V1.0
*/
public interface IDictTypeService extends IService<DictType> {
}

18
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/service/impl/DictTypeItemServiceImpl.java
View File

@ -1,18 +0,0 @@
package com.nu.modules.dictType.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nu.modules.dictType.entity.DictTypeItem;
import com.nu.modules.dictType.mapper.DictTypeItemMapper;
import com.nu.modules.dictType.service.IDictTypeItemService;
import org.springframework.stereotype.Service;
/**
* @Description: dict_type_item
* @Author: 张明远
* @Date: 2025-03-12
* @Version: V1.0
*/
@Service
public class DictTypeItemServiceImpl extends ServiceImpl<DictTypeItemMapper, DictTypeItem> implements IDictTypeItemService {
}

19
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/service/impl/DictTypeServiceImpl.java
View File

@ -1,19 +0,0 @@
package com.nu.modules.dictType.service.impl;
import com.nu.modules.dictType.entity.DictType;
import com.nu.modules.dictType.mapper.DictTypeMapper;
import com.nu.modules.dictType.service.IDictTypeService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 业务字典主表
* @Author: 张明远
* @Date: 2025-03-11
* @Version: V1.0
*/
@Service
public class DictTypeServiceImpl extends ServiceImpl<DictTypeMapper, DictType> implements IDictTypeService {
}

1
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/controller/DirectivePackageController.java
View File

@ -60,6 +60,7 @@ public class DirectivePackageController extends JeecgController<DirectivePackage
QueryWrapper<DirectivePackage> queryWrapper = QueryGenerator.initQueryWrapper(directivePackage, req.getParameterMap(),customeRuleMap); QueryWrapper<DirectivePackage> queryWrapper = QueryGenerator.initQueryWrapper(directivePackage, req.getParameterMap(),customeRuleMap);
Page<DirectivePackage> page = new Page<DirectivePackage>(pageNo, pageSize); Page<DirectivePackage> page = new Page<DirectivePackage>(pageNo, pageSize);
queryWrapper.select("id"); queryWrapper.select("id");
queryWrapper.orderByDesc("create_time");
IPage<DirectivePackage> pageList = directivePackageService.page(page, queryWrapper); IPage<DirectivePackage> pageList = directivePackageService.page(page, queryWrapper);
if (pageList.getRecords() != null && !pageList.getRecords().isEmpty()) { if (pageList.getRecords() != null && !pageList.getRecords().isEmpty()) {
directivePackageService.queryList(directivePackage, pageList); directivePackageService.queryList(directivePackage, pageList);

1
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/controller/ServiceTagController.java
View File

@ -62,6 +62,7 @@ public class ServiceTagController extends JeecgController<ServiceTag, IServiceTa
QueryWrapper<ServiceTag> queryWrapper = QueryGenerator.initQueryWrapper(serviceTag, req.getParameterMap(),customeRuleMap); QueryWrapper<ServiceTag> queryWrapper = QueryGenerator.initQueryWrapper(serviceTag, req.getParameterMap(),customeRuleMap);
Page<ServiceTag> page = new Page<ServiceTag>(pageNo, pageSize); Page<ServiceTag> page = new Page<ServiceTag>(pageNo, pageSize);
queryWrapper.select("id"); queryWrapper.select("id");
queryWrapper.orderByDesc("create_time");
IPage<ServiceTag> pageList = serviceTagService.page(page, queryWrapper); IPage<ServiceTag> pageList = serviceTagService.page(page, queryWrapper);
if (pageList.getRecords() != null && !pageList.getRecords().isEmpty()) { if (pageList.getRecords() != null && !pageList.getRecords().isEmpty()) {
serviceTagService.queryList(serviceTag, pageList); serviceTagService.queryList(serviceTag, pageList);

779
nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/NuDictController.java Normal file
View File

@ -0,0 +1,779 @@
package org.jeecg.modules.system.controller;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
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 lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.apache.shiro.subject.Subject;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.config.TenantContext;
import org.jeecg.common.constant.CacheConstant;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.constant.SymbolConstant;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.DictModel;
import org.jeecg.common.system.vo.DictQuery;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.ImportExcelUtil;
import org.jeecg.common.util.RedisUtil;
import org.jeecg.common.util.TokenUtils;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.config.mybatis.MybatisPlusSaasConfig;
import org.jeecg.config.shiro.ShiroRealm;
import org.jeecg.modules.system.entity.SysDict;
import org.jeecg.modules.system.entity.SysDictItem;
import org.jeecg.modules.system.model.SysDictTree;
import org.jeecg.modules.system.model.TreeSelectModel;
import org.jeecg.modules.system.service.ISysDictItemService;
import org.jeecg.modules.system.service.ISysDictService;
import org.jeecg.modules.system.vo.SysDictPage;
import org.jeecg.modules.system.vo.lowapp.SysDictVo;
import org.jeecgframework.poi.excel.ExcelImportCheckUtil;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.util.*;
/**
* <p>
* nu字典表 前端控制器
* </p>
*
* @Author zmy
* @since 2025-4-2 16:13:43
*/
@RestController
@RequestMapping("/nu/dict")
@Slf4j
public class NuDictController {
@Autowired
private ISysDictService sysDictService;
@Autowired
private ISysDictItemService sysDictItemService;
@Autowired
public RedisTemplate<String, Object> redisTemplate;
@Autowired
private RedisUtil redisUtil;
@Autowired
private ShiroRealm shiroRealm;
@RequestMapping(value = "/list", method = RequestMethod.GET)
public Result<IPage<SysDict>> queryPageList(
SysDict sysDict,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
// 查询关键字，模糊筛选code和name
@RequestParam(name = "keywords", required = false) String keywords,
HttpServletRequest req
) {
Result<IPage<SysDict>> result = new Result<IPage<SysDict>>();
//------------------------------------------------------------------------------------------------
//是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】
if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL){
sysDict.setTenantId(oConvertUtils.getInt(TenantContext.getTenant(),0));
}
//------------------------------------------------------------------------------------------------
QueryWrapper<SysDict> queryWrapper = QueryGenerator.initQueryWrapper(sysDict, req.getParameterMap());
queryWrapper.eq("tag","nu");
// 查询关键字，模糊筛选code和name
if (oConvertUtils.isNotEmpty(keywords)) {
queryWrapper.and(i -> i.like("dict_code", keywords).or().like("dict_name", keywords));
}
Page<SysDict> page = new Page<>(pageNo, pageSize);
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;
}
/**
* @功能：获取树形字典数据
* @param sysDict
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@SuppressWarnings("unchecked")
@RequestMapping(value = "/treeList", method = RequestMethod.GET)
public Result<List<SysDictTree>> treeList(SysDict sysDict, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) {
Result<List<SysDictTree>> result = new Result<>();
LambdaQueryWrapper<SysDict> query = new LambdaQueryWrapper<>();
// 构造查询条件
String dictName = sysDict.getDictName();
if(oConvertUtils.isNotEmpty(dictName)) {
query.like(true, SysDict::getDictName, dictName);
}
query.orderByDesc(true, SysDict::getCreateTime);
List<SysDict> list = sysDictService.list(query);
List<SysDictTree> treeList = new ArrayList<>();
for (SysDict node : list) {
treeList.add(new SysDictTree(node));
}
result.setSuccess(true);
result.setResult(treeList);
return result;
}
/**
* 获取全部字典数据
*
* @return
*/
@RequestMapping(value = "/queryAllDictItems", method = RequestMethod.GET)
public Result<?> queryAllDictItems(HttpServletRequest request) {
Map<String, List<DictModel>> res = new HashMap(5);
res = sysDictService.queryAllDictItems();
return Result.ok(res);
}
/**
* 获取字典数据
* @param dictCode
* @return
*/
@RequestMapping(value = "/getDictText/{dictCode}/{key}", method = RequestMethod.GET)
public Result<String> getDictText(@PathVariable("dictCode") String dictCode, @PathVariable("key") String key) {
log.info(" dictCode : "+ dictCode);
Result<String> result = new Result<String>();
String text = null;
try {
text = sysDictService.queryDictTextByKey(dictCode, key);
result.setSuccess(true);
result.setResult(text);
} catch (Exception e) {
log.error(e.getMessage(),e);
result.error500("操作失败");
return result;
}
return result;
}
/**
* 获取字典数据 【接口签名验证】
* @param dictCode 字典code
* @param dictCode 表名,文本字段,code字段 | 举例：sys_user,realname,id
* @return
*/
@RequestMapping(value = "/getDictItems/{dictCode}", method = RequestMethod.GET)
public Result<List<DictModel>> getDictItems(@PathVariable("dictCode") String dictCode, @RequestParam(value = "sign",required = false) String sign,HttpServletRequest request) {
log.info(" dictCode : "+ dictCode);
Result<List<DictModel>> result = new Result<List<DictModel>>();
try {
List<DictModel> ls = sysDictService.getDictItems(dictCode);
if (ls == null) {
result.error500("字典Code格式不正确！");
return result;
}
result.setSuccess(true);
result.setResult(ls);
log.debug(result.toString());
} catch (Exception e) {
log.error(e.getMessage(), e);
result.error500("操作失败");
return result;
}
return result;
}
/**
* 【接口签名验证】
* 【JSearchSelectTag下拉搜索组件专用接口】
* 大数据量的字典表 走异步加载 即前端输入内容过滤数据
* @param dictCode 字典code格式：table,text,code
* @return
*/
@RequestMapping(value = "/loadDict/{dictCode}", method = RequestMethod.GET)
public Result<List<DictModel>> loadDict(@PathVariable("dictCode") String dictCode,
@RequestParam(name="keyword",required = false) String keyword,
@RequestParam(value = "sign",required = false) String sign,
@RequestParam(name = "pageNo", defaultValue = "1", required = false) Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10", required = false) Integer pageSize) {
//update-begin-author:taoyan date:2023-5-22 for: /issues/4905 因为中括号(%5)的问题导致的 表单生成器字段配置时，选择关联字段，在进行高级配置时，无法加载数据库列表，提示 Sgin签名校验错误！ #4905 RouteToRequestUrlFilter
if(keyword!=null && keyword.indexOf("%5")>=0){
try {
keyword = URLDecoder.decode(keyword, "UTF-8");
} catch (UnsupportedEncodingException e) {
log.error("下拉搜索关键字解码失败", e);
}
}
//update-end-author:taoyan date:2023-5-22 for: /issues/4905 因为中括号(%5)的问题导致的 表单生成器字段配置时，选择关联字段，在进行高级配置时，无法加载数据库列表，提示 Sgin签名校验错误！ #4905
log.info(" 加载字典表数据,加载关键字: "+ keyword);
Result<List<DictModel>> result = new Result<List<DictModel>>();
try {
List<DictModel> ls = sysDictService.loadDict(dictCode, keyword, pageNo,pageSize);
if (ls == null) {
result.error500("字典Code格式不正确！");
return result;
}
result.setSuccess(true);
result.setResult(ls);
log.info(result.toString());
return result;
} catch (Exception e) {
log.error(e.getMessage(),e);
result.error500("操作失败：" + e.getMessage());
return result;
}
}
/**
* 【接口签名验证】
* 【给表单设计器的表字典使用】下拉搜索模式，有值时动态拼接数据
* @param dictCode
* @param keyword 当前控件的值，可以逗号分割
* @param sign
* @param pageSize
* @return
*/
@RequestMapping(value = "/loadDictOrderByValue/{dictCode}", method = RequestMethod.GET)
public Result<List<DictModel>> loadDictOrderByValue(
@PathVariable("dictCode") String dictCode,
@RequestParam(name = "keyword") String keyword,
@RequestParam(value = "sign", required = false) String sign,
@RequestParam(value = "pageSize", required = false) Integer pageSize) {
// 首次查询查出来用户选中的值，并且不分页
Result<List<DictModel>> firstRes = this.loadDict(dictCode, keyword, sign,null, null);
if (!firstRes.isSuccess()) {
return firstRes;
}
// 然后再查询出第一页的数据
Result<List<DictModel>> result = this.loadDict(dictCode, "", sign,1, pageSize);
if (!result.isSuccess()) {
return result;
}
// 合并两次查询的数据
List<DictModel> firstList = firstRes.getResult();
List<DictModel> list = result.getResult();
for (DictModel firstItem : firstList) {
// anyMatch 表示：判断的条件里，任意一个元素匹配成功，返回true
// allMatch 表示：判断条件里的元素，所有的都匹配成功，返回true
// noneMatch 跟 allMatch 相反，表示：判断条件里的元素，所有的都匹配失败，返回true
boolean none = list.stream().noneMatch(item -> item.getValue().equals(firstItem.getValue()));
// 当元素不存在时，再添加到集合里
if (none) {
list.add(0, firstItem);
}
}
return result;
}
/**
* 【接口签名验证】
* 根据字典code加载字典text 返回
* @param dictCode 顺序：tableName,text,code
* @param keys 要查询的key
* @param sign
* @param delNotExist 是否移除不存在的项，默认为true，设为false如果某个key不存在数据库中，则直接返回key本身
* @param request
* @return
*/
@RequestMapping(value = "/loadDictItem/{dictCode}", method = RequestMethod.GET)
public Result<List<String>> loadDictItem(@PathVariable("dictCode") String dictCode,@RequestParam(name="key") String keys, @RequestParam(value = "sign",required = false) String sign,@RequestParam(value = "delNotExist",required = false,defaultValue = "true") boolean delNotExist,HttpServletRequest request) {
Result<List<String>> result = new Result<>();
try {
if(dictCode.indexOf(SymbolConstant.COMMA)!=-1) {
String[] params = dictCode.split(SymbolConstant.COMMA);
if(params.length!=3) {
result.error500("字典Code格式不正确！");
return result;
}
List<String> texts = sysDictService.queryTableDictByKeys(params[0], params[1], params[2], keys, delNotExist);
result.setSuccess(true);
result.setResult(texts);
log.info(result.toString());
}else {
result.error500("字典Code格式不正确！");
}
} catch (Exception e) {
log.error(e.getMessage(),e);
result.error500("操作失败");
return result;
}
return result;
}
/**
* 【接口签名验证】
* 根据表名——显示字段-存储字段 pid 加载树形数据
* @param hasChildField 是否叶子节点字段
* @param converIsLeafVal 是否需要系统转换 是否叶子节点的值 (0标识不转换、1标准系统自动转换)
* @param tableName 表名
* @param text label字段
* @param code value 字段
* @param condition 查询条件 ？
*
*/
@SuppressWarnings("unchecked")
@RequestMapping(value = "/loadTreeData", method = RequestMethod.GET)
public Result<List<TreeSelectModel>> loadTreeData(@RequestParam(name="pid",required = false) String pid, @RequestParam(name="pidField") String pidField,
@RequestParam(name="tableName") String tableName,
@RequestParam(name="text") String text,
@RequestParam(name="code") String code,
@RequestParam(name="hasChildField") String hasChildField,
@RequestParam(name="converIsLeafVal",defaultValue ="1") int converIsLeafVal,
@RequestParam(name="condition") String condition,
@RequestParam(value = "sign",required = false) String sign, HttpServletRequest request) {
Result<List<TreeSelectModel>> result = new Result<List<TreeSelectModel>>();
// 【QQYUN-9207】防止参数为空导致报错
if (oConvertUtils.isEmpty(tableName) || oConvertUtils.isEmpty(text) || oConvertUtils.isEmpty(code)) {
result.error500("字典Code格式不正确！");
return result;
}
// 1.获取查询条件参数
Map<String, String> query = null;
if(oConvertUtils.isNotEmpty(condition)) {
query = JSON.parseObject(condition, Map.class);
}
// 2.返回查询结果
List<TreeSelectModel> ls = sysDictService.queryTreeList(query,tableName, text, code, pidField, pid,hasChildField,converIsLeafVal);
result.setSuccess(true);
result.setResult(ls);
return result;
}
/**
* 【APP接口】根据字典配置查询表字典数据（目前暂未找到调用的地方）
* @param query
* @param pageNo
* @param pageSize
* @return
*/
@Deprecated
@GetMapping("/queryTableData")
public Result<List<DictModel>> queryTableData(DictQuery query,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
@RequestParam(value = "sign",required = false) String sign,HttpServletRequest request){
Result<List<DictModel>> res = new Result<List<DictModel>>();
List<DictModel> ls = this.sysDictService.queryDictTablePageList(query,pageSize,pageNo);
res.setResult(ls);
res.setSuccess(true);
return res;
}
/**
* @功能：新增
* @param sysDict
* @return
*/
@RequiresPermissions("nu:dict:add")
@RequestMapping(value = "/add", method = RequestMethod.POST)
public Result<SysDict> add(@RequestBody SysDict sysDict) {
sysDict.setTag("nu");
Result<SysDict> result = new Result<SysDict>();
try {
sysDict.setCreateTime(new Date());
sysDict.setDelFlag(CommonConstant.DEL_FLAG_0);
sysDictService.save(sysDict);
result.success("保存成功！");
} catch (Exception e) {
log.error(e.getMessage(),e);
result.error500("操作失败");
}
return result;
}
/**
* @功能：编辑
* @param sysDict
* @return
*/
@RequiresPermissions("nu:dict:edit")
@RequestMapping(value = "/edit", method = { RequestMethod.PUT,RequestMethod.POST })
public Result<SysDict> edit(@RequestBody SysDict sysDict) {
Result<SysDict> result = new Result<SysDict>();
SysDict sysdict = sysDictService.getById(sysDict.getId());
if(sysdict==null) {
result.error500("未找到对应实体");
}else {
sysDict.setUpdateTime(new Date());
boolean ok = sysDictService.updateById(sysDict);
if(ok) {
result.success("编辑成功!");
}
}
return result;
}
/**
* @功能：删除
* @param id
* @return
*/
@RequiresPermissions("nu:dict:delete")
@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
@CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true)
public Result<SysDict> delete(@RequestParam(name="id",required=true) String id) {
Result<SysDict> result = new Result<SysDict>();
boolean ok = sysDictService.removeById(id);
if(ok) {
result.success("删除成功!");
}else{
result.error500("删除失败!");
}
return result;
}
/**
* @功能：批量删除
* @param ids
* @return
*/
@RequiresPermissions("nu:dict:deleteBatch")
@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
@CacheEvict(value= {CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true)
public Result<SysDict> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
Result<SysDict> result = new Result<SysDict>();
if(oConvertUtils.isEmpty(ids)) {
result.error500("参数不识别！");
}else {
sysDictService.removeByIds(Arrays.asList(ids.split(",")));
result.success("删除成功!");
}
return result;
}
/**
* @功能：刷新缓存
* @return
*/
@RequestMapping(value = "/refleshCache")
public Result<?> refleshCache() {
Result<?> result = new Result<SysDict>();
//清空字典缓存
// Set keys = redisTemplate.keys(CacheConstant.SYS_DICT_CACHE + "*");
// Set keys7 = redisTemplate.keys(CacheConstant.SYS_ENABLE_DICT_CACHE + "*");
// Set keys2 = redisTemplate.keys(CacheConstant.SYS_DICT_TABLE_CACHE + "*");
// Set keys21 = redisTemplate.keys(CacheConstant.SYS_DICT_TABLE_BY_KEYS_CACHE + "*");
// Set keys3 = redisTemplate.keys(CacheConstant.SYS_DEPARTS_CACHE + "*");
// Set keys4 = redisTemplate.keys(CacheConstant.SYS_DEPART_IDS_CACHE + "*");
// Set keys5 = redisTemplate.keys( "jmreport:cache:dict*");
// Set keys6 = redisTemplate.keys( "jmreport:cache:dictTable*");
// redisTemplate.delete(keys);
// redisTemplate.delete(keys2);
// redisTemplate.delete(keys21);
// redisTemplate.delete(keys3);
// redisTemplate.delete(keys4);
// redisTemplate.delete(keys5);
// redisTemplate.delete(keys6);
// redisTemplate.delete(keys7);
//update-begin-author:liusq date:20230404 for: [issue/4358]springCache中的清除缓存的操作使用了“keys”
redisUtil.removeAll(CacheConstant.SYS_DICT_CACHE);
redisUtil.removeAll(CacheConstant.SYS_ENABLE_DICT_CACHE);
redisUtil.removeAll(CacheConstant.SYS_DICT_TABLE_CACHE);
redisUtil.removeAll(CacheConstant.SYS_DICT_TABLE_BY_KEYS_CACHE);
redisUtil.removeAll(CacheConstant.SYS_DEPARTS_CACHE);
redisUtil.removeAll(CacheConstant.SYS_DEPART_IDS_CACHE);
redisUtil.removeAll("jmreport:cache:dict");
redisUtil.removeAll("jmreport:cache:dictTable");
//update-end-author:liusq date:20230404 for: [issue/4358]springCache中的清除缓存的操作使用了“keys”
//update-begin---author:scott ---date:2024-06-18 for：【TV360X-1320】分配权限必须退出重新登录才生效，造成很多用户困扰---
// 清除当前用户的授权缓存信息
Subject currentUser = SecurityUtils.getSubject();
if (currentUser.isAuthenticated()) {
shiroRealm.clearCache(currentUser.getPrincipals());
}
//update-end---author:scott ---date::2024-06-18 for：【TV360X-1320】分配权限必须退出重新登录才生效，造成很多用户困扰---
return result;
}
/**
* 导出excel
*
* @param request
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(SysDict sysDict,HttpServletRequest request) {
sysDict.setTag("nu");
//------------------------------------------------------------------------------------------------
//是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】
if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL){
sysDict.setTenantId(oConvertUtils.getInt(TenantContext.getTenant(), 0));
}
//------------------------------------------------------------------------------------------------
// Step.1 组装查询条件
QueryWrapper<SysDict> queryWrapper = QueryGenerator.initQueryWrapper(sysDict, request.getParameterMap());
//Step.2 AutoPoi 导出Excel
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
String selections = request.getParameter("selections");
if(!oConvertUtils.isEmpty(selections)){
queryWrapper.in("id",selections.split(","));
}
List<SysDictPage> pageList = new ArrayList<SysDictPage>();
List<SysDict> sysDictList = sysDictService.list(queryWrapper);
for (SysDict dictMain : sysDictList) {
SysDictPage vo = new SysDictPage();
BeanUtils.copyProperties(dictMain, vo);
// 查询机票
List<SysDictItem> sysDictItemList = sysDictItemService.selectItemsByMainId(dictMain.getId());
vo.setSysDictItemList(sysDictItemList);
pageList.add(vo);
}
// 导出文件名称
mv.addObject(NormalExcelConstants.FILE_NAME, "数据字典");
// 注解对象Class
mv.addObject(NormalExcelConstants.CLASS, SysDictPage.class);
// 自定义表格参数
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("数据字典列表", "导出人:"+user.getRealname(), "数据字典"));
// 导出数据列表
mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
return mv;
}
/**
* 通过excel导入数据
*
* @param request
* @param
* @return
*/
@RequiresPermissions("nu:dict:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
// 获取上传文件对象
MultipartFile file = entity.getValue();
ImportParams params = new ImportParams();
params.setTitleRows(2);
params.setHeadRows(2);
params.setNeedSave(true);
try {
//导入Excel格式校验，看匹配的字段文本概率
Boolean t = ExcelImportCheckUtil.check(file.getInputStream(), SysDictPage.class, params);
if(t!=null && !t){
throw new RuntimeException("导入Excel校验失败 ！");
}
List<SysDictPage> list = ExcelImportUtil.importExcel(file.getInputStream(), SysDictPage.class, params);
// 错误信息
List<String> errorMessage = new ArrayList<>();
int successLines = 0, errorLines = 0;
for (int i=0;i< list.size();i++) {
SysDict po = new SysDict();
BeanUtils.copyProperties(list.get(i), po);
po.setTag("nu");
po.setDelFlag(CommonConstant.DEL_FLAG_0);
try {
Integer integer = sysDictService.saveMain(po, list.get(i).getSysDictItemList());
if(integer>0){
successLines++;
//update-begin---author:wangshuai ---date:20220211 for：[JTC-1168]如果字典项值为空，则字典项忽略导入------------
}else if(integer == -1){
errorLines++;
errorMessage.add("字典名称：" + po.getDictName() + "，对应字典列表的字典项值不能为空，忽略导入。");
}else{
//update-end---author:wangshuai ---date:20220211 for：[JTC-1168]如果字典项值为空，则字典项忽略导入------------
errorLines++;
int lineNumber = i + 1;
//update-begin---author:wangshuai ---date:20220209 for：[JTC-1168]字典编号不能为空------------
if(oConvertUtils.isEmpty(po.getDictCode())){
errorMessage.add("第 " + lineNumber + " 行：字典编码不能为空，忽略导入。");
}else{
errorMessage.add("第 " + lineNumber + " 行：字典编码已经存在，忽略导入。");
}
//update-end---author:wangshuai ---date:20220209 for：[JTC-1168]字典编号不能为空------------
}
} catch (Exception e) {
errorLines++;
int lineNumber = i + 1;
errorMessage.add("第 " + lineNumber + " 行：字典编码已经存在，忽略导入。");
}
}
return ImportExcelUtil.imporReturnRes(errorLines,successLines,errorMessage);
} catch (Exception e) {
log.error(e.getMessage(),e);
return Result.error("文件导入失败:"+e.getMessage());
} finally {
try {
file.getInputStream().close();
} catch (Exception e) {
e.printStackTrace();
}
}
}
return Result.error("文件导入失败！");
}
/**
* 查询被删除的列表
* @return
*/
@RequestMapping(value = "/deleteList", method = RequestMethod.GET)
public Result<List<SysDict>> deleteList(HttpServletRequest request) {
Result<List<SysDict>> result = new Result<List<SysDict>>();
String tenantId = TokenUtils.getTenantIdByRequest(request);
List<SysDict> list = this.sysDictService.queryDeleteList(tenantId,"nu");
result.setSuccess(true);
result.setResult(list);
return result;
}
/**
* 物理删除
* @param id
* @return
*/
@RequestMapping(value = "/deletePhysic/{id}", method = RequestMethod.DELETE)
public Result<?> deletePhysic(@PathVariable("id") String id) {
try {
sysDictService.deleteOneDictPhysically(id);
return Result.ok("删除成功!");
} catch (Exception e) {
e.printStackTrace();
return Result.error("删除失败!");
}
}
/**
* 逻辑删除的字段，进行取回
* @param id
* @return
*/
@RequestMapping(value = "/back/{id}", method = RequestMethod.PUT)
public Result<?> back(@PathVariable("id") String id) {
try {
sysDictService.updateDictDelFlag(0,id);
return Result.ok("操作成功!");
} catch (Exception e) {
e.printStackTrace();
return Result.error("操作失败!");
}
}
/**
* 还原被逻辑删除的用户
*
* @param jsonObject
* @return
*/
@RequestMapping(value = "/putRecycleBin", method = RequestMethod.PUT)
public Result putRecycleBin(@RequestBody JSONObject jsonObject, HttpServletRequest request) {
try {
String ids = jsonObject.getString("ids");
if (StringUtils.isNotBlank(ids)) {
sysDictService.revertLogicDeleted(Arrays.asList(ids.split(",")));
return Result.ok("操作成功!");
}
} catch (Exception e) {
e.printStackTrace();
return Result.error("操作失败!");
}
return Result.ok("还原成功");
}
/**
* 彻底删除字典
*
* @param ids 被删除的字典ID，多个id用半角逗号分割
* @return
*/
@RequiresPermissions("nu:dict:deleteRecycleBin")
@RequestMapping(value = "/deleteRecycleBin", method = RequestMethod.DELETE)
public Result deleteRecycleBin(@RequestParam("ids") String ids) {
try {
if (StringUtils.isNotBlank(ids)) {
sysDictService.removeLogicDeleted(Arrays.asList(ids.split(",")));
}
return Result.ok("删除成功!");
} catch (Exception e) {
e.printStackTrace();
return Result.error("删除失败!");
}
}
/**
* VUEN-2584【issue】平台sql注入漏洞几个问题
* 部分特殊函数 可以将查询结果混夹在错误信息中，导致数据库的信息暴露
* @param e
* @return
*/
@ExceptionHandler(java.sql.SQLException.class)
public Result<?> handleSQLException(Exception e){
String msg = e.getMessage();
String extractvalue = "extractvalue";
String updatexml = "updatexml";
if(msg!=null && (msg.toLowerCase().indexOf(extractvalue)>=0 || msg.toLowerCase().indexOf(updatexml)>=0)){
return Result.error("校验失败，sql解析异常！");
}
return Result.error("校验失败，sql解析异常！" + msg);
}
/**
* 根据应用id获取字典列表和详情
* @param request
*/
@GetMapping("/getDictListByLowAppId")
public Result<List<SysDictVo>> getDictListByLowAppId(HttpServletRequest request){
String lowAppId = oConvertUtils.getString(TokenUtils.getLowAppIdByRequest(request));
List<SysDictVo> list = sysDictService.getDictListByLowAppId(lowAppId);
return Result.ok(list);
}
/**
* 添加字典
* @param sysDictVo
* @param request
* @return
*/
@PostMapping("/addDictByLowAppId")
public Result<String> addDictByLowAppId(@RequestBody SysDictVo sysDictVo,HttpServletRequest request){
String lowAppId = oConvertUtils.getString(TokenUtils.getLowAppIdByRequest(request));
String tenantId = oConvertUtils.getString(TokenUtils.getTenantIdByRequest(request));
sysDictVo.setLowAppId(lowAppId);
sysDictVo.setTenantId(oConvertUtils.getInteger(tenantId, null));
sysDictService.addDictByLowAppId(sysDictVo);
return Result.ok("添加成功");
}
@PutMapping("/editDictByLowAppId")
public Result<String> editDictByLowAppId(@RequestBody SysDictVo sysDictVo,HttpServletRequest request){
String lowAppId = oConvertUtils.getString(TokenUtils.getLowAppIdByRequest(request));
sysDictVo.setLowAppId(lowAppId);
sysDictService.editDictByLowAppId(sysDictVo);
return Result.ok("编辑成功");
}
}

177
nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/NuDictItemController.java Normal file
View File

@ -0,0 +1,177 @@
package org.jeecg.modules.system.controller;
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 io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CacheConstant;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.system.entity.SysDictItem;
import org.jeecg.modules.system.service.ISysDictItemService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.Arrays;
import java.util.Date;
/**
* <p>
* 前端控制器
* </p>
*
* @Author zhangweijian
* @since 2018-12-28
*/
@Api(tags = "数据字典")
@RestController
@RequestMapping("/nu/dictItem")
@Slf4j
public class NuDictItemController {
@Autowired
private ISysDictItemService sysDictItemService;
/**
* @功能：查询字典数据
* @param sysDictItem
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@RequestMapping(value = "/list", method = RequestMethod.GET)
public Result<IPage<SysDictItem>> queryPageList(SysDictItem sysDictItem, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) {
Result<IPage<SysDictItem>> result = new Result<IPage<SysDictItem>>();
QueryWrapper<SysDictItem> queryWrapper = QueryGenerator.initQueryWrapper(sysDictItem, req.getParameterMap());
queryWrapper.orderByAsc("sort_order");
Page<SysDictItem> page = new Page<SysDictItem>(pageNo, pageSize);
IPage<SysDictItem> pageList = sysDictItemService.page(page, queryWrapper);
result.setSuccess(true);
result.setResult(pageList);
return result;
}
/**
* @功能：新增
* @return
*/
@RequiresPermissions("nu:dict:item:add")
@RequestMapping(value = "/add", method = RequestMethod.POST)
@CacheEvict(value= {CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true)
public Result<SysDictItem> add(@RequestBody SysDictItem sysDictItem) {
Result<SysDictItem> result = new Result<SysDictItem>();
try {
sysDictItem.setCreateTime(new Date());
sysDictItemService.save(sysDictItem);
result.success("保存成功！");
} catch (Exception e) {
log.error(e.getMessage(),e);
result.error500("操作失败");
}
return result;
}
/**
* @功能：编辑
* @param sysDictItem
* @return
*/
@RequiresPermissions("nu:dict:item:edit")
@RequestMapping(value = "/edit", method = { RequestMethod.PUT,RequestMethod.POST })
@CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true)
public Result<SysDictItem> edit(@RequestBody SysDictItem sysDictItem) {
Result<SysDictItem> result = new Result<SysDictItem>();
SysDictItem sysdict = sysDictItemService.getById(sysDictItem.getId());
if(sysdict==null) {
result.error500("未找到对应实体");
}else {
sysDictItem.setUpdateTime(new Date());
boolean ok = sysDictItemService.updateById(sysDictItem);
//TODO 返回false说明什么？
if(ok) {
result.success("编辑成功!");
}
}
return result;
}
/**
* @功能：删除字典数据
* @param id
* @return
*/
@RequiresPermissions("nu:dict:item:delete")
@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
@CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true)
public Result<SysDictItem> delete(@RequestParam(name="id",required=true) String id) {
Result<SysDictItem> result = new Result<SysDictItem>();
SysDictItem joinSystem = sysDictItemService.getById(id);
if(joinSystem==null) {
result.error500("未找到对应实体");
}else {
boolean ok = sysDictItemService.removeById(id);
if(ok) {
result.success("删除成功!");
}
}
return result;
}
/**
* @功能：批量删除字典数据
* @param ids
* @return
*/
@RequiresPermissions("nu:dict:item:deleteBatch")
@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
@CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true)
public Result<SysDictItem> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
Result<SysDictItem> result = new Result<SysDictItem>();
if(ids==null || "".equals(ids.trim())) {
result.error500("参数不识别！");
}else {
this.sysDictItemService.removeByIds(Arrays.asList(ids.split(",")));
result.success("删除成功!");
}
return result;
}
/**
* 字典值重复校验
* @param sysDictItem
* @param request
* @return
*/
@RequestMapping(value = "/dictItemCheck", method = RequestMethod.GET)
@ApiOperation("字典重复校验接口")
public Result<Object> doDictItemCheck(SysDictItem sysDictItem, HttpServletRequest request) {
Long num = Long.valueOf(0);
LambdaQueryWrapper<SysDictItem> queryWrapper = new LambdaQueryWrapper<SysDictItem>();
queryWrapper.eq(SysDictItem::getItemValue,sysDictItem.getItemValue());
queryWrapper.eq(SysDictItem::getDictId,sysDictItem.getDictId());
if (StringUtils.isNotBlank(sysDictItem.getId())) {
// 编辑页面校验
queryWrapper.ne(SysDictItem::getId,sysDictItem.getId());
}
num = sysDictItemService.count(queryWrapper);
if (num == 0) {
// 该值可用
return Result.ok("该值可用！");
} else {
// 该值不可用
log.info("该值不可用，系统中已存在！");
return Result.error("该值不可用，系统中已存在！");
}
}
}

6
nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDictController.java
View File

@ -93,6 +93,7 @@ public class SysDictController {
} }
//------------------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------------------
QueryWrapper<SysDict> queryWrapper = QueryGenerator.initQueryWrapper(sysDict, req.getParameterMap()); QueryWrapper<SysDict> queryWrapper = QueryGenerator.initQueryWrapper(sysDict, req.getParameterMap());
queryWrapper.eq("tag","sys");
// 查询关键字，模糊筛选code和name // 查询关键字，模糊筛选code和name
if (oConvertUtils.isNotEmpty(keywords)) { if (oConvertUtils.isNotEmpty(keywords)) {
queryWrapper.and(i -> i.like("dict_code", keywords).or().like("dict_name", keywords)); queryWrapper.and(i -> i.like("dict_code", keywords).or().like("dict_name", keywords));
@ -392,6 +393,7 @@ public class SysDictController {
@RequiresPermissions("system:dict:add") @RequiresPermissions("system:dict:add")
@RequestMapping(value = "/add", method = RequestMethod.POST) @RequestMapping(value = "/add", method = RequestMethod.POST)
public Result<SysDict> add(@RequestBody SysDict sysDict) { public Result<SysDict> add(@RequestBody SysDict sysDict) {
sysDict.setTag("sys");
Result<SysDict> result = new Result<SysDict>(); Result<SysDict> result = new Result<SysDict>();
try { try {
sysDict.setCreateTime(new Date()); sysDict.setCreateTime(new Date());
@ -518,6 +520,7 @@ public class SysDictController {
*/ */
@RequestMapping(value = "/exportXls") @RequestMapping(value = "/exportXls")
public ModelAndView exportXls(SysDict sysDict,HttpServletRequest request) { public ModelAndView exportXls(SysDict sysDict,HttpServletRequest request) {
sysDict.setTag("sys");
//------------------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------------------
//是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】 //是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】
if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL){ if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL){
@ -589,6 +592,7 @@ public class SysDictController {
for (int i=0;i< list.size();i++) { for (int i=0;i< list.size();i++) {
SysDict po = new SysDict(); SysDict po = new SysDict();
BeanUtils.copyProperties(list.get(i), po); BeanUtils.copyProperties(list.get(i), po);
po.setTag("sys");
po.setDelFlag(CommonConstant.DEL_FLAG_0); po.setDelFlag(CommonConstant.DEL_FLAG_0);
try { try {
Integer integer = sysDictService.saveMain(po, list.get(i).getSysDictItemList()); Integer integer = sysDictService.saveMain(po, list.get(i).getSysDictItemList());
@ -640,7 +644,7 @@ public class SysDictController {
public Result<List<SysDict>> deleteList(HttpServletRequest request) { public Result<List<SysDict>> deleteList(HttpServletRequest request) {
Result<List<SysDict>> result = new Result<List<SysDict>>(); Result<List<SysDict>> result = new Result<List<SysDict>>();
String tenantId = TokenUtils.getTenantIdByRequest(request); String tenantId = TokenUtils.getTenantIdByRequest(request);
List<SysDict> list = this.sysDictService.queryDeleteList(tenantId); List<SysDict> list = this.sysDictService.queryDeleteList(tenantId,"sys");
result.setSuccess(true); result.setSuccess(true);
result.setResult(list); result.setResult(list);
return result; return result;

7
nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDict.java
View File

@ -55,6 +55,13 @@ public class SysDict implements Serializable {
*/ */
private String description; private String description;
/**
* 标识
* sys：系统字典，非客户使用字典
* nu：业务字典，客户使用字典
*/
private String tag;
/** /**
* 删除状态 * 删除状态
*/ */

8
nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDictMapper.java
View File

@ -127,8 +127,8 @@ public interface SysDictMapper extends BaseMapper<SysDict> {
* 查询被逻辑删除的数据 * 查询被逻辑删除的数据
* @return * @return
*/ */
@Select("select * from sys_dict where del_flag = 1") @Select("select * from sys_dict where del_flag = 1 and tag = #{tag}")
public List<SysDict> queryDeleteList(); public List<SysDict> queryDeleteList(@Param("tag") String tag);
/** /**
* 修改状态值 * 修改状态值
@ -198,8 +198,8 @@ public interface SysDictMapper extends BaseMapper<SysDict> {
* 查询被逻辑删除的数据（根据租户id） * 查询被逻辑删除的数据（根据租户id）
* @return * @return
*/ */
@Select("select * from sys_dict where del_flag = 1 and tenant_id = #{tenantId}") @Select("select * from sys_dict where del_flag = 1 and tenant_id = #{tenantId} and tag = #{tag}}")
List<SysDict> queryDeleteListBtTenantId(@Param("tenantId") Integer tenantId); List<SysDict> queryDeleteListBtTenantId(@Param("tenantId") Integer tenantId,@Param("tag") String tag);
/** /**
* 还原被逻辑删除的数据（根据id） * 还原被逻辑删除的数据（根据id）

2
nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDictService.java
View File

@ -238,7 +238,7 @@ public interface ISysDictService extends IService<SysDict> {
* 查询被逻辑删除的数据 * 查询被逻辑删除的数据
* @return * @return
*/ */
public List<SysDict> queryDeleteList(String tenantId); public List<SysDict> queryDeleteList(String tenantId,String tag);
/** /**
* 分页查询 * 分页查询

6
nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java
View File

@ -701,16 +701,16 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
} }
@Override @Override
public List<SysDict> queryDeleteList(String tenantId) { public List<SysDict> queryDeleteList(String tenantId,String tag) {
//update-begin---author:wangshuai---date:2024-02-27---for:【QQYUN-8340】回收站查找软删除记录时，没有判断是否启用多租户，造成可以查找并回收其他租户的数据 #5907--- //update-begin---author:wangshuai---date:2024-02-27---for:【QQYUN-8340】回收站查找软删除记录时，没有判断是否启用多租户，造成可以查找并回收其他租户的数据 #5907---
if (MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL) { if (MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL) {
if (oConvertUtils.isEmpty(tenantId)) { if (oConvertUtils.isEmpty(tenantId)) {
return new ArrayList<>(); return new ArrayList<>();
} }
return baseMapper.queryDeleteListBtTenantId(oConvertUtils.getInt(tenantId)); return baseMapper.queryDeleteListBtTenantId(oConvertUtils.getInt(tenantId),tag);
} }
//update-end---author:wangshuai---date:2024-02-27---for:【QQYUN-8340】回收站查找软删除记录时，没有判断是否启用多租户，造成可以查找并回收其他租户的数据 #5907--- //update-end---author:wangshuai---date:2024-02-27---for:【QQYUN-8340】回收站查找软删除记录时，没有判断是否启用多租户，造成可以查找并回收其他租户的数据 #5907---
return baseMapper.queryDeleteList(); return baseMapper.queryDeleteList(tag);
} }
@Override @Override