From a828125a8ac74e6aa0498b7c240560e23de60dc0 Mon Sep 17 00:00:00 2001 From: chenrui <1950717904@qq.com> Date: Thu, 1 Aug 2024 17:00:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=9F=A5=E8=AF=A2=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E6=8E=A5=E5=8F=A3=E6=97=A0=E6=9D=83=E9=99=90=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppEnforcementRegistrationController.java | 14 +-- ...AppEnterpriseLawEnforcementController.java | 13 +-- .../app/controller/AppSystemController.java | 7 ++ .../java/com/zdxt/auth/feign/DeptApiImpl.java | 14 +++ .../EnterpriseLawEnforcementController.java | 14 +-- .../main/java/com/zdxt/auth/dto/DeptBean.java | 90 +------------------ .../java/com/zdxt/auth/feign/DeptApi.java | 4 + 7 files changed, 50 insertions(+), 106 deletions(-) diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java index 41a64cfa..4c91f391 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java @@ -355,12 +355,14 @@ public class AppEnforcementRegistrationController extends BaseController public ZDResponse getByIdToDataFillIn(@PathVariable String id) { EnforcementRegistration registration = enforcementRegistrationService.getEnforcementRegistrationById(id); - Map params = new HashMap<>(); - LinkageDict tmp = iLinkageDictService.selectLinkageDictById(registration.getLawEnforcementItem()); - params.put("lawEnforcementItemText", tmp.getTitle()); - tmp = iLinkageDictService.selectLinkageDictById(registration.getLawEnforcementBasis()); - params.put("lawEnforcementBasisText", tmp.getTitle()); - registration.setParams(params); + + //TODO 执法事项修改为手动输入 +// Map params = new HashMap<>(); +// LinkageDict tmp = iLinkageDictService.selectLinkageDictById(registration.getLawEnforcementItem()); +// params.put("lawEnforcementItemText", tmp.getTitle()); +// tmp = iLinkageDictService.selectLinkageDictById(registration.getLawEnforcementBasis()); +// params.put("lawEnforcementBasisText", tmp.getTitle()); +// registration.setParams(params); return ZDResponse.success("查询成功", registration); } } diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseLawEnforcementController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseLawEnforcementController.java index b39e3362..c532844b 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseLawEnforcementController.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseLawEnforcementController.java @@ -337,12 +337,13 @@ public class AppEnterpriseLawEnforcementController extends BaseController } } - Map params = new HashMap<>(); - LinkageDict tmp = iLinkageDictService.selectLinkageDictById(enfrorcement.getCheckItem()); - params.put("checkItemText", null==tmp?enfrorcement.getCheckItemText():tmp.getTitle()); - tmp = iLinkageDictService.selectLinkageDictById(enfrorcement.getCheckRequire()); - params.put("checkRequireText", null==tmp?enfrorcement.getCheckRequireText():tmp.getTitle()); - enfrorcement.setParams(params); + //TODO 执法事项修改为手动输入 +// Map params = new HashMap<>(); +// LinkageDict tmp = iLinkageDictService.selectLinkageDictById(enfrorcement.getCheckItem()); +// params.put("checkItemText", null==tmp?enfrorcement.getCheckItemText():tmp.getTitle()); +// tmp = iLinkageDictService.selectLinkageDictById(enfrorcement.getCheckRequire()); +// params.put("checkRequireText", null==tmp?enfrorcement.getCheckRequireText():tmp.getTitle()); +// enfrorcement.setParams(params); enfrorcement.setDeptObjs(objs); // 执法人员需要展示用户名+执法码 diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppSystemController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppSystemController.java index 54f69534..f3eb0f91 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppSystemController.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppSystemController.java @@ -134,6 +134,13 @@ public class AppSystemController extends BaseController { return ZDResponse.success("查询成功",list); } + @GetMapping("/listDeptAppNoPermission") + @ResponseBody + public ZDResponse listDeptAppNoPermission(DeptBean dept) { + List list = deptApi.listDeptAppNoPermission(dept); + return ZDResponse.success("查询成功",list); + } + /** * 根据根据部门的parentId获取上一个parentId * @param dept diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/feign/DeptApiImpl.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/feign/DeptApiImpl.java index 50437c0f..ffe3f663 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/feign/DeptApiImpl.java +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/feign/DeptApiImpl.java @@ -218,6 +218,20 @@ public class DeptApiImpl implements DeptApi { return deptBeans; } + @Override + public List listDeptAppNoPermission(DeptBean bean) { + Dept params = new Dept(); + BeanUtil.copyProperties(bean, params); + List deptList = deptMapper.selectDeptList(params); + List deptBeans = new ArrayList<>(); + for (Dept source:deptList) { + DeptBean deptBean = new DeptBean(); + BeanUtil.copyProperties(source, deptBean); + deptBeans.add(deptBean); + } + return deptBeans; + } + // 递归获取部门 public DeptBean iterationDeptParent(String deptId) { diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnterpriseLawEnforcementController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnterpriseLawEnforcementController.java index 0fe77b2e..4dd2e036 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnterpriseLawEnforcementController.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnterpriseLawEnforcementController.java @@ -178,12 +178,14 @@ public class EnterpriseLawEnforcementController extends BaseController public ZDResponse getByIdToDataFillIn(@PathVariable String id) { EnterpriseLawEnforcement enfrorcement = enterpriseLawEnforcementService.getEnterpriseLawEnforcementById(id); - Map params = new HashMap<>(); - LinkageDict tmp = iLinkageDictService.selectLinkageDictById(enfrorcement.getCheckItem()); - params.put("checkItemText", tmp.getTitle()); - tmp = iLinkageDictService.selectLinkageDictById(enfrorcement.getCheckRequire()); - params.put("checkRequireText", tmp.getTitle()); - enfrorcement.setParams(params); + + //TODO 执法事项修改为手动输入 +// Map params = new HashMap<>(); +// LinkageDict tmp = iLinkageDictService.selectLinkageDictById(enfrorcement.getCheckItem()); +// params.put("checkItemText", tmp.getTitle()); +// tmp = iLinkageDictService.selectLinkageDictById(enfrorcement.getCheckRequire()); +// params.put("checkRequireText", tmp.getTitle()); +// enfrorcement.setParams(params); return ZDResponse.success("查询成功", enfrorcement); } } diff --git a/lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/dto/DeptBean.java b/lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/dto/DeptBean.java index 39958c85..391d1b74 100644 --- a/lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/dto/DeptBean.java +++ b/lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/dto/DeptBean.java @@ -1,12 +1,8 @@ package com.zdxt.auth.dto; +import com.zdxt.common.BaseDomain; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; -import java.util.Date; -import java.util.Map; /** * 部门-JavaBean @@ -15,7 +11,7 @@ import java.util.Map; * @date: 2020/4/10 15:43 */ @ApiModel -public class DeptBean implements Serializable { +public class DeptBean extends BaseDomain { private static final long serialVersionUID = -5247334811920458179L; @@ -115,41 +111,11 @@ public class DeptBean implements Serializable { */ private String searchValue; - /** - * 创建者 - */ - private String createBy; - - /** - * 创建时间 - */ - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date createTime; - - /** - * 更新者 - */ - private String updateBy; - - /** - * 更新时间 - */ - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date updateTime; - - /** - * 备注 - */ - private String remark; /** * 部门类型 0 机构 1 部门 2 小组 */ private String deptType; - /** - * 请求参数 - */ - private Map params; public String getDeptId() { return deptId; @@ -247,53 +213,7 @@ public class DeptBean implements Serializable { this.searchValue = searchValue; } - public String getCreateBy() { - return createBy; - } - - public void setCreateBy(String createBy) { - this.createBy = createBy; - } - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public String getUpdateBy() { - return updateBy; - } - - public void setUpdateBy(String updateBy) { - this.updateBy = updateBy; - } - - public Date getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public Map getParams() { - return params; - } - - public void setParams(Map params) { - this.params = params; - } public String getOrganization() { return organization; @@ -334,12 +254,6 @@ public class DeptBean implements Serializable { ", delFlag='" + delFlag + '\'' + ", parentName='" + parentName + '\'' + ", searchValue='" + searchValue + '\'' + - ", createBy='" + createBy + '\'' + - ", createTime=" + createTime + - ", updateBy='" + updateBy + '\'' + - ", updateTime=" + updateTime + - ", remark='" + remark + '\'' + - ", params=" + params + '}'; } } diff --git a/lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/feign/DeptApi.java b/lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/feign/DeptApi.java index 1064a99e..9b151ea7 100644 --- a/lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/feign/DeptApi.java +++ b/lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/feign/DeptApi.java @@ -107,6 +107,10 @@ public interface DeptApi { @ApiOperation("根据父节点获取其下所有部门信息") public List selectDeptByParentId(DeptBean dept); + @PostMapping("/selectDeptByParentIdNoPermission") + @ApiOperation("根据父节点获取其下所有部门信息无权限") + public List listDeptAppNoPermission(DeptBean dept); + /** * 查询当前人部门所在部门 * @param deptId