From b48eada37d54f64cc706e588cee6b4df10db9b56 Mon Sep 17 00:00:00 2001 From: zer0Black <694429613@qq.com> Date: Fri, 29 Sep 2023 16:08:01 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=88=A0=E9=99=A4=E3=80=91=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E4=BA=86=E5=8A=9F=E8=83=BD=E6=A8=A1=E5=9D=97=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HomeFunctionModuleEOController.java | 172 ------------------ .../home/entity/HomeFunctionModuleEO.java | 91 --------- .../mapper/HomeFunctionModuleEOMapper.java | 14 -- .../mapper/xml/HomeFunctionModuleEOMapper.xml | 18 -- .../service/IHomeFunctionModuleEOService.java | 63 ------- .../impl/HomeFunctionModuleEOServiceImpl.java | 170 ----------------- 6 files changed, 528 deletions(-) delete mode 100644 laws-modules/src/main/java/com/jero/modules/home/controller/HomeFunctionModuleEOController.java delete mode 100644 laws-modules/src/main/java/com/jero/modules/home/entity/HomeFunctionModuleEO.java delete mode 100644 laws-modules/src/main/java/com/jero/modules/home/mapper/HomeFunctionModuleEOMapper.java delete mode 100644 laws-modules/src/main/java/com/jero/modules/home/mapper/xml/HomeFunctionModuleEOMapper.xml delete mode 100644 laws-modules/src/main/java/com/jero/modules/home/service/IHomeFunctionModuleEOService.java delete mode 100644 laws-modules/src/main/java/com/jero/modules/home/service/impl/HomeFunctionModuleEOServiceImpl.java diff --git a/laws-modules/src/main/java/com/jero/modules/home/controller/HomeFunctionModuleEOController.java b/laws-modules/src/main/java/com/jero/modules/home/controller/HomeFunctionModuleEOController.java deleted file mode 100644 index 67bb389f..00000000 --- a/laws-modules/src/main/java/com/jero/modules/home/controller/HomeFunctionModuleEOController.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.jero.modules.home.controller; - -import com.alibaba.fastjson.JSONObject; -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.system.base.controller.JeroController; -import com.jero.common.system.query.QueryGenerator; -import com.jero.modules.home.entity.HomeFunctionModuleEO; -import com.jero.modules.home.service.IHomeFunctionModuleEOService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -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; -import java.util.List; - - - /** - * @Description: 功能模块 - * @Author: jero-boot - * @Date: 2022-05-24 - * @Version: V1.0 - */ -@Api(tags="功能模块") -@RestController -@RequestMapping("/home/homeFunctionModuleEO") -@Slf4j -public class HomeFunctionModuleEOController extends JeroController { - @Autowired - private IHomeFunctionModuleEOService homeFunctionModuleEOService; - - /** - * 分页列表查询 - * - * @param homeFunctionModuleEO - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "功能模块-分页列表查询") - @ApiOperation(value="功能模块-分页列表查询", notes="功能模块-分页列表查询") - @GetMapping(value = "/page") - public Result queryPageList(HomeFunctionModuleEO homeFunctionModuleEO, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(homeFunctionModuleEO, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = homeFunctionModuleEOService.page(page, queryWrapper); - return Result.OK(pageList); - } - - /** - * 列表查询 - * - * @return - */ - @AutoLog(value = "功能模块-列表查询") - @ApiOperation(value="功能模块-列表查询", notes="功能模块-列表查询") - @GetMapping(value = "/list") - public Result> queryList(String cut) { - List list = homeFunctionModuleEOService.queryList(cut); - return Result.OK(list); - } - - /** - * 添加 - * state = 1为选中的图表,state = 2为未选择的图表 - * @param listMap - * @return - */ - @AutoLog(value = "功能模块-添加") - @ApiOperation(value="功能模块-添加", notes="功能模块-添加") - @PostMapping(value = "/add") - public Result add(@RequestBody JSONObject listMap) { - homeFunctionModuleEOService.add(listMap); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param homeFunctionModuleEO - * @return - */ - @AutoLog(value = "功能模块-编辑") - @ApiOperation(value="功能模块-编辑", notes="功能模块-编辑") - @PostMapping(value = "/edit") - public Result edit(@Validated @RequestBody HomeFunctionModuleEO homeFunctionModuleEO) { - homeFunctionModuleEOService.editById(homeFunctionModuleEO); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "功能模块-通过id删除") - @ApiOperation(value="功能模块-通过id删除", notes="功能模块-通过id删除") - @PostMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - homeFunctionModuleEOService.deleteById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "功能模块-批量删除") - @ApiOperation(value="功能模块-批量删除", notes="功能模块-批量删除") - @PostMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.homeFunctionModuleEOService.deleteByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @AutoLog(value = "功能模块-通过id查询") - @ApiOperation(value="功能模块-通过id查询", notes="功能模块-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - HomeFunctionModuleEO homeFunctionModuleEO = homeFunctionModuleEOService.queryById(id); - if(homeFunctionModuleEO==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(homeFunctionModuleEO); - } - - /** - * 导出excel - * - * @param request - * @param homeFunctionModuleEO - */ - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, HomeFunctionModuleEO homeFunctionModuleEO) { - return super.exportXls(request, homeFunctionModuleEO, HomeFunctionModuleEO.class, "功能模块"); - } - - /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, HomeFunctionModuleEO.class); - } - -} diff --git a/laws-modules/src/main/java/com/jero/modules/home/entity/HomeFunctionModuleEO.java b/laws-modules/src/main/java/com/jero/modules/home/entity/HomeFunctionModuleEO.java deleted file mode 100644 index 5405a8c2..00000000 --- a/laws-modules/src/main/java/com/jero/modules/home/entity/HomeFunctionModuleEO.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.jero.modules.home.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.jeecgframework.poi.excel.annotation.Excel; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; - - -/** - * @Description: 功能模块 - * @Author: jero-boot - * @Date: 2022-05-24 - * @Version: V1.0 - */ -@Data -@TableName("home_function_module") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="home_function_module对象", description="功能模块") -public class HomeFunctionModuleEO implements Serializable { - private static final long serialVersionUID = 1L; - - /**主键*/ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键") - private String id; - - /**创建人*/ - @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 java.util.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 java.util.Date updateTime; - - /**所属部门*/ - @ApiModelProperty(value = "所属部门") - private String sysOrgCode; - - /**图标名称*/ - @Excel(name = "图标名称", width = 15) - @ApiModelProperty(value = "图标名称") - private String iconName; - - /**图标英文名称*/ - @Excel(name = "图标英文名称", width = 15) - @ApiModelProperty(value = "图标英文名称") - private String iconNameEn; - - /**图标路径*/ - @Excel(name = "图标路径", width = 15) - @ApiModelProperty(value = "图标路径") - private String iconPath; - - /**路由*/ - @Excel(name = "路由", width = 15) - @ApiModelProperty(value = "路由") - private String url; - - /**标识*/ - @Excel(name = "标识", width = 15) - @ApiModelProperty(value = "标识") - private String state; - - /**排序*/ - @Excel(name = "排序", width = 15) - @ApiModelProperty(value = "排序") - private Integer sort; - -} diff --git a/laws-modules/src/main/java/com/jero/modules/home/mapper/HomeFunctionModuleEOMapper.java b/laws-modules/src/main/java/com/jero/modules/home/mapper/HomeFunctionModuleEOMapper.java deleted file mode 100644 index 13e5a79b..00000000 --- a/laws-modules/src/main/java/com/jero/modules/home/mapper/HomeFunctionModuleEOMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.jero.modules.home.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jero.modules.home.entity.HomeFunctionModuleEO; - -/** - * @Description: 功能模块 - * @Author: jero-boot - * @Date: 2022-05-24 - * @Version: V1.0 - */ -public interface HomeFunctionModuleEOMapper extends BaseMapper { - -} diff --git a/laws-modules/src/main/java/com/jero/modules/home/mapper/xml/HomeFunctionModuleEOMapper.xml b/laws-modules/src/main/java/com/jero/modules/home/mapper/xml/HomeFunctionModuleEOMapper.xml deleted file mode 100644 index 8a1baf3f..00000000 --- a/laws-modules/src/main/java/com/jero/modules/home/mapper/xml/HomeFunctionModuleEOMapper.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/laws-modules/src/main/java/com/jero/modules/home/service/IHomeFunctionModuleEOService.java b/laws-modules/src/main/java/com/jero/modules/home/service/IHomeFunctionModuleEOService.java deleted file mode 100644 index 7b4fbc67..00000000 --- a/laws-modules/src/main/java/com/jero/modules/home/service/IHomeFunctionModuleEOService.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.jero.modules.home.service; - -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.modules.home.entity.HomeFunctionModuleEO; - -import java.util.List; - -/** - * @Description: 功能模块 - * @Author: jero-boot - * @Date: 2022-05-24 - * @Version: V1.0 - */ -public interface IHomeFunctionModuleEOService extends IService { - - /** - * 保存 - * - * @param listMap - * @return - */ - void add(JSONObject listMap); - - /** - * 更新 - * - * @param homeFunctionModuleEO - * @return - */ - void editById(HomeFunctionModuleEO homeFunctionModuleEO); - - /** - * 通过id删除 - * - * @param id - * @return - */ - void deleteById(String id); - - /** - * 批量删除 - * - * @param ids - * @return - */ - void deleteByIds(List ids); - - /** - * 通过id查询 - * - * @param id - * @return - */ - HomeFunctionModuleEO queryById(String id); - - /** - * 列表查询 - * - * @return - */ - List queryList(String cut); -} diff --git a/laws-modules/src/main/java/com/jero/modules/home/service/impl/HomeFunctionModuleEOServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/home/service/impl/HomeFunctionModuleEOServiceImpl.java deleted file mode 100644 index 93244f7a..00000000 --- a/laws-modules/src/main/java/com/jero/modules/home/service/impl/HomeFunctionModuleEOServiceImpl.java +++ /dev/null @@ -1,170 +0,0 @@ -package com.jero.modules.home.service.impl; - -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.constant.enums.LanguageEnum; -import com.jero.common.system.vo.LoginUser; -import com.jero.modules.home.entity.HomeFunctionModuleEO; -import com.jero.modules.home.mapper.HomeFunctionModuleEOMapper; -import com.jero.modules.home.service.IHomeFunctionModuleEOService; -import com.jero.modules.system.entity.SysPermission; -import com.jero.modules.system.service.ISysPermissionService; -import org.apache.commons.lang3.ObjectUtils; -import org.apache.shiro.SecurityUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.*; -import java.util.stream.Collectors; - -/** - * @Description: 功能模块 - * @Author: jero-boot - * @Date: 2022-05-24 - * @Version: V1.0 - */ -@Service -public class HomeFunctionModuleEOServiceImpl extends ServiceImpl implements IHomeFunctionModuleEOService { - - @Autowired - private ISysPermissionService sysPermissionService; - - /** - * 保存 - * - * @param listMap - * @return - */ - @Override - public void add(JSONObject listMap) { - List> mapList = (List>) listMap.get("listMap"); - List homeFunctionModuleEOS = JSONObject.parseArray(JSON.toJSONString(mapList), HomeFunctionModuleEO.class); - LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - //先删除在添加 - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.in(HomeFunctionModuleEO::getCreateBy,loginUser.getUsername()); - this.remove(wrapper); - for (HomeFunctionModuleEO homeFunctionModuleEO : homeFunctionModuleEOS) { - homeFunctionModuleEO.setId(UUID.randomUUID().toString().replace("-", "")); - } - this.saveBatch(homeFunctionModuleEOS); - } - - /** - * 更新 - * - * @param homeFunctionModuleEO - * @return - */ - @Override - public void editById(HomeFunctionModuleEO homeFunctionModuleEO) { - Date now = new Date(); - homeFunctionModuleEO.setUpdateTime(now); - saveOrUpdate(homeFunctionModuleEO); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @Override - public void deleteById(String id) { - removeById(id); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @Override - public void deleteByIds(List ids) { - removeByIds(ids); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @Override - public HomeFunctionModuleEO queryById(String id) { - return getById(id); - } - - /** - * 列表查询 - * - * @return - */ - @Override - public List queryList(String cut) { - LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - - //用户拥有权限的菜单 - List metaList = sysPermissionService.queryByUser(loginUser.getUsername()); - - metaList = metaList.stream().filter(e->!"2".equals(String.valueOf(e.getMenuType()))).collect(Collectors.toList()); - //所有的图表(state=0) - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.in(HomeFunctionModuleEO::getState,"0").isNull(HomeFunctionModuleEO::getCreateBy); - List homeFunctionModuleEOList = this.list(wrapper); - List homeFunctionModuleEOListTemp = new ArrayList<>(); - - if(ObjectUtils.isNotEmpty(homeFunctionModuleEOList)){ - for (SysPermission sysPermission : metaList) { - List collect = homeFunctionModuleEOList.stream().filter(e -> e.getIconName().equals(sysPermission.getName())).collect(Collectors.toList()); - if(ObjectUtils.isNotEmpty(collect)){ - homeFunctionModuleEOListTemp.addAll(collect); - } - } - } - homeFunctionModuleEOListTemp = homeFunctionModuleEOListTemp.stream().distinct().collect(Collectors.toList()); - //当前用户配置的图表 - LambdaQueryWrapper wrapperTemp = new LambdaQueryWrapper<>(); - wrapperTemp.in(HomeFunctionModuleEO::getCreateBy,loginUser.getUsername()).orderByAsc(HomeFunctionModuleEO::getState).orderByAsc(HomeFunctionModuleEO::getSort); - List homeFunctionModuleEOS = this.list(wrapperTemp); - if(homeFunctionModuleEOS.size() == 0){ - if(LanguageEnum.EN.getValue().equals(cut)){ - for (HomeFunctionModuleEO homeFunctionModuleEO : homeFunctionModuleEOListTemp) { - homeFunctionModuleEO.setIconName(homeFunctionModuleEO.getIconNameEn()); - } - } - return homeFunctionModuleEOListTemp; - }else{ - List homeFunctionModuleEOSTemp = new ArrayList<>(); - //第一次配置后, 重新添加权限的图标 - for (HomeFunctionModuleEO homeFunctionModuleEO : homeFunctionModuleEOList) { - List collect = metaList.stream().filter(e -> homeFunctionModuleEO.getIconName().equals(e.getName())).collect(Collectors.toList()); - if(ObjectUtils.isNotEmpty(collect)){ - List iconNameList = homeFunctionModuleEOS.stream().map(HomeFunctionModuleEO::getIconName).collect(Collectors.toList()); - //有权限但是配有配置的图标 - if(!iconNameList.contains(homeFunctionModuleEO.getIconName())){ - homeFunctionModuleEOSTemp.add(homeFunctionModuleEO); - } - } - } - - //有权限且第一次配置的图标(每个用户会将配置的和没有配置的数据存一套) - for (SysPermission sysPermission : metaList) { - List collect = homeFunctionModuleEOS.stream().filter(e -> e.getIconName().equals(sysPermission.getName())).collect(Collectors.toList()); - if(ObjectUtils.isNotEmpty(collect)){ - homeFunctionModuleEOSTemp.addAll(collect); - } - } - homeFunctionModuleEOSTemp = homeFunctionModuleEOSTemp.stream().distinct().collect(Collectors.toList()); - if(LanguageEnum.EN.getValue().equals(cut)){ - for (HomeFunctionModuleEO homeFunctionModuleEO : homeFunctionModuleEOSTemp) { - homeFunctionModuleEO.setIconName(homeFunctionModuleEO.getIconNameEn()); - } - } - return homeFunctionModuleEOSTemp; - } - } -}