security() {
+ return newArrayList(
+ new ApiKey(Constant.TOKEN_HEADER, Constant.TOKEN_HEADER, "header")
+ );
+ }
+
+}
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/AppMenuController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/AppMenuController.java
new file mode 100644
index 0000000..5bc38d2
--- /dev/null
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/AppMenuController.java
@@ -0,0 +1,141 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.exception.ErrorCode;
+import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
+import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.dto.AppMenuDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAppChildNavResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO;
+import com.elink.esua.epdc.excel.AppMenuExcel;
+import com.elink.esua.epdc.service.AppMenuService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * APP菜单管理
+ *
+ * @author work@yujt.net.cn
+ * @since v1.0.0 2019-11-19
+ */
+@RestController
+@RequestMapping("appmenu")
+public class AppMenuController {
+
+ @Autowired
+ private AppMenuService appMenuService;
+
+ /**
+ * 获取APP菜单列表
+ *
+ * @param type 菜单类型 0：菜单 1：按钮 null：全部
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @author work@yujt.net.cn
+ * @date 2019/11/19 13:26
+ */
+ @GetMapping("list")
+ public Result> list(Integer type) {
+ List list = appMenuService.getAppMenuList(type);
+ return new Result>().ok(list);
+ }
+
+ @GetMapping("{id}")
+ public Result get(@PathVariable("id") String id) {
+ AppMenuDTO data = appMenuService.get(id);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ public Result save(@RequestBody AppMenuDTO dto) {
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ appMenuService.save(dto);
+ return new Result();
+ }
+
+ @PutMapping
+ public Result update(@RequestBody AppMenuDTO dto) {
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ appMenuService.update(dto);
+ return new Result();
+ }
+
+ @DeleteMapping("{id}")
+ public Result delete(@PathVariable("id") Long id){
+ //效验数据
+ AssertUtils.isNull(id, "id");
+
+ //判断是否有子菜单或按钮
+ if(appMenuService.hasChileMenu(id)){
+ return new Result().error(ErrorCode.SUB_MENU_EXIST);
+ }
+
+ appMenuService.delete(id);
+
+ return new Result();
+ }
+
+ @GetMapping("export")
+ public void export(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = appMenuService.list(params);
+ ExcelUtils.exportExcelToTarget(response, null, list, AppMenuExcel.class);
+ }
+
+ @GetMapping("select")
+ public Result> select(UserDetail userDetail) {
+ List list = appMenuService.getUserMenuList(userDetail, null);
+
+ return new Result>().ok(list);
+ }
+
+ /**
+ * @param mobile
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @Author yinzuomei
+ * @Description 首页面板 获取工作端APP菜单
+ * @Date 2019/11/20 10:43
+ **/
+ @GetMapping("/indexPanel/{mobile}")
+ public Result> indexPanel(@PathVariable("mobile") String mobile) {
+ return appMenuService.indexPanel(mobile);
+ }
+ /**
+ * @param userId
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @Author lpf
+ * @Description 首页面板 获取数据端APP菜单
+ * @Date 2020/03/18 10:42
+ **/
+ @GetMapping("/analysisIndexPanel/{userId}")
+ public Result> analysisIndexPanel(@PathVariable("userId") String userId) {
+ return appMenuService.getAnalysisIndexPanel(userId);
+ }
+}
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/AppMenuTemplateController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/AppMenuTemplateController.java
new file mode 100644
index 0000000..f70b1cd
--- /dev/null
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/AppMenuTemplateController.java
@@ -0,0 +1,92 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.dto.AppMenuTemplateDTO;
+import com.elink.esua.epdc.service.AppMenuTemplateService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * APP菜单模板管理
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2019-11-19
+ */
+@RestController
+@RequestMapping("appmenutemplate")
+public class AppMenuTemplateController {
+
+ @Autowired
+ private AppMenuTemplateService appMenuTemplateService;
+
+ @GetMapping("page")
+ public Result> page(@RequestParam Map params){
+ PageData page = appMenuTemplateService.page(params);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("list")
+ public Result> list(){
+ List list = appMenuTemplateService.list(new HashMap<>());
+ return new Result>().ok(list);
+ }
+
+ @GetMapping("{id}")
+ public Result get(@PathVariable("id") String id){
+ AppMenuTemplateDTO data = appMenuTemplateService.get(id);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ public Result save(@RequestBody AppMenuTemplateDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ appMenuTemplateService.save(dto);
+ return new Result();
+ }
+
+ @PutMapping
+ public Result update(@RequestBody AppMenuTemplateDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ appMenuTemplateService.update(dto);
+ return new Result();
+ }
+
+ @DeleteMapping
+ public Result delete(@RequestBody String[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ appMenuTemplateService.delete(ids);
+ return new Result();
+ }
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/AppRoleMenuController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/AppRoleMenuController.java
new file mode 100644
index 0000000..c80d919
--- /dev/null
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/AppRoleMenuController.java
@@ -0,0 +1,94 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.dto.AppRoleMenuDTO;
+import com.elink.esua.epdc.excel.AppRoleMenuExcel;
+import com.elink.esua.epdc.service.AppRoleMenuService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * APP角色菜单关系
+ *
+ * @author work@yujt.net.cn
+ * @since v1.0.0 2019-11-19
+ */
+@RestController
+@RequestMapping("approlemenu")
+public class AppRoleMenuController {
+
+ @Autowired
+ private AppRoleMenuService appRoleMenuService;
+
+ @GetMapping("page")
+ public Result> page(@RequestParam Map params) {
+ PageData page = appRoleMenuService.page(params);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ public Result get(@PathVariable("id") String id) {
+ AppRoleMenuDTO data = appRoleMenuService.get(id);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ public Result save(@RequestBody AppRoleMenuDTO dto) {
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ appRoleMenuService.save(dto);
+ return new Result();
+ }
+
+ @PutMapping
+ public Result update(@RequestBody AppRoleMenuDTO dto) {
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ appRoleMenuService.update(dto);
+ return new Result();
+ }
+
+ @DeleteMapping
+ public Result delete(@RequestBody String[] ids) {
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ appRoleMenuService.delete(ids);
+ return new Result();
+ }
+
+ @GetMapping("export")
+ public void export(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = appRoleMenuService.list(params);
+ ExcelUtils.exportExcelToTarget(response, null, list, AppRoleMenuExcel.class);
+ }
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/AreaController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/AreaController.java
new file mode 100644
index 0000000..8ab8ed6
--- /dev/null
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/AreaController.java
@@ -0,0 +1,55 @@
+
+package com.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.mybatis.annotation.DataFilter;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.SimpleAreaDTO;
+import com.elink.esua.epdc.dto.SysSimpleDeptDTO;
+import com.elink.esua.epdc.service.AreaService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 获取行政区划
+ *
+ * @author liuhongwei @elink-cn.com
+ * @since v1.0.0 2019-05-13
+ */
+@RestController
+@RequestMapping("area")
+public class AreaController {
+
+ @Autowired
+ private AreaService areaService;
+
+ /**
+ * 根据区划ID，获取下属区域列表
+ *
+ * @param areaId
+ * @return com.elink.esua.commons.tools.utils.Result>
+ * @author yujintao
+ * @date 2019/9/3 16:28
+ */
+ @GetMapping("listSimple/{areaId}")
+ public Result> listSimpleAreaInfo(@PathVariable("areaId") String areaId) {
+ return this.areaService.listSimpleAreaInfo(areaId);
+ }
+
+ /**
+ * 数据权限控制用户可操作的部门（用于下拉菜单显示）
+ *
+ * @param params
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @author yujintao
+ * @date 2019/9/4 19:21
+ */
+ @GetMapping("listSimpleDept")
+ @DataFilter(tableAlias = "temp", deptId = "id", prefix = "WHERE")
+ public Result> listSimpleDeptInfo(@RequestParam Map params) {
+ return this.areaService.listSimpleDeptInfo(params);
+ }
+}
\ No newline at end of file
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/DeptGridPlatformController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/DeptGridPlatformController.java
new file mode 100644
index 0000000..f977f15
--- /dev/null
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/DeptGridPlatformController.java
@@ -0,0 +1,105 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.dto.DeptGridPlatformDTO;
+import com.elink.esua.epdc.excel.DeptGridPlatformExcel;
+import com.elink.esua.epdc.service.DeptGridPlatformService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ *
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2019-12-25
+ */
+@RestController
+@RequestMapping("deptgridplatform")
+public class DeptGridPlatformController {
+
+ @Autowired
+ private DeptGridPlatformService deptGridPlatformService;
+
+ @GetMapping("page")
+ public Result> page(@RequestParam Map params){
+ PageData page = deptGridPlatformService.page(params);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ public Result get(@PathVariable("id") String id){
+ DeptGridPlatformDTO data = deptGridPlatformService.get(id);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ public Result save(@RequestBody DeptGridPlatformDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ deptGridPlatformService.save(dto);
+ return new Result();
+ }
+
+ @PutMapping
+ public Result update(@RequestBody DeptGridPlatformDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ deptGridPlatformService.update(dto);
+ return new Result();
+ }
+
+ @DeleteMapping
+ public Result delete(@RequestBody String[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ deptGridPlatformService.delete(ids);
+ return new Result();
+ }
+
+ @GetMapping("export")
+ public void export(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = deptGridPlatformService.list(params);
+ ExcelUtils.exportExcelToTarget(response, null, list, DeptGridPlatformExcel.class);
+ }
+
+ /**
+ * @param deptId
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @Author yinzuomei
+ * @Description 根据部门id查询记录
+ * @Date 2019/12/25 15:09
+ **/
+ @GetMapping("selectByDeptId/{deptId}")
+ public Result selectByDeptId(@PathVariable("deptId") String deptId){
+ return deptGridPlatformService.getDeptGridPlatformDTO(deptId);
+ }
+}
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/DeptMaCodeController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/DeptMaCodeController.java
new file mode 100644
index 0000000..74b83f0
--- /dev/null
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/DeptMaCodeController.java
@@ -0,0 +1,134 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.mybatis.annotation.DataFilter;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.dto.DeptMaCodeDTO;
+import com.elink.esua.epdc.excel.DeptMaCodeExcel;
+import com.elink.esua.epdc.service.DeptMaCodeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 网格小程序码
+ *
+ * @author work@yujt.net.cn
+ * @since v1.0.0 2019-09-19
+ */
+@RestController
+@RequestMapping("deptmacode")
+public class DeptMaCodeController {
+
+ @Autowired
+ private DeptMaCodeService deptMaCodeService;
+
+ @GetMapping("page")
+ @DataFilter(tableAlias = "dg", deptId = "id", prefix = "AND")
+ public Result> page(@RequestParam Map params) {
+ PageData page = deptMaCodeService.page(params);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ public Result get(@PathVariable("id") String id) {
+ DeptMaCodeDTO data = deptMaCodeService.get(id);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ public Result save(@RequestBody DeptMaCodeDTO dto) {
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ deptMaCodeService.save(dto);
+ return new Result();
+ }
+
+ @PutMapping
+ public Result update(@RequestBody DeptMaCodeDTO dto) {
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ deptMaCodeService.update(dto);
+ return new Result();
+ }
+
+ @DeleteMapping
+ public Result delete(@RequestBody String[] ids) {
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ deptMaCodeService.delete(ids);
+ return new Result();
+ }
+
+ @GetMapping("export")
+ public void export(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = deptMaCodeService.list(params);
+ ExcelUtils.exportExcelToTarget(response, null, list, DeptMaCodeExcel.class);
+ }
+
+ /**
+ * 所有部门小程序码初始化
+ *
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @author work@yujt.net.cn
+ * @date 2019/9/19 09:33
+ */
+ @PostMapping("init")
+ public Result initDeptMaCode() {
+ return deptMaCodeService.initDeptMaCode();
+ }
+
+ /**
+ * 生成指定网格小程序码
+ *
+ * @param gridId
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @author work@yujt.net.cn
+ * @date 2019/9/19 11:04
+ */
+ @PostMapping("create/{gridId}")
+ public Result createDeptMaCode(@PathVariable("gridId") String gridId) {
+ return deptMaCodeService.createDeptMaCode(gridId);
+ }
+
+ /**
+ * 创建网格长注册小程序码
+ *
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @author work@yujt.net.cn
+ * @date 2019/10/22 09:59
+ */
+ @PostMapping("gridLeader")
+ public Result createGridLeaderMaCode() {
+ return deptMaCodeService.createGridLeaderMaCode();
+ }
+
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysAnalysisMenuController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysAnalysisMenuController.java
new file mode 100644
index 0000000..04ee8c9
--- /dev/null
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysAnalysisMenuController.java
@@ -0,0 +1,132 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.exception.ErrorCode;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
+import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.dto.*;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAppChildNavResultDTO;
+import com.elink.esua.epdc.excel.*;
+import com.elink.esua.epdc.service.SysAnalysisMenuService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 菜单管理
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2020-03-25
+ */
+@RestController
+@RequestMapping("analysismenu")
+public class SysAnalysisMenuController {
+
+ @Autowired
+ private SysAnalysisMenuService sysAnalysisMenuService;
+
+ /**
+ * 获取APP菜单列表
+ *
+ * @param type 菜单类型 0：菜单 1：按钮 null：全部
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @author work@yujt.net.cn
+ * @date 2019/11/19 13:26
+ */
+ @GetMapping("list")
+ public Result> list(Integer type) {
+ List list = sysAnalysisMenuService.getAnalysisMenuList(type);
+ return new Result>().ok(list);
+ }
+
+ @GetMapping("page")
+ public Result> page(@RequestParam Map params){
+ PageData page = sysAnalysisMenuService.page(params);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ public Result get(@PathVariable("id") String id){
+ SysAnalysisMenuDTO data = sysAnalysisMenuService.get(id);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ public Result save(@RequestBody SysAnalysisMenuDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ sysAnalysisMenuService.save(dto);
+ return new Result();
+ }
+ @GetMapping("select")
+ public Result> select(UserDetail userDetail) {
+ List list = sysAnalysisMenuService.getUserMenuList(userDetail, null);
+
+ return new Result>().ok(list);
+ }
+
+ @PutMapping
+ public Result update(@RequestBody SysAnalysisMenuDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ sysAnalysisMenuService.update(dto);
+ return new Result();
+ }
+
+ @DeleteMapping("{id}")
+ public Result delete(@PathVariable("id") Long id){
+ //效验数据
+ AssertUtils.isNull(id, "id");
+ //判断是否有子菜单或按钮
+ if(sysAnalysisMenuService.hasChileMenu(id)){
+ return new Result().error(ErrorCode.SUB_MENU_EXIST);
+ }
+ sysAnalysisMenuService.delete(id);
+ return new Result();
+ }
+
+ @GetMapping("export")
+ public void export(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = sysAnalysisMenuService.list(params);
+ ExcelUtils.exportExcelToTarget(response, null, list, SysAnalysisMenuExcel.class);
+ }
+ /**
+ * @param userId
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @Author lpf
+ * @Description 首页面板 获取数据端APP菜单
+ * @Date 2020/03/18 10:42
+ **/
+ @GetMapping("/analysisIndexPanel/{userId}")
+ public Result> analysisIndexPanel(@PathVariable("userId") String userId) {
+ return sysAnalysisMenuService.getAnalysisIndexPanel(userId);
+ }
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysAnalysisRoleMenuController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysAnalysisRoleMenuController.java
new file mode 100644
index 0000000..65deebc
--- /dev/null
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysAnalysisRoleMenuController.java
@@ -0,0 +1,94 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.dto.*;
+import com.elink.esua.epdc.excel.*;
+import com.elink.esua.epdc.service.SysAnalysisRoleMenuService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 角色菜单关系
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2020-03-25
+ */
+@RestController
+@RequestMapping("analysisrolemenu")
+public class SysAnalysisRoleMenuController {
+
+ @Autowired
+ private SysAnalysisRoleMenuService sysAnalysisRoleMenuService;
+
+ @GetMapping("page")
+ public Result> page(@RequestParam Map params){
+ PageData page = sysAnalysisRoleMenuService.page(params);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ public Result get(@PathVariable("id") String id){
+ SysAnalysisRoleMenuDTO data = sysAnalysisRoleMenuService.get(id);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ public Result save(@RequestBody SysAnalysisRoleMenuDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ sysAnalysisRoleMenuService.save(dto);
+ return new Result();
+ }
+
+ @PutMapping
+ public Result update(@RequestBody SysAnalysisRoleMenuDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ sysAnalysisRoleMenuService.update(dto);
+ return new Result();
+ }
+
+ @DeleteMapping
+ public Result delete(@RequestBody String[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ sysAnalysisRoleMenuService.delete(ids);
+ return new Result();
+ }
+
+ @GetMapping("export")
+ public void export(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = sysAnalysisRoleMenuService.list(params);
+ ExcelUtils.exportExcelToTarget(response, null, list, SysAnalysisRoleMenuExcel.class);
+ }
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java
new file mode 100644
index 0000000..4c0113e
--- /dev/null
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java
@@ -0,0 +1,297 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.annotation.LogOperation;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.dto.*;
+import com.elink.esua.epdc.dto.epdc.form.UserSysDeptInfoFormDTO;
+import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO;
+import com.elink.esua.epdc.service.SysDeptService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 部门管理
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@RestController
+@RequestMapping("dept")
+@Api(tags = "部门管理")
+public class SysDeptController {
+ @Autowired
+ private SysDeptService sysDeptService;
+
+ @GetMapping("list")
+ @ApiOperation("列表")
+ public Result> list() {
+ List list = sysDeptService.list(new HashMap<>(1));
+
+ return new Result>().ok(list);
+ }
+
+ @GetMapping("sublist/{pid}")
+ @ApiOperation("子列表")
+ public Result> sublist(@PathVariable("pid") String pid) {
+ List list = sysDeptService.subList(pid);
+ return new Result().ok(list);
+ }
+
+ /***
+ * 通过编码得到党委编码
+ * @param partyCode
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @author qushutong
+ * @date 2019/9/20 19:56
+ */
+ @GetMapping("getIdByCode/{partyCode}")
+ public Result> getIdByCode(@PathVariable("partyCode") String partyCode) {
+ return new Result>().ok(sysDeptService.getIdByCode(partyCode));
+ }
+
+ @GetMapping("{id}")
+ @ApiOperation("信息")
+ public Result get(@PathVariable("id") Long id) {
+ SysDeptDTO data = sysDeptService.get(id);
+
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ @ApiOperation("保存")
+ @LogOperation("Save Dept")
+ public Result save(@RequestBody SysDeptDTO dto) {
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+ sysDeptService.save(dto);
+
+ return new Result();
+ }
+
+ @PutMapping
+ @ApiOperation("修改")
+ @LogOperation("Update Dept")
+ public Result update(@RequestBody SysDeptDTO dto) {
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+ sysDeptService.update(dto);
+
+ return new Result();
+ }
+
+ @DeleteMapping("{id}")
+ @ApiOperation("删除")
+ @LogOperation("Delete Dept")
+ public Result delete(@PathVariable("id") Long id) {
+ //效验数据
+ AssertUtils.isNull(id, "id");
+// sysDeptService.delete(id);
+ sysDeptService.deleteBatchIds(Arrays.asList(new Long[]{id}));
+ return new Result();
+ }
+
+ @GetMapping("listGridId/{pid}")
+ @ApiOperation("获取所有下属网格ID集合")
+ public Result> listGridIdByPid(@PathVariable("pid") Long pid) {
+ return sysDeptService.listGridIdByPid(pid);
+ }
+
+ /**
+ * 通过网格ID获取该网格所有上级机构
+ *
+ * @param gridId
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @author yujintao
+ * @date 2019/9/7 09:12
+ */
+ @GetMapping("getCompleteDept/{gridId}")
+ public Result getCompleteDept(@PathVariable("gridId") String gridId) {
+ return sysDeptService.getCompleteDept(gridId);
+ }
+
+ /**
+ * 通过网格ID获取该网格所有上级机构
+ *
+ * @param deptId
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @author yujintao
+ * @date 2019/9/7 09:12
+ */
+ @GetMapping("getParentAndAllDept/{deptId}")
+ public Result getParentAndAllDept(@PathVariable("deptId") String deptId) {
+ return new Result().ok(sysDeptService.getParentAndAllDept(deptId));
+ }
+
+ /**
+ * 通过街道ID获取项目可流转部门
+ *
+ * @Params: [deptId]
+ * @Return: com.elink.esua.epdc.commons.tools.utils.Result>
+ * @Author: liuchuang
+ * @Date: 2019/9/16 17:00
+ */
+ @GetMapping("getCirculationDept/{deptId}")
+ public Result> listOfItemCirculationDept(@PathVariable("deptId") Long deptId) {
+ List data = sysDeptService.listOfItemCirculationDept(deptId);
+ return new Result>().ok(data);
+ }
+
+ /**
+ * 根据部门id，获取所有上级部门id，英文逗号隔开拼接字符串
+ *
+ * @param deptId
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @author work@yujt.net.cn
+ * @date 2019/11/27 15:07
+ */
+ @GetMapping("getParentDeptIds/{deptId}")
+ public Result getParentDeptIds(@PathVariable("deptId") Long deptId) {
+ return sysDeptService.getParentDeptIds(deptId);
+ }
+
+ /**
+ * 根据部门id，获取部门所在四级机构的所有机构名称
+ *
+ * @param deptId
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @author work@yujt.net.cn
+ * @date 2019/11/27 15:08
+ */
+ @GetMapping("getCompleteDeptList/{deptId}")
+ public Result> getCompleteDeptList(@PathVariable("deptId") Long deptId) {
+ return sysDeptService.getCompleteDeptList(deptId);
+ }
+
+ /**
+ * @param formDTO
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @Author yinzuomei
+ * @Description 获取用户数据权限下各部门基本信息
+ * @Date 2019/12/4 19:41
+ **/
+ @PostMapping("queryUserSysDeptInfo")
+ public Result> queryUserSysDeptInfo(@RequestBody UserSysDeptInfoFormDTO formDTO) {
+ ValidatorUtils.validateEntity(formDTO);
+ List list = sysDeptService.listUserSysDeptInfoResultDTO(formDTO);
+ return new Result>().ok(list);
+ }
+
+ /***
+ * 获取所有部门树
+ * @param
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @author qushutong
+ * @date 2019/12/13 15:25
+ */
+ @GetMapping("party/getDeptTree")
+ public Result getDeptTree() {
+ return sysDeptService.getDeptTree();
+ }
+
+ /**
+ * @param
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @Author yinzuomei
+ * @Description 获取所有部门树:二级只要街道
+ * @Date 2020/1/31 10:30
+ **/
+ @GetMapping("party/getDeptTreeForEpiDemic")
+ public Result getDeptTreeForEpiDemic() {
+ return sysDeptService.getDeptTreeForEpiDemic();
+ }
+
+ /**
+ * @param params
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @Author yinzuomei
+ * @Description 查询未建立党员群的网格列表
+ * @Date 2019/12/19 11:19
+ **/
+ @GetMapping("queryCompleteDept")
+ public Result> queryCompleteDept(@RequestParam Map params) {
+ PageData page = sysDeptService.listCompleteDeptDTO(params);
+ return new Result>().ok(page);
+ }
+
+ /***
+ * 获取所有网格 kpi模块原始数据
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @author qushutong
+ * @date 2019/12/12 17:26
+ */
+ @GetMapping("listAllGridId")
+ public Result listAllGridId() {
+ return sysDeptService.listAllGridId();
+ }
+
+ /**
+ * 按部门类型，分页查询部门列表
+ *
+ * @param typeKey 部门类型
+ * @param pageSize 页容量
+ * @param pageIndex 页码
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @author work@yujt.net.cn
+ * @date 2019/12/17 16:03
+ */
+ @GetMapping("pageDeptIdByTypeKey/{typeKey}/{pageSize}/{pageIndex}")
+ public Result> pageDeptIdByTypeKey(@PathVariable("typeKey") String typeKey,
+ @PathVariable("pageSize") Integer pageSize,
+ @PathVariable("pageIndex") Integer pageIndex) {
+ return sysDeptService.pageDeptIdByTypeKey(typeKey, pageSize, pageIndex);
+ }
+
+
+ /**
+ * 根据部门id，获取部门层级关系，获取部门领导姓名
+ *
+ * @param deptId 部门id
+ * @param leaderFlag 是否需要查询网格长姓名 0 否 、1 是
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @author work@yujt.net.cn
+ * @date 2019/12/18 11:04
+ */
+ @GetMapping("getDeptInfoById/{deptId}/{leaderFlag}")
+ public Result getDeptInfoById(@PathVariable("deptId") Long deptId,
+ @PathVariable("leaderFlag") String leaderFlag) {
+ DeptLevelAndLeaderDTO dto = sysDeptService.getDeptInfoById(deptId, leaderFlag);
+ return new Result().ok(dto);
+ }
+
+ /**
+ * @Description: 获取全部的部门基本信息
+ * @Param: [userSysDeptInfoFormDTO]
+ * @return: com.elink.esua.epdc.commons.tools.utils.Result>
+ * @Author: zy
+ * @Date: 2020-04-14
+ */
+ @PostMapping("queryAllDeptInfo")
+ public Result> queryAllDeptInfo(@RequestBody UserSysDeptInfoFormDTO formDTO) {
+ ValidatorUtils.validateEntity(formDTO);
+ List list = sysDeptService.listAllDeptInfo(formDTO);
+ return new Result>().ok(list);
+ }
+}
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysDictController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysDictController.java
new file mode 100644
index 0000000..925c2cd
--- /dev/null
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysDictController.java
@@ -0,0 +1,155 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.annotation.LogOperation;
+import com.elink.esua.epdc.commons.tools.constant.Constant;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.dto.SysDictDTO;
+import com.elink.esua.epdc.dto.SysSimpleDictDTO;
+import com.elink.esua.epdc.service.SysDictService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 数据字典
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@RestController
+@RequestMapping("dict")
+@Api(tags = "数据字典")
+public class SysDictController {
+ @Autowired
+ private SysDictService sysDictService;
+
+ @GetMapping("page")
+ @ApiOperation("字典分类")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType = "int"),
+ @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query", required = true, dataType = "int"),
+ @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "dictType", value = "字典类型", paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "dictName", value = "字典名称", paramType = "query", dataType = "String")
+ })
+ public Result> page(@ApiIgnore @RequestParam Map params) {
+ //字典分类
+ PageData page = sysDictService.page(params);
+
+ return new Result>().ok(page);
+ }
+
+
+ @GetMapping("sublist/{pid}")
+ @ApiOperation("子列表")
+ public Result> sublist(@PathVariable("pid") String pid) {
+ Map map = new HashMap();
+ map.put("pid", pid);
+ List list = sysDictService.subList(map);
+ return new Result>().ok(list);
+ }
+
+ @GetMapping("list")
+ @ApiOperation("字典分类数据")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "dictName", value = "字典名称", paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "dictValue", value = "字典值", paramType = "query", dataType = "String")
+ })
+ public Result> list(@ApiIgnore @RequestParam Map params) {
+ //字典分类数据
+ List list = sysDictService.list(params);
+
+ return new Result>().ok(list);
+ }
+
+ @GetMapping("{id}")
+ @ApiOperation("信息")
+ public Result get(@PathVariable("id") Long id) {
+ SysDictDTO data = sysDictService.get(id);
+
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ @ApiOperation("保存")
+ @LogOperation("Save Dict")
+ public Result save(@RequestBody SysDictDTO dto) {
+ //效验数据
+ ValidatorUtils.validateEntity(dto, DefaultGroup.class);
+
+ sysDictService.save(dto);
+
+ return new Result();
+ }
+
+ @PutMapping
+ @ApiOperation("修改")
+ @LogOperation("Update Dict")
+ public Result update(@RequestBody SysDictDTO dto) {
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+ sysDictService.update(dto);
+
+ return new Result();
+ }
+
+ @DeleteMapping
+ @ApiOperation("删除")
+ @LogOperation("Delete Dict")
+ public Result delete(@RequestBody Long[] ids) {
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+
+ sysDictService.delete(ids);
+
+ return new Result();
+ }
+
+ /**
+ * 根据数据字典类型获取简版数据字典列表，用于页面下拉菜单
+ *
+ * @param dictType 数据字典类型
+ * @return com.elink.esua.commons.tools.utils.Result>
+ * @author yujintao
+ * @date 2019/7/15 09:33
+ */
+ @GetMapping("listSimple/{dictType}")
+ @ApiOperation("字典分类数据")
+ public Result> listSimpleDictInfo(@PathVariable("dictType") String dictType) {
+ //字典分类数据
+ return sysDictService.listSimpleDictInfo(dictType);
+ }
+
+ @DeleteMapping("{id}")
+ @ApiOperation("删除")
+ @LogOperation("Delete Dict")
+ public Result delete(@PathVariable Long id) {
+ //效验数据
+ sysDictService.delete(id);
+ return new Result();
+ }
+
+}
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysLogErrorController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysLogErrorController.java
new file mode 100644
index 0000000..cfec33f
--- /dev/null
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysLogErrorController.java
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.annotation.LogOperation;
+import com.elink.esua.epdc.commons.tools.constant.Constant;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.SysLogErrorDTO;
+import com.elink.esua.epdc.excel.SysLogErrorExcel;
+import com.elink.esua.epdc.service.SysLogErrorService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 异常日志
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@RestController
+@RequestMapping("log/error")
+@Api(tags="异常日志")
+public class SysLogErrorController {
+ @Autowired
+ private SysLogErrorService sysLogErrorService;
+
+ @GetMapping("page")
+ @ApiOperation("分页")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType="int") ,
+ @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
+ @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType="String") ,
+ @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataType="String") ,
+ @ApiImplicitParam(name = "module", value = "模块名称，如：sys", paramType = "query", dataType="String")
+ })
+ public Result> page(@ApiIgnore @RequestParam Map params){
+ PageData page = sysLogErrorService.page(params);
+
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("export")
+ @ApiOperation("导出")
+ @LogOperation("Export Log Error")
+ public void export(@ApiIgnore @RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = sysLogErrorService.list(params);
+
+ ExcelUtils.exportExcelToTarget(response, null, list, SysLogErrorExcel.class);
+ }
+
+}
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysLogLoginController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysLogLoginController.java
new file mode 100644
index 0000000..febc8cc
--- /dev/null
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysLogLoginController.java
@@ -0,0 +1,74 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.annotation.LogOperation;
+import com.elink.esua.epdc.commons.tools.constant.Constant;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.SysLogLoginDTO;
+import com.elink.esua.epdc.excel.SysLogLoginExcel;
+import com.elink.esua.epdc.service.SysLogLoginService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 登录日志
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@RestController
+@RequestMapping("log/login")
+@Api(tags="登录日志")
+public class SysLogLoginController {
+ @Autowired
+ private SysLogLoginService sysLogLoginService;
+
+ @GetMapping("page")
+ @ApiOperation("分页")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType="int") ,
+ @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
+ @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType="String") ,
+ @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataType="String") ,
+ @ApiImplicitParam(name = "status", value = "状态 0：失败 1：成功 2：账号已锁定", paramType = "query", dataType="int"),
+ @ApiImplicitParam(name = "creatorName", value = "用户名", paramType = "query", dataType="String")
+ })
+ public Result> page(@ApiIgnore @RequestParam Map params){
+ PageData page = sysLogLoginService.page(params);
+
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("export")
+ @ApiOperation("导出")
+ @LogOperation("Export Log Login")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "status", value = "状态 0：失败 1：成功 2：账号已锁定", paramType = "query", dataType="int"),
+ @ApiImplicitParam(name = "creatorName", value = "用户名", paramType = "query", dataType="String")
+ })
+ public void export(@ApiIgnore @RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = sysLogLoginService.list(params);
+
+ ExcelUtils.exportExcelToTarget(response, null, list, SysLogLoginExcel.class);
+ }
+
+}
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysLogOperationController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysLogOperationController.java
new file mode 100644
index 0000000..3dd0c20
--- /dev/null
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysLogOperationController.java
@@ -0,0 +1,73 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.annotation.LogOperation;
+import com.elink.esua.epdc.commons.tools.constant.Constant;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.SysLogOperationDTO;
+import com.elink.esua.epdc.excel.SysLogOperationExcel;
+import com.elink.esua.epdc.service.SysLogOperationService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 操作日志
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@RestController
+@RequestMapping("log/operation")
+@Api(tags="操作日志")
+public class SysLogOperationController {
+ @Autowired
+ private SysLogOperationService sysLogOperationService;
+
+ @GetMapping("page")
+ @ApiOperation("分页")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType="int") ,
+ @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
+ @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType="String") ,
+ @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataType="String") ,
+ @ApiImplicitParam(name = "module", value = "模块名称，如：sys", paramType = "query", dataType="String"),
+ @ApiImplicitParam(name = "status", value = "状态 0：失败 1：成功", paramType = "query", dataType="int")
+ })
+ public Result> page(@ApiIgnore @RequestParam Map params){
+ PageData page = sysLogOperationService.page(params);
+
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("export")
+ @ApiOperation("导出")
+ @LogOperation("Export Log Operation")
+ public void export(@ApiIgnore @RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = sysLogOperationService.list(params);
+
+ ExcelUtils.exportExcelToTarget(response, null, list, SysLogOperationExcel.class);
+ }
+
+}
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysMenuController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysMenuController.java
new file mode 100644
index 0000000..90770af
--- /dev/null
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysMenuController.java
@@ -0,0 +1,134 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.annotation.LogOperation;
+import com.elink.esua.epdc.commons.tools.exception.ErrorCode;
+import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.dto.MenuResourceDTO;
+import com.elink.esua.epdc.dto.SysMenuDTO;
+import com.elink.esua.epdc.service.SysMenuService;
+import com.elink.esua.epdc.service.SysResourceService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * 菜单管理
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@RestController
+@RequestMapping("menu")
+@Api(tags="菜单管理")
+public class SysMenuController {
+ @Autowired
+ private SysMenuService sysMenuService;
+ @Autowired
+ private SysResourceService sysResourceService;
+
+ @GetMapping("nav")
+ @ApiOperation("导航")
+ public Result> nav(@ApiIgnore UserDetail userDetail){
+ List list = sysMenuService.getUserMenuNavList(userDetail);
+
+ return new Result>().ok(list);
+ }
+
+ @GetMapping("permissions")
+ @ApiOperation("权限标识")
+ public Result> permissions(@ApiIgnore UserDetail userDetail){
+ Set set = sysMenuService.getUserPermissions(userDetail);
+
+ return new Result>().ok(set);
+ }
+
+ @GetMapping("list")
+ @ApiOperation("列表")
+ @ApiImplicitParam(name = "type", value = "菜单类型 0：菜单 1：按钮 null：全部", paramType = "query", dataType="int")
+ public Result> list(Integer type){
+ List list = sysMenuService.getMenuList(type);
+
+ return new Result>().ok(list);
+ }
+
+ @GetMapping("{id}")
+ @ApiOperation("信息")
+ public Result get(@PathVariable("id") Long id){
+ SysMenuDTO data = sysMenuService.get(id);
+
+ //菜单资源列表
+ List resourceList = sysResourceService.getMenuResourceList(id);
+ data.setResourceList(resourceList);
+
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ @ApiOperation("保存")
+ @LogOperation("Save Menu")
+ public Result save(@RequestBody SysMenuDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, DefaultGroup.class);
+
+ sysMenuService.save(dto);
+
+ return new Result();
+ }
+
+ @PutMapping
+ @ApiOperation("修改")
+ @LogOperation("Update Menu")
+ public Result update(@RequestBody SysMenuDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, DefaultGroup.class);
+
+ sysMenuService.update(dto);
+
+ return new Result();
+ }
+
+ @DeleteMapping("{id}")
+ @ApiOperation("删除")
+ @LogOperation("Delete Menu")
+ public Result delete(@PathVariable("id") Long id){
+ //效验数据
+ AssertUtils.isNull(id, "id");
+
+ //判断是否有子菜单或按钮
+ List list = sysMenuService.getListPid(id);
+ if(list.size() > 0){
+ return new Result().error(ErrorCode.SUB_MENU_EXIST);
+ }
+
+ sysMenuService.delete(id);
+
+ return new Result();
+ }
+
+ @GetMapping("select")
+ @ApiOperation("角色菜单权限")
+ public Result> select(@ApiIgnore UserDetail userDetail){
+ List list = sysMenuService.getUserMenuList(userDetail, null);
+
+ return new Result>().ok(list);
+ }
+
+}
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysParamsController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysParamsController.java
new file mode 100644
index 0000000..2ca0ba6
--- /dev/null
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysParamsController.java
@@ -0,0 +1,138 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.annotation.LogOperation;
+import com.elink.esua.epdc.commons.tools.constant.Constant;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.dto.SysParamsDTO;
+import com.elink.esua.epdc.excel.SysParamsExcel;
+import com.elink.esua.epdc.service.SysParamsService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 参数管理
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@RestController
+@RequestMapping("params")
+@Api(tags="参数管理")
+public class SysParamsController {
+ @Autowired
+ private SysParamsService sysParamsService;
+
+ @GetMapping("page")
+ @ApiOperation("分页")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType="int") ,
+ @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
+ @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType="String") ,
+ @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataType="String") ,
+ @ApiImplicitParam(name = "paramCode", value = "参数编码", paramType = "query", dataType="String")
+ })
+ public Result> page(@ApiIgnore @RequestParam Map params){
+ PageData page = sysParamsService.page(params);
+
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ @ApiOperation("信息")
+ public Result get(@PathVariable("id") Long id){
+ SysParamsDTO data = sysParamsService.get(id);
+
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ @ApiOperation("保存")
+ @LogOperation("Save Params")
+ public Result save(@RequestBody SysParamsDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+ sysParamsService.save(dto);
+
+ return new Result();
+ }
+
+ @PutMapping
+ @ApiOperation("修改")
+ @LogOperation("Update Params")
+ public Result update(@RequestBody SysParamsDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+ sysParamsService.update(dto);
+
+ return new Result();
+ }
+
+ @DeleteMapping
+ @ApiOperation("删除")
+ @LogOperation("Delete Params")
+ public Result delete(@RequestBody Long[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+
+ sysParamsService.delete(ids);
+
+ return new Result();
+ }
+
+ @GetMapping("export")
+ @ApiOperation("导出")
+ @LogOperation("Export Params")
+ @ApiImplicitParam(name = "paramCode", value = "参数编码", paramType = "query", dataType="String")
+ public void export(@ApiIgnore @RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = sysParamsService.list(params);
+
+ ExcelUtils.exportExcelToTarget(response, null, list, SysParamsExcel.class);
+ }
+
+ /**
+ * 根据参数编码，获取参数值
+ * @param paramCode 参数编码
+ * @return 返回参数值
+ */
+ @GetMapping("code/{paramCode}")
+ public String getValue(@PathVariable("paramCode") String paramCode){
+ return sysParamsService.getValue(paramCode);
+ }
+
+ /**
+ * 根据参数编码，更新参数值
+ * @param paramCode 参数编码
+ * @param paramValue 参数值
+ */
+ @PutMapping("code/{paramCode}")
+ public void updateValueByCode(@PathVariable("paramCode") String paramCode, @RequestParam("paramValue") String paramValue){
+ sysParamsService.updateValueByCode(paramCode, paramValue);
+ }
+}
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysResourceController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysResourceController.java
new file mode 100644
index 0000000..1fcf07d
--- /dev/null
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysResourceController.java
@@ -0,0 +1,41 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.security.bo.ResourceBO;
+import com.elink.esua.epdc.service.SysResourceService;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 资源管理
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@RestController
+@RequestMapping("resource")
+@Api(tags="资源管理")
+public class SysResourceController {
+ @Autowired
+ private SysResourceService sysResourceService;
+
+ /**
+ * 获取所有资源列表
+ */
+ @GetMapping("list")
+ public List list(){
+ return sysResourceService.getResourceList();
+ }
+}
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysRoleController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysRoleController.java
new file mode 100644
index 0000000..c284327
--- /dev/null
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysRoleController.java
@@ -0,0 +1,136 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.annotation.LogOperation;
+import com.elink.esua.epdc.commons.tools.constant.Constant;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.dto.SysRoleDTO;
+import com.elink.esua.epdc.service.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+ /**
+ * 角色管理
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@RestController
+@RequestMapping("role")
+@Api(tags="角色管理")
+public class SysRoleController {
+ @Autowired
+ private SysRoleService sysRoleService;
+ @Autowired
+ private SysRoleMenuService sysRoleMenuService;
+ @Autowired
+ private SysRoleDataScopeService sysRoleDataScopeService;
+ @Autowired
+ private AppRoleMenuService appRoleMenuService;
+ @Autowired
+ private SysAnalysisRoleMenuService sysAnalysisRoleMenuService;
+
+ @GetMapping("page")
+ @ApiOperation("分页")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType="int") ,
+ @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
+ @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType="String") ,
+ @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataType="String") ,
+ @ApiImplicitParam(name = "name", value = "角色名", paramType = "query", dataType="String")
+ })
+ public Result> page(@ApiIgnore @RequestParam Map params){
+ PageData page = sysRoleService.page(params);
+
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("list")
+ @ApiOperation("列表")
+ public Result> list(){
+ List data = sysRoleService.list(new HashMap<>(1));
+
+ return new Result>().ok(data);
+ }
+
+ @GetMapping("{id}")
+ @ApiOperation("信息")
+ public Result get(@PathVariable("id") Long id){
+ SysRoleDTO data = sysRoleService.get(id);
+
+ //查询角色对应的菜单
+ List menuIdList = sysRoleMenuService.getMenuIdList(id);
+ data.setMenuIdList(menuIdList);
+
+ //查询角色对应的数据权限
+ List deptIdList = sysRoleDataScopeService.getDeptIdList(id);
+ data.setDeptIdList(deptIdList);
+
+ //查询角色对应app菜单权限
+ List appMenuIdList = appRoleMenuService.getAppMenuIdList(id);
+ data.setAppMenuIdList(appMenuIdList);
+ //查询角色对应数据端菜单权限
+ List analysisMenuIdList = sysAnalysisRoleMenuService.getAnalysisMenuIdList(id);
+ data.setAnalysisMenuIdList(analysisMenuIdList);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ @ApiOperation("保存")
+ @LogOperation("Save Role")
+ public Result save(@RequestBody SysRoleDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+ sysRoleService.save(dto);
+
+ return new Result();
+ }
+
+ @PutMapping
+ @ApiOperation("修改")
+ @LogOperation("Update Role")
+ public Result update(@RequestBody SysRoleDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+ sysRoleService.update(dto);
+
+ return new Result();
+ }
+
+ @DeleteMapping
+ @ApiOperation("删除")
+ @LogOperation("Delete Role")
+ public Result delete(@RequestBody Long[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+
+ sysRoleService.delete(ids);
+
+ return new Result();
+ }
+
+}
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysUserController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysUserController.java
new file mode 100644
index 0000000..2de0726
--- /dev/null
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysUserController.java
@@ -0,0 +1,466 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.annotation.LogOperation;
+import com.elink.esua.epdc.commons.tools.constant.Constant;
+import com.elink.esua.epdc.commons.tools.exception.ErrorCode;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.security.bo.ResourceBO;
+import com.elink.esua.epdc.commons.tools.security.password.PasswordUtils;
+import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
+import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
+import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
+import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.dto.*;
+import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO;
+import com.elink.esua.epdc.excel.SysUserExcel;
+import com.elink.esua.epdc.service.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 用户管理
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@RestController
+@RequestMapping("user")
+@Api(tags = "用户管理")
+public class SysUserController {
+ @Autowired
+ private SysUserService sysUserService;
+ @Autowired
+ private SysRoleUserService sysRoleUserService;
+ @Autowired
+ private SysRoleDataScopeService sysRoleDataScopeService;
+ @Autowired
+ private SysResourceService sysResourceService;
+ @Autowired
+ private SysDeptService sysDeptService;
+
+ @GetMapping("page")
+ @ApiOperation("分页")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType = "int"),
+ @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query", required = true, dataType = "int"),
+ @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "username", value = "用户名", paramType = "query", dataType = "String")
+ })
+ public Result> page(@ApiIgnore @RequestParam Map params) {
+ PageData page = sysUserService.page(params);
+
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ @ApiOperation("信息")
+ public Result get(@PathVariable("id") Long id) {
+ SysUserDTO data = sysUserService.get(id);
+
+ //用户角色列表
+ List roleIdList = sysRoleUserService.getRoleIdList(id);
+ data.setRoleIdList(roleIdList);
+
+ return new Result().ok(data);
+ }
+
+ /**
+ * @param userId
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @Author yinzuomei
+ * @Description 查询用户角色Id
+ * @Date 2020/2/3 8:13
+ **/
+ @GetMapping("getRoleIdList/{userId}")
+ public Result> getRoleIdList(@PathVariable("userId") Long userId) {
+ //用户角色列表
+ List roleIdList = sysRoleUserService.getRoleIdList(userId);
+ return new Result>().ok(roleIdList);
+ }
+
+ @GetMapping("info")
+ @ApiOperation("登录用户信息")
+ public Result info(@ApiIgnore UserDetail user) {
+ SysUserDTO data = ConvertUtils.sourceToTarget(user, SysUserDTO.class);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ @ApiOperation("保存")
+ @LogOperation("Save User")
+ public Result save(@RequestBody SysUserDTO dto) {
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+ sysUserService.save(dto);
+
+ return new Result();
+ }
+
+ @PutMapping
+ @ApiOperation("修改")
+ @LogOperation("Update User")
+ public Result update(@RequestBody SysUserDTO dto) {
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+ sysUserService.update(dto);
+
+ return new Result();
+ }
+
+ @PutMapping("password")
+ @ApiOperation("修改密码")
+ @LogOperation("Password User")
+ public Result password(@RequestBody PasswordDTO dto) {
+ //效验数据
+ ValidatorUtils.validateEntity(dto);
+
+ UserDetail user = SecurityUser.getUser();
+
+ //原密码不正确
+ if (!PasswordUtils.matches(dto.getPassword(), user.getPassword())) {
+ return new Result().error(ErrorCode.PASSWORD_ERROR);
+ }
+
+ sysUserService.updatePassword(user.getId(), dto.getNewPassword());
+
+ return new Result();
+ }
+
+ @DeleteMapping
+ @ApiOperation("删除")
+ @LogOperation("Delete User")
+ public Result delete(@RequestBody Long[] ids) {
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+
+ sysUserService.delete(ids);
+
+ return new Result();
+ }
+
+ @GetMapping("export")
+ @ApiOperation("导出")
+ @LogOperation("Export User")
+ @ApiImplicitParam(name = "username", value = "用户名", paramType = "query", dataType = "String")
+ public void export(@ApiIgnore @RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = sysUserService.list(params);
+
+ ExcelUtils.exportExcelToTarget(response, null, list, SysUserExcel.class);
+ }
+
+ /**
+ * 根据用户名，获取用户信息
+ */
+ @GetMapping("getByUsername")
+ public Result getByUsername(String username) {
+ SysUserDTO user = sysUserService.getByUsername(username);
+
+ UserDetail userDetail = ConvertUtils.sourceToTarget(user, UserDetail.class);
+ //初始化用户数据
+ initUserData(userDetail);
+
+ return new Result().ok(userDetail);
+ }
+
+ /**
+ * 根据用户ID，获取用户信息
+ */
+ @GetMapping("getById")
+ public Result getById(Long id) {
+ SysUserDTO user = sysUserService.get(id);
+
+ UserDetail userDetail = ConvertUtils.sourceToTarget(user, UserDetail.class);
+ //初始化用户数据
+ initUserData(userDetail);
+
+ return new Result().ok(userDetail);
+ }
+
+ /**
+ * 根据openId获取用户信息
+ *
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @params [openId]
+ * @author liuchuang
+ * @since 2019/11/20 13:54
+ */
+ @GetMapping("getUserInfo/{openId}")
+ public Result getSysUserInfoByOpenId(@PathVariable("openId") String openId) {
+ SysUserDTO data = sysUserService.getSysUserInfoByOpenId(openId);
+
+ return new Result().ok(data);
+ }
+
+ /**
+ * 根据用户ID 获取用户角色权限信息
+ *
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @params [id]
+ * @author liuchuang
+ * @since 2019/11/19 23:36
+ */
+ @GetMapping("getDataScope")
+ public Result> getDataScopeList(Long id) {
+ List data = sysRoleDataScopeService.getDataScopeDetailList(id);
+
+ return new Result>().ok(data);
+ }
+ @GetMapping("getWorkRecordRoleUser/{menuCode}")
+ public Result> getWorkRecordRoleUser(@PathVariable("menuCode") String menuCode) {
+ List data = sysRoleUserService.getWorkRecordRoleUser(menuCode);
+
+ return new Result>().ok(data);
+ }
+
+ /**
+ * 根据用户名更新用户微信openId
+ *
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @params [sysUserOpenIdFormDto]
+ * @author liuchuang
+ * @since 2019/11/20 9:52
+ */
+ @PostMapping("modifyOpenId")
+ public Result modifyOpenIdByUsername(@RequestBody SysUserOpenIdFormDTO sysUserOpenIdFormDto) {
+ //效验数据
+ ValidatorUtils.validateEntity(sysUserOpenIdFormDto);
+ return sysUserService.modifyOpenIdByUsername(sysUserOpenIdFormDto);
+ }
+
+ /**
+ * 初始化用户数据
+ */
+ private void initUserData(UserDetail userDetail) {
+ if (userDetail == null) {
+ return;
+ }
+
+ //用户机构类型键值
+ SysDeptDTO deptDto = sysDeptService.get(userDetail.getDeptId());
+ if (null != deptDto) {
+ userDetail.setTypeKey(deptDto.getTypeKey());
+ }
+
+ //用户部门数据权限
+ List deptIdList = sysRoleDataScopeService.getDataScopeList(userDetail.getId());
+ userDetail.setDeptIdList(deptIdList);
+
+ //用户资源列表
+ List resourceList = sysResourceService.getUserResourceList(userDetail.getId());
+ userDetail.setResourceList(resourceList);
+ }
+
+ /**
+ * 网格长注册时，根据手机号，查询网格长管理的所有网格
+ *
+ * @param mobile
+ * @return java.util.List
+ * @author work@yujt.net.cn
+ * @date 2019/10/22 16:18
+ */
+ @GetMapping("/listGridForLeader/{mobile}")
+ public Result listGridWhileLeaderRegister(@PathVariable("mobile") String mobile) {
+ return sysUserService.listGridWhileLeaderRegister(mobile);
+ }
+
+ /**
+ * 获取部门下的所有用户ID
+ *
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @params [deptId]
+ * @author liuchuang
+ * @since 2019/10/29 17:31
+ */
+ @GetMapping("ids/{deptId}")
+ public Result> getUserIdsByDeptIds(@PathVariable("deptId") Long deptId) {
+ List data = sysUserService.listOfUserIdsByDeptId(deptId);
+ return new Result>().ok(data);
+ }
+
+ /**
+ * 组装用户部门多层结构
+ * auth模块调用，用户登录时，获取用户机构权限，返回页面组装下拉菜单所需数据，保存在redis
+ * 组装三层，街道-社区-网格
+ *
+ * @param userId
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @author work@yujt.net.cn
+ * @date 2019/11/27 14:31
+ */
+ @GetMapping("packageOption/{userId}")
+ public Result packageUserDeptOption(@PathVariable("userId") Long userId) {
+ sysDeptService.packageUserDeptOption(userId);
+ return new Result();
+ }
+
+ /**
+ * 获取用户部门多层结构，用户前端显示，请求需携带token
+ * 调接口，从redis获取{@link SysUserController#packageUserDeptOption(Long)}接口生成的数据。
+ * 此接口展示三级机构层级（街道-社区-网格），不包括区级
+ *
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @author work@yujt.net.cn
+ * @date 2019/11/27 14:31
+ */
+ @GetMapping("deptOptions/getByLoginUser")
+ public Result
+