From 335e9c4621b41e46c47493bf9833e9b3fdbbb203 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Wed, 19 Feb 2025 13:38:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=8C=85=E5=95=86=E6=A8=A1=E7=89=88?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=92=8C=E5=BE=85=E5=AE=A1=E6=A0=B8=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../evaluate/beans/SetTemplateBean.java | 2 + .../OutsourcerEvaluateController.java | 1 + .../controller/SetTemplateController.java | 21 +- .../evaluate/evaluate/dao/SetTemplateDao.java | 4 + .../evaluate/service/SetTemplateService.java | 2 + .../service/SetTemplateServiceImpl.java | 8 + .../controller/PermissionController.java | 365 +++++++++++------- .../evaluate/manager/model/Permission.java | 20 + .../resources/download/evaluate_model.ftl | 3 + .../mappers/evaluate/SetTemplateMapper.xml | 11 + .../InitiateEvaluateMapper.xml | 2 +- 11 files changed, 290 insertions(+), 149 deletions(-) diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/SetTemplateBean.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/SetTemplateBean.java index 1672fbd..add10eb 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/SetTemplateBean.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/SetTemplateBean.java @@ -38,4 +38,6 @@ public class SetTemplateBean { private String standard; private String dutyDept; private String isUse; + private Integer isEnable; + private Integer configId; } diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/OutsourcerEvaluateController.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/OutsourcerEvaluateController.java index 979888e..ab4b5d3 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/OutsourcerEvaluateController.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/OutsourcerEvaluateController.java @@ -10,6 +10,7 @@ import com.bonus.gs.sub.evaluate.manager.model.SysUser; import com.bonus.gs.sub.evaluate.manager.utils.AjaxRes; import com.bonus.gs.sub.evaluate.manager.utils.GlobalConst; import com.bonus.gs.sub.evaluate.manager.utils.UserUtil; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/SetTemplateController.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/SetTemplateController.java index 6c6f9cd..680df51 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/SetTemplateController.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/SetTemplateController.java @@ -11,10 +11,7 @@ import com.bonus.gs.sub.evaluate.manager.utils.GlobalConst; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.List; @@ -45,6 +42,22 @@ public class SetTemplateController { return ar; } + @RequestMapping(value = "changeEnable", method = RequestMethod.POST) + @ResponseBody + public AjaxRes changeEnable(SetTemplateBean o){ + AjaxRes ar = new AjaxRes(); + Integer i = service.changeEnable(o); + if (i > 0){ + ar.setRes(GlobalConst.SUCCEED); + ar.setResMsg("启用成功"); + return ar; + }else { + ar.setRes(GlobalConst.FAIL); + ar.setFailMsg("启用失败"); + return ar; + } + } + @RequestMapping("deleteTemplateById") @ResponseBody public AjaxRes deleteTemplateById(String id) { diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/SetTemplateDao.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/SetTemplateDao.java index df51923..75f0a19 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/SetTemplateDao.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/SetTemplateDao.java @@ -63,4 +63,8 @@ public interface SetTemplateDao { * @return */ List getResponsibleDepartmentSelect(SetTemplateBean bean); + + Integer changeEnable(SetTemplateBean o); + + void setTemplatePass(); } diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/SetTemplateService.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/SetTemplateService.java index 78af2c3..6dcadff 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/SetTemplateService.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/SetTemplateService.java @@ -25,4 +25,6 @@ public interface SetTemplateService { * @return */ AjaxRes addTemplate(SetTemplateBean o); + + Integer changeEnable(SetTemplateBean o); } diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/SetTemplateServiceImpl.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/SetTemplateServiceImpl.java index 9535011..7d06909 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/SetTemplateServiceImpl.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/SetTemplateServiceImpl.java @@ -101,6 +101,14 @@ public class SetTemplateServiceImpl implements SetTemplateService { return ar; } + @Override + public Integer changeEnable(SetTemplateBean o) { + // 先全部改为未启用状态 + dao.setTemplatePass(); + // 再把当前模板改成启用 + return dao.changeEnable(o); + } + public static List convertJsonToBeans(String jsonString) { JSONArray jsonArray = JSONArray.parseArray(jsonString); List templateBeans = new ArrayList<>(); diff --git a/src/main/java/com/bonus/gs/sub/evaluate/manager/controller/PermissionController.java b/src/main/java/com/bonus/gs/sub/evaluate/manager/controller/PermissionController.java index 851bd8d..3d505b3 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/manager/controller/PermissionController.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/manager/controller/PermissionController.java @@ -1,16 +1,22 @@ package com.bonus.gs.sub.evaluate.manager.controller; -import java.util.Collections; -import java.util.List; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; +import com.bonus.gs.sub.evaluate.evaluate.beans.OutSourceBean; +import com.bonus.gs.sub.evaluate.evaluate.beans.TeamEvaluateBean; +import com.bonus.gs.sub.evaluate.evaluate.dao.OutsourcerEvaluateDao; +import com.bonus.gs.sub.evaluate.evaluate.service.OutsourcerEvaluateService; +import com.bonus.gs.sub.evaluate.evaluate.service.TeamEvaluateService; import com.bonus.gs.sub.evaluate.manager.annotation.LogAnnotation; import com.bonus.gs.sub.evaluate.manager.dao.PermissionDao; import com.bonus.gs.sub.evaluate.manager.entity.LoginUser; import com.bonus.gs.sub.evaluate.manager.model.Permission; import com.bonus.gs.sub.evaluate.manager.service.PermissionService; +import com.bonus.gs.sub.evaluate.manager.utils.AjaxRes; +import com.bonus.gs.sub.evaluate.manager.utils.GlobalConst; import com.bonus.gs.sub.evaluate.manager.utils.UserUtil; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.util.CollectionUtils; @@ -31,56 +37,127 @@ import com.google.common.collect.Lists; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import javax.annotation.Resource; + /** * 权限相关接口 */ @Api(tags = "权限") @RestController @RequestMapping("/permissions") +@Slf4j public class PermissionController { - @Autowired - private PermissionDao permissionDao; - @Autowired - private PermissionService permissionService; + @Autowired + private PermissionDao permissionDao; + @Autowired + private PermissionService permissionService; + @Resource + private OutsourcerEvaluateService outsourcerEvaluateService; + @Resource + private OutsourcerEvaluateDao outsourcerEvaluateDao; - @ApiOperation(value = "当前登录用户拥有的权限") - @GetMapping("/current") - public List permissionsCurrent() { - LoginUser loginUser = UserUtil.getLoginUser(); - List list = loginUser.getPermissions(); - final List permissions = list.stream().filter(l -> l.getType().equals(1)) - .collect(Collectors.toList()); + @Autowired + private TeamEvaluateService service; + + @ApiOperation(value = "当前登录用户拥有的权限") + @GetMapping("/current") + public List permissionsCurrent() { + LoginUser loginUser = UserUtil.getLoginUser(); + List list = loginUser.getPermissions(); + final List permissions = list.stream().filter(l -> l.getType().equals(1)) + .collect(Collectors.toList()); // setChild(permissions); // // return permissions.stream().filter(p -> p.getParentId().equals(0L)).collect(Collectors.toList()); - // 2018.06.09 支持多级菜单 + // 2018.06.09 支持多级菜单 List firstLevel = permissions.stream().filter(p -> p.getParentId().equals(0L)).collect(Collectors.toList()); firstLevel.parallelStream().forEach(p -> { setChild(p, permissions); }); + List outSourceBeans = checkExamine(new OutSourceBean()); + List teamEvaluateBeans = TeamEvaluateBean(new TeamEvaluateBean()); + for (Permission permission : firstLevel) { + permission.getChild().forEach(c -> { + if (c.getHref().equals("pages/evaluate/outsourceAudit/outsourceAuditList.html")) { + for (OutSourceBean outSourceBean : outSourceBeans) { + if ((Integer.parseInt(outSourceBean.getEvaluateNum())) > 0 && (Integer.parseInt(outSourceBean.getIsApprove())) == 0){ + c.setIsCheckWBS(1); + } + } + } + if (c.getHref().equals("pages/evaluate/team/evaluateCheckList.html")) { + for (TeamEvaluateBean teamEvaluateBean : teamEvaluateBeans) { + if ("5".equals(loginUser.getRoleId()) || + Arrays.asList(loginUser.getRoleId().split(",")).contains("5")) { + if ("1".equals(teamEvaluateBean.getStatus())) { + if ("待审核".equals(teamEvaluateBean.getCheckStatus())) { + c.setIsCheckBZ(1); + } + } + } + if ("6".equals(loginUser.getRoleId()) || + Arrays.asList(loginUser.getRoleId().split(",")).contains("6")) { + if (!"1".equals(teamEvaluateBean.getStatus())) { + if ("待审核".equals(teamEvaluateBean.getCheckStatus())) { + c.setIsCheckBZ(1); + } + } + } + } + } + }); + } return firstLevel; - } + } - /** - * 设置子元素 - * 2018.06.09 - * - * @param p - * @param permissions - */ - private void setChild(Permission p, List permissions) { - List child = permissions.parallelStream().filter(a -> a.getParentId().equals(p.getId())).collect(Collectors.toList()); - p.setChild(child); - if (!CollectionUtils.isEmpty(child)) { - child.parallelStream().forEach(c -> { - //递归设置子元素，多级菜单支持 - setChild(c, permissions); - }); - } - } + private List checkExamine(OutSourceBean o) { + try { + o.setDeptId(UserUtil.getLoginUser().getDeptId()); + String isBusinessDivision = outsourcerEvaluateDao.getIsBusinessDivision(o.getDeptId()); + if (!org.apache.commons.lang3.StringUtils.isBlank(isBusinessDivision) && "1".equals(isBusinessDivision)) { + o.setIsBusinessDivision("1"); + } else { + o.setIsBusinessDivision("0"); + } + List list = outsourcerEvaluateService.getEvaluateAuditList(o); + return list; + } catch (Exception e) { + log.error(e.toString(), e); + } + return new ArrayList<>(); + } + private List TeamEvaluateBean(TeamEvaluateBean o) { + List list = service.getTeamEvaluateList(o); + for (TeamEvaluateBean bean : list) { + String sendPhone = bean.getSendPhone(); + if (org.apache.commons.lang3.StringUtils.isBlank(sendPhone)) { + String sendPhone2 = service.getSendPhone(bean); + bean.setSendPhone(sendPhone2); + } + } + return list; + } + + /** + * 设置子元素 + * 2018.06.09 + * + * @param p + * @param permissions + */ + private void setChild(Permission p, List permissions) { + List child = permissions.parallelStream().filter(a -> a.getParentId().equals(p.getId())).collect(Collectors.toList()); + p.setChild(child); + if (!CollectionUtils.isEmpty(child)) { + child.parallelStream().forEach(c -> { + //递归设置子元素，多级菜单支持 + setChild(c, permissions); + }); + } + } // private void setChild(List permissions) { // permissions.parallelStream().forEach(per -> { @@ -90,131 +167,131 @@ public class PermissionController { // }); // } - /** - * 菜单列表 - * - * @param pId - * @param permissionsAll - * @param list - */ - private void setPermissionsList(Long pId, List permissionsAll, List list) { - for (Permission per : permissionsAll) { - if (per.getParentId().equals(pId)) { - list.add(per); - if (permissionsAll.stream().filter(p -> p.getParentId().equals(per.getId())).findAny() != null) { - setPermissionsList(per.getId(), permissionsAll, list); - } - } - } - } + /** + * 菜单列表 + * + * @param pId + * @param permissionsAll + * @param list + */ + private void setPermissionsList(Long pId, List permissionsAll, List list) { + for (Permission per : permissionsAll) { + if (per.getParentId().equals(pId)) { + list.add(per); + if (permissionsAll.stream().filter(p -> p.getParentId().equals(per.getId())).findAny() != null) { + setPermissionsList(per.getId(), permissionsAll, list); + } + } + } + } - @GetMapping - @ApiOperation(value = "菜单列表") - @PreAuthorize("hasAuthority('sys:menu:query')") - public List permissionsList() { - List permissionsAll = permissionDao.listAll(); + @GetMapping + @ApiOperation(value = "菜单列表") + @PreAuthorize("hasAuthority('sys:menu:query')") + public List permissionsList() { + List permissionsAll = permissionDao.listAll(); - List list = Lists.newArrayList(); - setPermissionsList(0L, permissionsAll, list); + List list = Lists.newArrayList(); + setPermissionsList(0L, permissionsAll, list); - return list; - } + return list; + } - @GetMapping("/all") - @ApiOperation(value = "所有菜单") - @PreAuthorize("hasAuthority('sys:menu:query')") - public JSONArray permissionsAll() { - List permissionsAll = permissionDao.listAll(); - JSONArray array = new JSONArray(); - setPermissionsTree(0L, permissionsAll, array); + @GetMapping("/all") + @ApiOperation(value = "所有菜单") + @PreAuthorize("hasAuthority('sys:menu:query')") + public JSONArray permissionsAll() { + List permissionsAll = permissionDao.listAll(); + JSONArray array = new JSONArray(); + setPermissionsTree(0L, permissionsAll, array); - return array; - } + return array; + } - @GetMapping("/parents") - @ApiOperation(value = "一级菜单") - @PreAuthorize("hasAuthority('sys:menu:query')") - public List parentMenu() { - List parents = permissionDao.listParents(); + @GetMapping("/parents") + @ApiOperation(value = "一级菜单") + @PreAuthorize("hasAuthority('sys:menu:query')") + public List parentMenu() { + List parents = permissionDao.listParents(); - return parents; - } + return parents; + } - /** - * 菜单树 - * - * @param pId - * @param permissionsAll - * @param array - */ - private void setPermissionsTree(Long pId, List permissionsAll, JSONArray array) { - for (Permission per : permissionsAll) { - if (per.getParentId().equals(pId)) { - String string = JSONObject.toJSONString(per); - JSONObject parent = (JSONObject) JSONObject.parse(string); - array.add(parent); + /** + * 菜单树 + * + * @param pId + * @param permissionsAll + * @param array + */ + private void setPermissionsTree(Long pId, List permissionsAll, JSONArray array) { + for (Permission per : permissionsAll) { + if (per.getParentId().equals(pId)) { + String string = JSONObject.toJSONString(per); + JSONObject parent = (JSONObject) JSONObject.parse(string); + array.add(parent); - if (permissionsAll.stream().filter(p -> p.getParentId().equals(per.getId())).findAny() != null) { - JSONArray child = new JSONArray(); - parent.put("child", child); - setPermissionsTree(per.getId(), permissionsAll, child); - } - } - } - } + if (permissionsAll.stream().filter(p -> p.getParentId().equals(per.getId())).findAny() != null) { + JSONArray child = new JSONArray(); + parent.put("child", child); + setPermissionsTree(per.getId(), permissionsAll, child); + } + } + } + } - @GetMapping(params = "roleId") - @ApiOperation(value = "根据角色id获取权限") - @PreAuthorize("hasAnyAuthority('sys:menu:query','sys:role:query')") - public List listByRoleId(Long roleId) { - return permissionDao.listByRoleId(roleId); - } + @GetMapping(params = "roleId") + @ApiOperation(value = "根据角色id获取权限") + @PreAuthorize("hasAnyAuthority('sys:menu:query','sys:role:query')") + public List listByRoleId(Long roleId) { + return permissionDao.listByRoleId(roleId); + } - @LogAnnotation - @PostMapping - @ApiOperation(value = "保存菜单") - @PreAuthorize("hasAuthority('sys:menu:add')") - public void save(@RequestBody Permission permission) { - permissionDao.save(permission); - } + @LogAnnotation + @PostMapping + @ApiOperation(value = "保存菜单") + @PreAuthorize("hasAuthority('sys:menu:add')") + public void save(@RequestBody Permission permission) { + permissionDao.save(permission); + } - @GetMapping("/{id}") - @ApiOperation(value = "根据菜单id获取菜单") - @PreAuthorize("hasAuthority('sys:menu:query')") - public Permission get(@PathVariable Long id) { - return permissionDao.getById(id); - } + @GetMapping("/{id}") + @ApiOperation(value = "根据菜单id获取菜单") + @PreAuthorize("hasAuthority('sys:menu:query')") + public Permission get(@PathVariable Long id) { + return permissionDao.getById(id); + } - @LogAnnotation - @PutMapping - @ApiOperation(value = "修改菜单") - @PreAuthorize("hasAuthority('sys:menu:add')") - public void update(@RequestBody Permission permission) { - permissionService.update(permission); - } + @LogAnnotation + @PutMapping + @ApiOperation(value = "修改菜单") + @PreAuthorize("hasAuthority('sys:menu:add')") + public void update(@RequestBody Permission permission) { + permissionService.update(permission); + } - /** - * 校验权限 - * - * @return - */ - @GetMapping("/owns") - @ApiOperation(value = "校验当前用户的权限") - public Set ownsPermission() { - List permissions = UserUtil.getLoginUser().getPermissions(); - if (CollectionUtils.isEmpty(permissions)) { - return Collections.emptySet(); - } + /** + * 校验权限 + * + * @return + */ + @GetMapping("/owns") + @ApiOperation(value = "校验当前用户的权限") + public Set ownsPermission() { + List permissions = UserUtil.getLoginUser().getPermissions(); + if (CollectionUtils.isEmpty(permissions)) { + return Collections.emptySet(); + } - return permissions.parallelStream().filter(p -> !StringUtils.isEmpty(p.getPermission())) - .map(Permission::getPermission).collect(Collectors.toSet()); - } + return permissions.parallelStream().filter(p -> !StringUtils.isEmpty(p.getPermission())) + .map(Permission::getPermission).collect(Collectors.toSet()); + } - @LogAnnotation - @DeleteMapping("/{id}") - @ApiOperation(value = "删除菜单") - @PreAuthorize("hasAuthority('sys:menu:del')") - public void delete(@PathVariable Long id) { - permissionService.delete(id); - } + @LogAnnotation + @DeleteMapping("/{id}") + @ApiOperation(value = "删除菜单") + @PreAuthorize("hasAuthority('sys:menu:del')") + public void delete(@PathVariable Long id) { + permissionService.delete(id); + } } diff --git a/src/main/java/com/bonus/gs/sub/evaluate/manager/model/Permission.java b/src/main/java/com/bonus/gs/sub/evaluate/manager/model/Permission.java index dc46def..afb29d8 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/manager/model/Permission.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/manager/model/Permission.java @@ -14,6 +14,26 @@ public class Permission extends BaseEntity { private String permission; private Integer sort; + private Integer isCheckBZ; + + public Integer getIsCheckBZ() { + return isCheckBZ; + } + + public void setIsCheckBZ(Integer isCheckBZ) { + this.isCheckBZ = isCheckBZ; + } + + public Integer getIsCheckWBS() { + return isCheckWBS; + } + + public void setIsCheckWBS(Integer isCheckWBS) { + this.isCheckWBS = isCheckWBS; + } + + private Integer isCheckWBS; + private List child; public Long getParentId() { diff --git a/src/main/resources/download/evaluate_model.ftl b/src/main/resources/download/evaluate_model.ftl index 98efefe..6602599 100644 --- a/src/main/resources/download/evaluate_model.ftl +++ b/src/main/resources/download/evaluate_model.ftl @@ -1345,6 +1345,9 @@ + + + + + update pj_template_config + set is_enable = 1 + where is_active = '1' + + + update pj_template_config + set is_enable = 0 + where config_id = #{configId} + update pj_template_config set is_active = '0' where config_id = #{id} @@ -36,6 +46,7 @@ ptc.create_time as createTime, ptc.version as version, ptc.json as jsonTxt, + ptc.is_enable as isEnable, ifnull(per.evaluate_id, 0) as isUse FROM pj_template_config ptc diff --git a/src/main/resources/mappers/initiateEvaluate/InitiateEvaluateMapper.xml b/src/main/resources/mappers/initiateEvaluate/InitiateEvaluateMapper.xml index bbf48e1..a70cda8 100644 --- a/src/main/resources/mappers/initiateEvaluate/InitiateEvaluateMapper.xml +++ b/src/main/resources/mappers/initiateEvaluate/InitiateEvaluateMapper.xml @@ -104,7 +104,7 @@ config_name as name, version as version from pj_template_config - where is_active = 1 + where is_active = 1 and is_enable = 0