'修改完成'

service-system/service-system-biz/pom.xml

@@ -108,6 +108,12 @@
             <artifactId>ruoyi-common-security</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <build>

service-system/service-system-biz/src/main/java/com/usky/system/RuoYiSystemApplication.java

@@ -6,6 +6,7 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
 
 /**
  * 系统模块
@@ -14,6 +15,7 @@ import org.springframework.context.annotation.ComponentScan;
  */
 
 
+@EnableAspectJAutoProxy(proxyTargetClass = true, exposeProxy = true)
 @EnableFeignClients(basePackages = {"com.usky"})
 @MapperScan(value = "com.usky.system.mapper")
 @ComponentScan(basePackages = {"com.usky"})

service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysConfigController.java

@@ -1,6 +1,7 @@
 package com.usky.system.controller.web;
 
 
+import com.ruoyi.common.security.utils.SecurityUtils;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.exception.BusinessErrorCode;
 import com.usky.system.controller.web.page.TableDataInfo;
@@ -8,7 +9,6 @@ import com.usky.system.domain.SysConfig;
 import com.usky.system.domain.constants.UserConstants;
 import com.usky.system.service.ISysConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
-
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -21,7 +21,7 @@ import java.util.List;
  * @author yq
  */
 @RestController
-@RequestMapping("/system/config")
+@RequestMapping("/config")
 public class SysConfigController extends BaseController
 {
     @Autowired
@@ -66,7 +66,7 @@ public class SysConfigController extends BaseController
         {
             return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "新增参数'" + config.getConfigName() + "'失败，参数键名已存在");
         }
-//        config.setCreateBy(SecurityUtils.getUsername());
+        config.setCreateBy(SecurityUtils.getUsername());
         return toAjax(configService.insertConfig(config));
     }
 
@@ -80,7 +80,7 @@ public class SysConfigController extends BaseController
         {
             return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "修改参数'" + config.getConfigName() + "'失败，参数键名已存在");
         }
-//        config.setUpdateBy(SecurityUtils.getUsername());
+        config.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(configService.updateConfig(config));
     }
 

service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysDeptController.java

@@ -1,7 +1,7 @@
 package com.usky.system.controller.web;
 
 
-
+import com.ruoyi.common.security.utils.SecurityUtils;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.exception.BusinessErrorCode;
 import com.usky.common.core.util.StringUtils;
@@ -25,7 +25,7 @@ import java.util.Map;
  * @author yq
  */
 @RestController
-@RequestMapping("/system/dept")
+@RequestMapping("/dept")
 public class SysDeptController extends BaseController
 {
     @Autowired
@@ -103,7 +103,7 @@ public class SysDeptController extends BaseController
         {
             return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
         }
-//        dept.setCreateBy(SecurityUtils.getUsername());
+        dept.setCreateBy(SecurityUtils.getUsername());
         return toAjax(deptService.insertDept(dept));
     }
 
@@ -126,7 +126,7 @@ public class SysDeptController extends BaseController
         {
             return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "该部门包含未停用的子部门！");
         }
-//        dept.setUpdateBy(SecurityUtils.getUsername());
+        dept.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(deptService.updateDept(dept));
     }
 

service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysDictDataController.java

@@ -1,10 +1,10 @@
 package com.usky.system.controller.web;
 
 
-
+import com.ruoyi.common.security.utils.SecurityUtils;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.system.controller.web.page.TableDataInfo;
-import com.usky.system.domain.SysDictDataVO;
+import com.usky.system.domain.SysDictData;
 import com.usky.system.service.ISysDictDataService;
 import com.usky.system.service.ISysDictTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,7 +22,7 @@ import java.util.Objects;
  * @author yq
  */
 @RestController
-@RequestMapping("/system/dict/data")
+@RequestMapping("/dict/data")
 public class SysDictDataController extends BaseController
 {
     @Autowired
@@ -32,10 +32,10 @@ public class SysDictDataController extends BaseController
     private ISysDictTypeService dictTypeService;
 
     @GetMapping("/list")
-    public ApiResult<TableDataInfo> list(SysDictDataVO dictData)
+    public ApiResult<TableDataInfo> list(SysDictData dictData)
     {
         startPage();
-        List<SysDictDataVO> list = dictDataService.selectDictDataList(dictData);
+        List<SysDictData> list = dictDataService.selectDictDataList(dictData);
         return ApiResult.success(getDataTable(list));
     }
 
@@ -54,10 +54,10 @@ public class SysDictDataController extends BaseController
     @GetMapping(value = "/type/{dictType}")
     public ApiResult dictType(@PathVariable String dictType)
     {
-        List<SysDictDataVO> data = dictTypeService.selectDictDataByType(dictType);
+        List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
         if (Objects.isNull(data))
         {
-            data = new ArrayList<SysDictDataVO>();
+            data = new ArrayList<SysDictData>();
         }
         return ApiResult.success(data);
     }
@@ -66,9 +66,9 @@ public class SysDictDataController extends BaseController
      * 新增字典类型
      */
     @PostMapping
-    public ApiResult add(@Validated @RequestBody SysDictDataVO dict)
+    public ApiResult add(@Validated @RequestBody SysDictData dict)
     {
-//        dict.setCreateBy(SecurityUtils.getUsername());
+        dict.setCreateBy(SecurityUtils.getUsername());
         return toAjax(dictDataService.insertDictData(dict));
     }
 
@@ -76,9 +76,9 @@ public class SysDictDataController extends BaseController
      * 修改保存字典类型
      */
     @PutMapping
-    public ApiResult edit(@Validated @RequestBody SysDictDataVO dict)
+    public ApiResult edit(@Validated @RequestBody SysDictData dict)
     {
-//        dict.setUpdateBy(SecurityUtils.getUsername());
+        dict.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(dictDataService.updateDictData(dict));
     }
 

service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysDictTypeController.java

@@ -1,11 +1,11 @@
 package com.usky.system.controller.web;
 
 
-
+import com.ruoyi.common.security.utils.SecurityUtils;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.exception.BusinessErrorCode;
 import com.usky.system.controller.web.page.TableDataInfo;
-import com.usky.system.domain.SysDictTypeVO;
+import com.usky.system.domain.SysDictType;
 import com.usky.system.domain.constants.UserConstants;
 import com.usky.system.service.ISysDictTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,7 +20,7 @@ import java.util.List;
  * @author yq
  */
 @RestController
-@RequestMapping("/system/dict/type")
+@RequestMapping("/dict/type")
 public class SysDictTypeController extends BaseController
 {
     @Autowired
@@ -28,10 +28,10 @@ public class SysDictTypeController extends BaseController
 
 
     @GetMapping("/list")
-    public ApiResult<TableDataInfo> list(SysDictTypeVO dictType)
+    public ApiResult<TableDataInfo> list(SysDictType dictType)
     {
         startPage();
-        List<SysDictTypeVO> list = dictTypeService.selectDictTypeList(dictType);
+        List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
         return ApiResult.success(getDataTable(list));
     }
 
@@ -48,13 +48,13 @@ public class SysDictTypeController extends BaseController
      * 新增字典类型
      */
     @PostMapping
-    public ApiResult add(@Validated @RequestBody SysDictTypeVO dict)
+    public ApiResult add(@Validated @RequestBody SysDictType dict)
     {
         if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict)))
         {
             return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "新增字典'" + dict.getDictName() + "'失败，字典类型已存在");
         }
-//        dict.setCreateBy(SecurityUtils.getUsername());
+        dict.setCreateBy(SecurityUtils.getUsername());
         return toAjax(dictTypeService.insertDictType(dict));
     }
 
@@ -62,13 +62,13 @@ public class SysDictTypeController extends BaseController
      * 修改字典类型
      */
     @PutMapping
-    public ApiResult edit(@Validated @RequestBody SysDictTypeVO dict)
+    public ApiResult edit(@Validated @RequestBody SysDictType dict)
     {
         if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict)))
         {
             return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "修改字典'" + dict.getDictName() + "'失败，字典类型已存在");
         }
-//        dict.setUpdateBy(SecurityUtils.getUsername());
+
         return toAjax(dictTypeService.updateDictType(dict));
     }
 
@@ -98,7 +98,7 @@ public class SysDictTypeController extends BaseController
     @GetMapping("/optionselect")
     public ApiResult optionselect()
     {
-        List<SysDictTypeVO> dictTypes = dictTypeService.selectDictTypeAll();
+        List<SysDictType> dictTypes = dictTypeService.selectDictTypeAll();
         return ApiResult.success(dictTypes);
     }
 }

service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysLogininforController.java

@@ -24,11 +24,11 @@ public class SysLogininforController extends BaseController
 
 
     @GetMapping("/list")
-    public TableDataInfo list(SysLogininfor logininfor)
+    public ApiResult<TableDataInfo> list(SysLogininfor logininfor)
     {
         startPage();
         List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
-        return getDataTable(list);
+        return ApiResult.success(getDataTable(list));
     }
 
 

service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysMenuController.java

@@ -1,13 +1,16 @@
 package com.usky.system.controller.web;
 
 
-
+import com.ruoyi.common.core.utils.ServletUtils;
+import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.common.security.utils.SecurityUtils;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.constants.CommonConst;
 import com.usky.common.core.exception.BusinessErrorCode;
 import com.usky.common.core.util.StringUtils;
 import com.usky.system.domain.SysMenu;
 import com.usky.system.domain.constants.UserConstants;
+import com.usky.system.model.LoginUser;
 import com.usky.system.service.ISysMenuService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -24,12 +27,14 @@ import java.util.Map;
  * @author yq
  */
 @RestController
-@RequestMapping("/system/menu")
+@RequestMapping("/menu")
 public class SysMenuController extends BaseController
 {
     @Autowired
     private ISysMenuService menuService;
 
+    @Autowired
+    private TokenService tokenService;
 
     /**
      * 获取菜单列表
@@ -37,9 +42,8 @@ public class SysMenuController extends BaseController
     @GetMapping("/list")
     public ApiResult list(SysMenu menu)
     {
-//        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-//        Long userId = loginUser.getUser().getUserId();
-        Long userId = 1L;
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        Long userId = loginUser.getUserid();
         List<SysMenu> menus = menuService.selectMenuList(menu, userId);
         return ApiResult.success(menus);
     }
@@ -59,9 +63,7 @@ public class SysMenuController extends BaseController
     @GetMapping("/treeselect")
     public ApiResult treeselect(SysMenu menu)
     {
-//        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-//        Long userId = loginUser.getUser().getUserId();
-        Long userId = 1L;
+        Long userId = SecurityUtils.getUserId();
         List<SysMenu> menus = menuService.selectMenuList(menu, userId);
         return ApiResult.success(menuService.buildMenuTreeSelect(menus));
     }
@@ -72,8 +74,7 @@ public class SysMenuController extends BaseController
     @GetMapping(value = "/roleMenuTreeselect/{roleId}")
     public ApiResult roleMenuTreeselect(@PathVariable("roleId") Long roleId)
     {
-//        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        Long userId = 1L;
+        Long userId = SecurityUtils.getUserId();
         List<SysMenu> menus = menuService.selectMenuList(userId);
         Map<String,Object> ajax = new HashMap<>();
         ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
@@ -96,7 +97,7 @@ public class SysMenuController extends BaseController
         {
             return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
         }
-//        menu.setCreateBy(SecurityUtils.getUsername());
+        menu.setCreateBy(SecurityUtils.getUsername());
         return toAjax(menuService.insertMenu(menu));
     }
 
@@ -119,7 +120,7 @@ public class SysMenuController extends BaseController
         {
             return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "新增菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己");
         }
-//        menu.setUpdateBy(SecurityUtils.getUsername());
+        menu.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(menuService.updateMenu(menu));
     }
 
@@ -139,4 +140,18 @@ public class SysMenuController extends BaseController
         }
         return toAjax(menuService.deleteMenuById(menuId));
     }
+
+
+    /**
+     * 获取路由信息
+     *
+     * @return 路由信息
+     */
+    @GetMapping("getRouters")
+    public ApiResult getRouters()
+    {
+        Long userId = SecurityUtils.getUserId();
+        List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
+        return ApiResult.success(menuService.buildMenus(menus));
+    }
 }

service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysNoticeController.java

@@ -0,0 +1,78 @@
+package com.usky.system.controller.web;
+
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.usky.common.core.bean.ApiResult;
+import com.usky.system.domain.SysNotice;
+import com.usky.system.service.ISysNoticeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 公告 信息操作处理
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/notice")
+public class SysNoticeController extends BaseController
+{
+    @Autowired
+    private ISysNoticeService noticeService;
+
+    /**
+     * 获取通知公告列表
+     */
+    @RequiresPermissions("system:notice:list")
+    @GetMapping("/list")
+    public ApiResult<TableDataInfo> list(SysNotice notice)
+    {
+        startPage();
+        List<SysNotice> list = noticeService.selectNoticeList(notice);
+        return ApiResult.success(getDataTable(list));
+    }
+
+    /**
+     * 根据通知公告编号获取详细信息
+     */
+    @RequiresPermissions("system:notice:query")
+    @GetMapping(value = "/{noticeId}")
+    public ApiResult getInfo(@PathVariable Long noticeId)
+    {
+        return ApiResult.success(noticeService.selectNoticeById(noticeId));
+    }
+
+    /**
+     * 新增通知公告
+     */
+    @PostMapping
+    public ApiResult add(@Validated @RequestBody SysNotice notice)
+    {
+        notice.setCreateBy(SecurityUtils.getUsername());
+        return ApiResult.success(toAjax(noticeService.insertNotice(notice)));
+    }
+
+    /**
+     * 修改通知公告
+     */
+    @PutMapping
+    public ApiResult edit(@Validated @RequestBody SysNotice notice)
+    {
+        notice.setUpdateBy(SecurityUtils.getUsername());
+        return ApiResult.success(toAjax(noticeService.updateNotice(notice)));
+    }
+
+    /**
+     * 删除通知公告
+     */
+    @DeleteMapping("/{noticeIds}")
+    public ApiResult remove(@PathVariable Long[] noticeIds)
+    {
+        return ApiResult.success(toAjax(noticeService.deleteNoticeByIds(noticeIds)));
+    }
+}

service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysOperlogController.java

@@ -3,7 +3,7 @@ package com.usky.system.controller.web;
 
 import com.usky.common.core.bean.ApiResult;
 import com.usky.system.controller.web.page.TableDataInfo;
-import com.usky.system.domain.SysOperLogVO;
+import com.usky.system.domain.SysOperLog;
 import com.usky.system.service.ISysOperLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -23,11 +23,11 @@ public class SysOperlogController extends BaseController
     private ISysOperLogService operLogService;
 
     @GetMapping("/list")
-    public TableDataInfo list(SysOperLogVO operLog)
+    public ApiResult<TableDataInfo> list(SysOperLog operLog)
     {
         startPage();
-        List<SysOperLogVO> list = operLogService.selectOperLogList(operLog);
-        return getDataTable(list);
+        List<SysOperLog> list = operLogService.selectOperLogList(operLog);
+        return ApiResult.success(getDataTable(list));
     }
 
 
@@ -46,7 +46,7 @@ public class SysOperlogController extends BaseController
     }
 
     @PostMapping
-    public ApiResult<Void> add(@RequestBody SysOperLogVO operLog)
+    public ApiResult<Void> add(@RequestBody SysOperLog operLog)
     {
         operLogService.insertOperlog(operLog);
         return ApiResult.success();

service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysPostController.java

@@ -1,7 +1,7 @@
 package com.usky.system.controller.web;
 
 
-
+import com.ruoyi.common.security.utils.SecurityUtils;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.exception.BusinessErrorCode;
 import com.usky.system.controller.web.page.TableDataInfo;
@@ -21,7 +21,7 @@ import java.util.List;
  * @author yq
  */
 @RestController
-@RequestMapping("/system/post")
+@RequestMapping("/post")
 public class SysPostController extends BaseController
 {
     @Autowired
@@ -61,7 +61,7 @@ public class SysPostController extends BaseController
         {
             return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "新增岗位'" + post.getPostName() + "'失败，岗位编码已存在");
         }
-//        post.setCreateBy(SecurityUtils.getUsername());
+        post.setCreateBy(SecurityUtils.getUsername());
         return toAjax(postService.insertPost(post));
     }
 
@@ -80,7 +80,7 @@ public class SysPostController extends BaseController
         {
             return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "修改岗位'" + post.getPostName() + "'失败，岗位编码已存在");
         }
-//        post.setUpdateBy(SecurityUtils.getUsername());
+        post.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(postService.updatePost(post));
     }
 

service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysRoleController.java

@@ -1,11 +1,11 @@
 package com.usky.system.controller.web;
 
 
-
+import com.ruoyi.common.security.utils.SecurityUtils;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.exception.BusinessErrorCode;
 import com.usky.system.controller.web.page.TableDataInfo;
-import com.usky.system.domain.SysRoleVO;
+import com.usky.system.domain.SysRole;
 import com.usky.system.domain.SysUser;
 import com.usky.system.domain.SysUserRole;
 import com.usky.system.domain.constants.UserConstants;
@@ -25,7 +25,7 @@ import java.util.List;
  * @author yq
  */
 @RestController
-@RequestMapping("/system/role")
+@RequestMapping("/role")
 public class SysRoleController extends BaseController
 {
     @Autowired
@@ -38,10 +38,10 @@ public class SysRoleController extends BaseController
     private ISysUserService userService;
 
     @GetMapping("/list")
-    public ApiResult<TableDataInfo> list(SysRoleVO role)
+    public ApiResult<TableDataInfo> list(SysRole role)
     {
         startPage();
-        List<SysRoleVO> list = roleService.selectRoleList(role);
+        List<SysRole> list = roleService.selectRoleList(role);
         return ApiResult.success(getDataTable(list));
     }
 
@@ -58,7 +58,7 @@ public class SysRoleController extends BaseController
      * 新增角色
      */
     @PostMapping
-    public ApiResult add(@Validated @RequestBody SysRoleVO role)
+    public ApiResult add(@Validated @RequestBody SysRole role)
     {
         if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
         {
@@ -68,7 +68,7 @@ public class SysRoleController extends BaseController
         {
             return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
         }
-//        role.setCreateBy(SecurityUtils.getUsername());
+        role.setCreateBy(SecurityUtils.getUsername());
         return toAjax(roleService.insertRole(role));
 
     }
@@ -77,7 +77,7 @@ public class SysRoleController extends BaseController
      * 修改保存角色
      */
     @PutMapping
-    public ApiResult edit(@Validated @RequestBody SysRoleVO role)
+    public ApiResult edit(@Validated @RequestBody SysRole role)
     {
         roleService.checkRoleAllowed(role);
         if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
@@ -88,7 +88,7 @@ public class SysRoleController extends BaseController
         {
             return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
         }
-//        role.setUpdateBy(SecurityUtils.getUsername());
+        role.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(roleService.updateRole(role));
     }
 
@@ -96,7 +96,7 @@ public class SysRoleController extends BaseController
      * 修改保存数据权限
      */
     @PutMapping("/dataScope")
-    public ApiResult dataScope(@RequestBody SysRoleVO role)
+    public ApiResult dataScope(@RequestBody SysRole role)
     {
         roleService.checkRoleAllowed(role);
         return toAjax(roleService.authDataScope(role));
@@ -106,10 +106,10 @@ public class SysRoleController extends BaseController
      * 状态修改
      */
     @PutMapping("/changeStatus")
-    public ApiResult changeStatus(@RequestBody SysRoleVO role)
+    public ApiResult changeStatus(@RequestBody SysRole role)
     {
         roleService.checkRoleAllowed(role);
-//        role.setUpdateBy(SecurityUtils.getUsername());
+        role.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(roleService.updateRoleStatus(role));
     }
 

service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysUserController.java

@@ -1,12 +1,12 @@
 package com.usky.system.controller.web;
 
 
-
+import com.ruoyi.common.security.utils.SecurityUtils;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.exception.BusinessErrorCode;
 import com.usky.common.core.util.StringUtils;
 import com.usky.system.controller.web.page.TableDataInfo;
-import com.usky.system.domain.SysRoleVO;
+import com.usky.system.domain.SysRole;
 import com.usky.system.domain.SysUser;
 import com.usky.system.domain.constants.UserConstants;
 import com.usky.system.service.ISysPostService;
@@ -29,7 +29,7 @@ import java.util.stream.Collectors;
  * @author yq
  */
 @RestController
-@RequestMapping("/system/user")
+@RequestMapping("/user")
 public class SysUserController extends BaseController
 {
     @Autowired
@@ -59,7 +59,7 @@ public class SysUserController extends BaseController
     public ApiResult<Map<String,Object>> getInfo(@PathVariable(value = "userId", required = false) Long userId)
     {
         Map<String,Object> ajax = new HashMap<>();
-        List<SysRoleVO> roles = roleService.selectRoleAll();
+        List<SysRole> roles = roleService.selectRoleAll();
         ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
         ajax.put("posts", postService.selectPostAll());
         if (Objects.nonNull(userId))
@@ -92,8 +92,8 @@ public class SysUserController extends BaseController
         {
             return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
-//        user.setCreateBy(SecurityUtils.getUsername());
-//        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+        user.setCreateBy(SecurityUtils.getUsername());
+        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
         int row = userService.insertUser(user);
         return toAjax(row);
     }
@@ -116,7 +116,7 @@ public class SysUserController extends BaseController
         {
             return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
-//        user.setUpdateBy(SecurityUtils.getUsername());
+        user.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(userService.updateUser(user));
     }
 
@@ -136,8 +136,8 @@ public class SysUserController extends BaseController
     public ApiResult<Void> resetPwd(@RequestBody SysUser user)
     {
         userService.checkUserAllowed(user);
-//        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
-//        user.setUpdateBy(SecurityUtils.getUsername());
+        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+        user.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(userService.resetPwd(user));
     }
 
@@ -148,7 +148,7 @@ public class SysUserController extends BaseController
     public ApiResult<Void> changeStatus(@RequestBody SysUser user)
     {
         userService.checkUserAllowed(user);
-//        user.setUpdateBy(SecurityUtils.getUsername());
+        user.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(userService.updateUserStatus(user));
     }
 
@@ -160,7 +160,7 @@ public class SysUserController extends BaseController
     {
         Map<String,Object> ajax = new HashMap<>();
         SysUser user = userService.selectUserById(userId);
-        List<SysRoleVO> roles = roleService.selectRolesByUserId(userId);
+        List<SysRole> roles = roleService.selectRolesByUserId(userId);
         ajax.put("user", user);
         ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
         return ApiResult.success(ajax);

service-system/service-system-biz/src/main/java/com/usky/system/controller/web/TestController.java

@@ -1,8 +1,5 @@
 package com.usky.system.controller.web;
 
-import com.usky.system.domain.SysConfig;
-import com.usky.system.service.*;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -14,37 +11,4 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/test")
 public class TestController {
 
-    @Autowired
-    private ISysConfigService sysConfigService;
-    @Autowired
-    private ISysUserService sysUserService;
-    @Autowired
-    private ISysDeptService sysDeptService;
-    @Autowired
-    private ISysDictTypeService sysDictTypeService;
-    @Autowired
-    private ISysDictDataService sysDictDataService;
-    @Autowired
-    private ISysPostService iSysPostService;
-    @Autowired
-    private ISysMenuService sysMenuService;
-    @Autowired
-    private ISysLogininforService sysLogininforService;
-    @Autowired
-    private ISysOperLogService sysOperLogService;
-
-    @RequestMapping("/test")
-    public void test(){
-        SysConfig byId = sysConfigService.getById(1);
-        sysUserService.getById(1);
-        sysDeptService.getById(1);
-        sysDictTypeService.getById(1);
-        sysDictDataService.getById(1);
-        iSysPostService.getById(1);
-        sysMenuService.getById(1);
-        sysLogininforService.getById(1);
-        sysOperLogService.getById(1);
-
-    }
-
 }

service-system/service-system-biz/src/main/java/com/usky/system/controller/web/TokenController.java

@@ -7,15 +7,17 @@ import com.ruoyi.common.security.service.TokenService;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.system.model.LoginUser;
+import com.usky.system.service.ISysPermissionService;
+import com.usky.system.service.ISysUserService;
 import com.usky.system.service.SysLoginService;
 import com.usky.system.service.vo.LoginBody;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * token 控制
@@ -31,6 +33,12 @@ public class TokenController
     @Autowired
     private SysLoginService sysLoginService;
 
+    @Autowired
+    private ISysUserService sysUserService;
+
+    @Autowired
+    private ISysPermissionService permissionService;
+
     @PostMapping("login")
     public ApiResult<?> login(@RequestBody LoginBody form)
     {
@@ -77,6 +85,27 @@ public class TokenController
         return ApiResult.success();
     }
 
+    /**
+     * 获取用户信息
+     *
+     * @return 用户信息
+     */
+    @GetMapping("getInfo")
+    public ApiResult getInfo()
+    {
+        Long userId = SecurityUtils.getUserId();
+        // 角色集合
+        Set<String> roles = permissionService.getRolePermission(userId);
+        // 权限集合
+        Set<String> permissions = permissionService.getMenuPermission(userId);
+        Map<String,Object> ajax = new HashMap<>();
+        ajax.put("user", sysUserService.selectUserById(userId));
+        ajax.put("roles", roles);
+        ajax.put("permissions", permissions);
+        return ApiResult.success(ajax);
+    }
+
+
 //    @PostMapping("register")
 //    public ApiResult<?> register(@RequestBody RegisterBody registerBody)
 //    {

service-system/service-system-biz/src/main/java/com/usky/system/domain/SysDept.java

@@ -57,28 +57,6 @@ public class SysDept extends BaseEntity
     @TableField(exist = false)
     private String parentName;
 
-    public String getCenterDeptId() {
-        return centerDeptId;
-    }
-
-    public void setCenterDeptId(String centerDeptId) {
-        this.centerDeptId = centerDeptId;
-    }
-
-    /** 中控部门id */
-    private String centerDeptId;
-
-    public String getCenterParentId() {
-        return centerParentId;
-    }
-
-    public void setCenterParentId(String centerParentId) {
-        this.centerParentId = centerParentId;
-    }
-
-    /** 中控父部门id */
-    private String centerParentId;
-    
     /** 子部门 */
     @TableField(exist = false)
     private List<SysDept> children = new ArrayList<SysDept>();

service-system/service-system-biz/src/main/java/com/usky/system/domain/SysLogininfor.java

@@ -1,6 +1,7 @@
 package com.usky.system.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.usky.common.mvc.domain.BaseEntity;
 
 import java.util.Date;
 
@@ -9,7 +10,7 @@ import java.util.Date;
  *
  * @author ruoyi
  */
-public class SysLogininfor
+public class SysLogininfor extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 

service-system/service-system-biz/src/main/java/com/usky/system/domain/SysOperLog.java

@@ -2,6 +2,7 @@ package com.usky.system.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import  com.fasterxml.jackson.annotation.JsonFormat;
+import com.usky.common.mvc.domain.BaseEntity;
 
 import java.util.Date;
 
@@ -11,7 +12,7 @@ import java.util.Date;
  * 
  * @author yq
  */
-public class SysOperLog
+public class SysOperLog extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 

service-system/service-system-biz/src/main/java/com/usky/system/domain/SysUser.java

@@ -87,9 +87,6 @@ public class SysUser extends BaseEntity
     /** 角色ID */
     @TableField(exist = false)
     private Long roleId;
-    /** 中控用户id */
-    private String centerUserId;
-
     public SysUser()
     {
 
@@ -333,12 +330,4 @@ public class SysUser extends BaseEntity
             .append("dept", getDept())
             .toString();
     }
-
-    public String getCenterUserId() {
-        return centerUserId;
-    }
-
-    public void setCenterUserId(String centerUserId) {
-        this.centerUserId = centerUserId;
-    }
 }

service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysDictDataMapper.java

@@ -2,7 +2,7 @@ package com.usky.system.mapper;
 
 
 import com.usky.common.mvc.base.CrudMapper;
-import com.usky.system.domain.SysDictDataVO;
+import com.usky.system.domain.SysDictData;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -15,7 +15,7 @@ import java.util.List;
  * @author yq
  */
 @Repository
-public interface SysDictDataMapper extends CrudMapper<SysDictDataVO>
+public interface SysDictDataMapper extends CrudMapper<SysDictData>
 {
     /**
      * 根据条件分页查询字典数据
@@ -23,7 +23,7 @@ public interface SysDictDataMapper extends CrudMapper<SysDictDataVO>
      * @param dictData 字典数据信息
      * @return 字典数据集合信息
      */
-    public List<SysDictDataVO> selectDictDataList(SysDictDataVO dictData);
+    public List<SysDictData> selectDictDataList(SysDictData dictData);
 
     /**
      * 根据字典类型查询字典数据
@@ -31,7 +31,7 @@ public interface SysDictDataMapper extends CrudMapper<SysDictDataVO>
      * @param dictType 字典类型
      * @return 字典数据集合信息
      */
-    public List<SysDictDataVO> selectDictDataByType(String dictType);
+    public List<SysDictData> selectDictDataByType(String dictType);
 
     /**
      * 根据字典类型和字典键值查询字典数据信息
@@ -48,7 +48,7 @@ public interface SysDictDataMapper extends CrudMapper<SysDictDataVO>
      * @param dictCode 字典数据ID
      * @return 字典数据
      */
-    public SysDictDataVO selectDictDataById(Long dictCode);
+    public SysDictData selectDictDataById(Long dictCode);
 
     /**
      * 查询字典数据
@@ -80,7 +80,7 @@ public interface SysDictDataMapper extends CrudMapper<SysDictDataVO>
      * @param dictData 字典数据信息
      * @return 结果
      */
-    public int insertDictData(SysDictDataVO dictData);
+    public int insertDictData(SysDictData dictData);
 
     /**
      * 修改字典数据信息
@@ -88,7 +88,7 @@ public interface SysDictDataMapper extends CrudMapper<SysDictDataVO>
      * @param dictData 字典数据信息
      * @return 结果
      */
-    public int updateDictData(SysDictDataVO dictData);
+    public int updateDictData(SysDictData dictData);
 
     /**
      * 同步修改字典类型

service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysDictTypeMapper.java

@@ -2,7 +2,7 @@ package com.usky.system.mapper;
 
 
 import com.usky.common.mvc.base.CrudMapper;
-import com.usky.system.domain.SysDictTypeVO;
+import com.usky.system.domain.SysDictType;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -14,7 +14,7 @@ import java.util.List;
  * @author yq
  */
 @Repository
-public interface SysDictTypeMapper extends CrudMapper<SysDictTypeVO>
+public interface SysDictTypeMapper extends CrudMapper<SysDictType>
 {
     /**
      * 根据条件分页查询字典类型
@@ -22,14 +22,14 @@ public interface SysDictTypeMapper extends CrudMapper<SysDictTypeVO>
      * @param dictType 字典类型信息
      * @return 字典类型集合信息
      */
-    public List<SysDictTypeVO> selectDictTypeList(SysDictTypeVO dictType);
+    public List<SysDictType> selectDictTypeList(SysDictType dictType);
 
     /**
      * 根据所有字典类型
      * 
      * @return 字典类型集合信息
      */
-    public List<SysDictTypeVO> selectDictTypeAll();
+    public List<SysDictType> selectDictTypeAll();
 
     /**
      * 根据字典类型ID查询信息
@@ -37,7 +37,7 @@ public interface SysDictTypeMapper extends CrudMapper<SysDictTypeVO>
      * @param dictId 字典类型ID
      * @return 字典类型
      */
-    public SysDictTypeVO selectDictTypeById(Long dictId);
+    public SysDictType selectDictTypeById(Long dictId);
 
     /**
      * 根据字典类型查询信息
@@ -45,7 +45,7 @@ public interface SysDictTypeMapper extends CrudMapper<SysDictTypeVO>
      * @param dictType 字典类型
      * @return 字典类型
      */
-    public SysDictTypeVO selectDictTypeByType(String dictType);
+    public SysDictType selectDictTypeByType(String dictType);
 
     /**
      * 通过字典ID删除字典信息
@@ -69,7 +69,7 @@ public interface SysDictTypeMapper extends CrudMapper<SysDictTypeVO>
      * @param dictType 字典类型信息
      * @return 结果
      */
-    public int insertDictType(SysDictTypeVO dictType);
+    public int insertDictType(SysDictType dictType);
 
     /**
      * 修改字典类型信息
@@ -77,7 +77,7 @@ public interface SysDictTypeMapper extends CrudMapper<SysDictTypeVO>
      * @param dictType 字典类型信息
      * @return 结果
      */
-    public int updateDictType(SysDictTypeVO dictType);
+    public int updateDictType(SysDictType dictType);
 
     /**
      * 校验字典类型称是否唯一
@@ -85,5 +85,5 @@ public interface SysDictTypeMapper extends CrudMapper<SysDictTypeVO>
      * @param dictType 字典类型
      * @return 结果
      */
-    public SysDictTypeVO checkDictTypeUnique(String dictType);
+    public SysDictType checkDictTypeUnique(String dictType);
 }

service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysNoticeMapper.java

@@ -0,0 +1,65 @@
+package com.usky.system.mapper;
+
+
+import com.usky.common.mvc.base.CrudMapper;
+import com.usky.system.domain.SysNotice;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * 通知公告表 数据层
+ * 
+ * @author ruoyi
+ */
+@Repository
+public interface SysNoticeMapper extends CrudMapper<SysNotice>
+{
+    /**
+     * 查询公告信息
+     * 
+     * @param noticeId 公告ID
+     * @return 公告信息
+     */
+    public SysNotice selectNoticeById(Long noticeId);
+
+    /**
+     * 查询公告列表
+     * 
+     * @param notice 公告信息
+     * @return 公告集合
+     */
+    public List<SysNotice> selectNoticeList(SysNotice notice);
+
+    /**
+     * 新增公告
+     * 
+     * @param notice 公告信息
+     * @return 结果
+     */
+    public int insertNotice(SysNotice notice);
+
+    /**
+     * 修改公告
+     * 
+     * @param notice 公告信息
+     * @return 结果
+     */
+    public int updateNotice(SysNotice notice);
+
+    /**
+     * 批量删除公告
+     * 
+     * @param noticeId 公告ID
+     * @return 结果
+     */
+    public int deleteNoticeById(Long noticeId);
+
+    /**
+     * 批量删除公告信息
+     * 
+     * @param noticeIds 需要删除的公告ID
+     * @return 结果
+     */
+    public int deleteNoticeByIds(Long[] noticeIds);
+}

service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysOperLogMapper.java

@@ -2,7 +2,7 @@ package com.usky.system.mapper;
 
 
 import com.usky.common.mvc.base.CrudMapper;
-import com.usky.system.domain.SysOperLogVO;
+import com.usky.system.domain.SysOperLog;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -14,14 +14,14 @@ import java.util.List;
  * @author yq
  */
 @Repository
-public interface SysOperLogMapper extends CrudMapper<SysOperLogVO>
+public interface SysOperLogMapper extends CrudMapper<SysOperLog>
 {
     /**
      * 新增操作日志
      * 
      * @param operLog 操作日志对象
      */
-    public void insertOperlog(SysOperLogVO operLog);
+    public void insertOperlog(SysOperLog operLog);
 
     /**
      * 查询系统操作日志集合
@@ -29,7 +29,7 @@ public interface SysOperLogMapper extends CrudMapper<SysOperLogVO>
      * @param operLog 操作日志对象
      * @return 操作日志集合
      */
-    public List<SysOperLogVO> selectOperLogList(SysOperLogVO operLog);
+    public List<SysOperLog> selectOperLogList(SysOperLog operLog);
 
     /**
      * 批量删除系统操作日志
@@ -45,7 +45,7 @@ public interface SysOperLogMapper extends CrudMapper<SysOperLogVO>
      * @param operId 操作ID
      * @return 操作日志对象
      */
-    public SysOperLogVO selectOperLogById(Long operId);
+    public SysOperLog selectOperLogById(Long operId);
 
     /**
      * 清空操作日志

service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysRoleMapper.java

@@ -2,7 +2,7 @@ package com.usky.system.mapper;
 
 
 import com.usky.common.mvc.base.CrudMapper;
-import com.usky.system.domain.SysRoleVO;
+import com.usky.system.domain.SysRole;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -13,7 +13,7 @@ import java.util.List;
  * @author yq
  */
 @Repository
-public interface SysRoleMapper extends CrudMapper<SysRoleVO>
+public interface SysRoleMapper extends CrudMapper<SysRole>
 {
     /**
      * 根据条件分页查询角色数据
@@ -21,7 +21,7 @@ public interface SysRoleMapper extends CrudMapper<SysRoleVO>
      * @param role 角色信息
      * @return 角色数据集合信息
      */
-    public List<SysRoleVO> selectRoleList(SysRoleVO role);
+    public List<SysRole> selectRoleList(SysRole role);
 
     /**
      * 根据用户ID查询角色
@@ -29,14 +29,14 @@ public interface SysRoleMapper extends CrudMapper<SysRoleVO>
      * @param userId 用户ID
      * @return 角色列表
      */
-    public List<SysRoleVO> selectRolePermissionByUserId(Long userId);
+    public List<SysRole> selectRolePermissionByUserId(Long userId);
 
     /**
      * 查询所有角色
      * 
      * @return 角色列表
      */
-    public List<SysRoleVO> selectRoleAll();
+    public List<SysRole> selectRoleAll();
 
     /**
      * 根据用户ID获取角色选择框列表
@@ -52,7 +52,7 @@ public interface SysRoleMapper extends CrudMapper<SysRoleVO>
      * @param roleId 角色ID
      * @return 角色对象信息
      */
-    public SysRoleVO selectRoleById(Long roleId);
+    public SysRole selectRoleById(Long roleId);
 
     /**
      * 根据用户ID查询角色
@@ -60,7 +60,7 @@ public interface SysRoleMapper extends CrudMapper<SysRoleVO>
      * @param userName 用户名
      * @return 角色列表
      */
-    public List<SysRoleVO> selectRolesByUserName(String userName);
+    public List<SysRole> selectRolesByUserName(String userName);
 
     /**
      * 校验角色名称是否唯一
@@ -68,7 +68,7 @@ public interface SysRoleMapper extends CrudMapper<SysRoleVO>
      * @param roleName 角色名称
      * @return 角色信息
      */
-    public SysRoleVO checkRoleNameUnique(String roleName);
+    public SysRole checkRoleNameUnique(String roleName);
 
     /**
      * 校验角色权限是否唯一
@@ -76,7 +76,7 @@ public interface SysRoleMapper extends CrudMapper<SysRoleVO>
      * @param roleKey 角色权限
      * @return 角色信息
      */
-    public SysRoleVO checkRoleKeyUnique(String roleKey);
+    public SysRole checkRoleKeyUnique(String roleKey);
 
     /**
      * 修改角色信息
@@ -84,7 +84,7 @@ public interface SysRoleMapper extends CrudMapper<SysRoleVO>
      * @param role 角色信息
      * @return 结果
      */
-    public int updateRole(SysRoleVO role);
+    public int updateRole(SysRole role);
 
     /**
      * 新增角色信息
@@ -92,7 +92,7 @@ public interface SysRoleMapper extends CrudMapper<SysRoleVO>
      * @param role 角色信息
      * @return 结果
      */
-    public int insertRole(SysRoleVO role);
+    public int insertRole(SysRole role);
 
     /**
      * 通过角色ID删除角色

service-system/service-system-biz/src/main/java/com/usky/system/service/ISysDeptService.java

@@ -109,6 +109,4 @@ public interface ISysDeptService extends IService<SysDept>
      * @return 结果
      */
     public int deleteDeptById(Long deptId);
-
-    public void setDeptTree(List<SysDept> sysDepts);
 }

service-system/service-system-biz/src/main/java/com/usky/system/service/ISysDictDataService.java

@@ -2,7 +2,7 @@ package com.usky.system.service;
 
 
 import com.usky.common.mvc.base.CrudService;
-import com.usky.system.domain.SysDictDataVO;
+import com.usky.system.domain.SysDictData;
 
 import java.util.List;
 
@@ -11,7 +11,7 @@ import java.util.List;
  * 
  * @author yq
  */
-public interface ISysDictDataService extends CrudService<SysDictDataVO>
+public interface ISysDictDataService extends CrudService<SysDictData>
 {
     /**
      * 根据条件分页查询字典数据
@@ -19,7 +19,7 @@ public interface ISysDictDataService extends CrudService<SysDictDataVO>
      * @param dictData 字典数据信息
      * @return 字典数据集合信息
      */
-    public List<SysDictDataVO> selectDictDataList(SysDictDataVO dictData);
+    public List<SysDictData> selectDictDataList(SysDictData dictData);
 
     /**
      * 根据字典类型和字典键值查询字典数据信息
@@ -36,7 +36,7 @@ public interface ISysDictDataService extends CrudService<SysDictDataVO>
      * @param dictCode 字典数据ID
      * @return 字典数据
      */
-    public SysDictDataVO selectDictDataById(Long dictCode);
+    public SysDictData selectDictDataById(Long dictCode);
 
     /**
      * 批量删除字典数据信息
@@ -52,7 +52,7 @@ public interface ISysDictDataService extends CrudService<SysDictDataVO>
      * @param dictData 字典数据信息
      * @return 结果
      */
-    public int insertDictData(SysDictDataVO dictData);
+    public int insertDictData(SysDictData dictData);
 
     /**
      * 修改保存字典数据信息
@@ -60,5 +60,5 @@ public interface ISysDictDataService extends CrudService<SysDictDataVO>
      * @param dictData 字典数据信息
      * @return 结果
      */
-    public int updateDictData(SysDictDataVO dictData);
+    public int updateDictData(SysDictData dictData);
 }

service-system/service-system-biz/src/main/java/com/usky/system/service/ISysDictTypeService.java

@@ -6,8 +6,8 @@ package com.usky.system.service;
 
 
 import com.usky.common.mvc.base.CrudService;
-import com.usky.system.domain.SysDictDataVO;
-import com.usky.system.domain.SysDictTypeVO;
+import com.usky.system.domain.SysDictData;
+import com.usky.system.domain.SysDictType;
 
 import java.util.List;
 
@@ -17,7 +17,7 @@ import java.util.List;
  * 
  * @author yq
  */
-public interface ISysDictTypeService extends CrudService<SysDictTypeVO>
+public interface ISysDictTypeService extends CrudService<SysDictType>
 {
     /**
      * 根据条件分页查询字典类型
@@ -25,14 +25,14 @@ public interface ISysDictTypeService extends CrudService<SysDictTypeVO>
      * @param dictType 字典类型信息
      * @return 字典类型集合信息
      */
-    public List<SysDictTypeVO> selectDictTypeList(SysDictTypeVO dictType);
+    public List<SysDictType> selectDictTypeList(SysDictType dictType);
 
     /**
      * 根据所有字典类型
      * 
      * @return 字典类型集合信息
      */
-    public List<SysDictTypeVO> selectDictTypeAll();
+    public List<SysDictType> selectDictTypeAll();
 
     /**
      * 根据字典类型查询字典数据
@@ -40,7 +40,7 @@ public interface ISysDictTypeService extends CrudService<SysDictTypeVO>
      * @param dictType 字典类型
      * @return 字典数据集合信息
      */
-    public List<SysDictDataVO> selectDictDataByType(String dictType);
+    public List<SysDictData> selectDictDataByType(String dictType);
 
     /**
      * 根据字典类型ID查询信息
@@ -48,7 +48,7 @@ public interface ISysDictTypeService extends CrudService<SysDictTypeVO>
      * @param dictId 字典类型ID
      * @return 字典类型
      */
-    public SysDictTypeVO selectDictTypeById(Long dictId);
+    public SysDictType selectDictTypeById(Long dictId);
 
     /**
      * 根据字典类型查询信息
@@ -56,7 +56,7 @@ public interface ISysDictTypeService extends CrudService<SysDictTypeVO>
      * @param dictType 字典类型
      * @return 字典类型
      */
-    public SysDictTypeVO selectDictTypeByType(String dictType);
+    public SysDictType selectDictTypeByType(String dictType);
 
     /**
      * 批量删除字典信息
@@ -87,7 +87,7 @@ public interface ISysDictTypeService extends CrudService<SysDictTypeVO>
      * @param dictType 字典类型信息
      * @return 结果
      */
-    public int insertDictType(SysDictTypeVO dictType);
+    public int insertDictType(SysDictType dictType);
 
     /**
      * 修改保存字典类型信息
@@ -95,7 +95,7 @@ public interface ISysDictTypeService extends CrudService<SysDictTypeVO>
      * @param dictType 字典类型信息
      * @return 结果
      */
-    public int updateDictType(SysDictTypeVO dictType);
+    public int updateDictType(SysDictType dictType);
 
     /**
      * 校验字典类型称是否唯一
@@ -103,5 +103,5 @@ public interface ISysDictTypeService extends CrudService<SysDictTypeVO>
      * @param dictType 字典类型
      * @return 结果
      */
-    public String checkDictTypeUnique(SysDictTypeVO dictType);
+    public String checkDictTypeUnique(SysDictType dictType);
 }

service-system/service-system-biz/src/main/java/com/usky/system/service/ISysNoticeService.java

@@ -0,0 +1,63 @@
+package com.usky.system.service;
+
+
+import com.usky.common.mvc.base.CrudService;
+import com.usky.system.domain.SysNotice;
+
+import java.util.List;
+
+/**
+ * 公告 服务层
+ * 
+ * @author ruoyi
+ */
+public interface ISysNoticeService extends CrudService<SysNotice>
+{
+    /**
+     * 查询公告信息
+     * 
+     * @param noticeId 公告ID
+     * @return 公告信息
+     */
+    public SysNotice selectNoticeById(Long noticeId);
+
+    /**
+     * 查询公告列表
+     * 
+     * @param notice 公告信息
+     * @return 公告集合
+     */
+    public List<SysNotice> selectNoticeList(SysNotice notice);
+
+    /**
+     * 新增公告
+     * 
+     * @param notice 公告信息
+     * @return 结果
+     */
+    public int insertNotice(SysNotice notice);
+
+    /**
+     * 修改公告
+     * 
+     * @param notice 公告信息
+     * @return 结果
+     */
+    public int updateNotice(SysNotice notice);
+
+    /**
+     * 删除公告信息
+     * 
+     * @param noticeId 公告ID
+     * @return 结果
+     */
+    public int deleteNoticeById(Long noticeId);
+    
+    /**
+     * 批量删除公告信息
+     * 
+     * @param noticeIds 需要删除的公告ID
+     * @return 结果
+     */
+    public int deleteNoticeByIds(Long[] noticeIds);
+}

service-system/service-system-biz/src/main/java/com/usky/system/service/ISysOperLogService.java

@@ -4,7 +4,7 @@ package com.usky.system.service;
 
 
 import com.usky.common.mvc.base.CrudService;
-import com.usky.system.domain.SysOperLogVO;
+import com.usky.system.domain.SysOperLog;
 
 import java.util.List;
 
@@ -13,14 +13,14 @@ import java.util.List;
  * 
  * @author yq
  */
-public interface ISysOperLogService extends CrudService<SysOperLogVO>
+public interface ISysOperLogService extends CrudService<SysOperLog>
 {
     /**
      * 新增操作日志
      * 
      * @param operLog 操作日志对象
      */
-    public void insertOperlog(SysOperLogVO operLog);
+    public void insertOperlog(SysOperLog operLog);
 
     /**
      * 查询系统操作日志集合
@@ -28,7 +28,7 @@ public interface ISysOperLogService extends CrudService<SysOperLogVO>
      * @param operLog 操作日志对象
      * @return 操作日志集合
      */
-    public List<SysOperLogVO> selectOperLogList(SysOperLogVO operLog);
+    public List<SysOperLog> selectOperLogList(SysOperLog operLog);
 
     /**
      * 批量删除系统操作日志
@@ -44,7 +44,7 @@ public interface ISysOperLogService extends CrudService<SysOperLogVO>
      * @param operId 操作ID
      * @return 操作日志对象
      */
-    public SysOperLogVO selectOperLogById(Long operId);
+    public SysOperLog selectOperLogById(Long operId);
 
     /**
      * 清空操作日志

service-system/service-system-biz/src/main/java/com/usky/system/service/ISysRoleService.java

@@ -2,7 +2,7 @@ package com.usky.system.service;
 
 
 import com.usky.common.mvc.base.CrudService;
-import com.usky.system.domain.SysRoleVO;
+import com.usky.system.domain.SysRole;
 import com.usky.system.domain.SysUserRole;
 
 import java.util.List;
@@ -13,7 +13,7 @@ import java.util.Set;
  * 
  * @author yq
  */
-public interface ISysRoleService extends CrudService<SysRoleVO>
+public interface ISysRoleService extends CrudService<SysRole>
 {
     /**
      * 根据条件分页查询角色数据
@@ -21,7 +21,7 @@ public interface ISysRoleService extends CrudService<SysRoleVO>
      * @param role 角色信息
      * @return 角色数据集合信息
      */
-    public List<SysRoleVO> selectRoleList(SysRoleVO role);
+    public List<SysRole> selectRoleList(SysRole role);
 
     /**
      * 根据用户ID查询角色列表
@@ -29,7 +29,7 @@ public interface ISysRoleService extends CrudService<SysRoleVO>
      * @param userId 用户ID
      * @return 角色列表
      */
-    public List<SysRoleVO> selectRolesByUserId(Long userId);
+    public List<SysRole> selectRolesByUserId(Long userId);
 
     /**
      * 根据用户ID查询角色权限
@@ -44,7 +44,7 @@ public interface ISysRoleService extends CrudService<SysRoleVO>
      * 
      * @return 角色列表
      */
-    public List<SysRoleVO> selectRoleAll();
+    public List<SysRole> selectRoleAll();
 
     /**
      * 根据用户ID获取角色选择框列表
@@ -60,7 +60,7 @@ public interface ISysRoleService extends CrudService<SysRoleVO>
      * @param roleId 角色ID
      * @return 角色对象信息
      */
-    public SysRoleVO selectRoleById(Long roleId);
+    public SysRole selectRoleById(Long roleId);
 
     /**
      * 校验角色名称是否唯一
@@ -68,7 +68,7 @@ public interface ISysRoleService extends CrudService<SysRoleVO>
      * @param role 角色信息
      * @return 结果
      */
-    public String checkRoleNameUnique(SysRoleVO role);
+    public String checkRoleNameUnique(SysRole role);
 
     /**
      * 校验角色权限是否唯一
@@ -76,14 +76,14 @@ public interface ISysRoleService extends CrudService<SysRoleVO>
      * @param role 角色信息
      * @return 结果
      */
-    public String checkRoleKeyUnique(SysRoleVO role);
+    public String checkRoleKeyUnique(SysRole role);
 
     /**
      * 校验角色是否允许操作
      * 
      * @param role 角色信息
      */
-    public void checkRoleAllowed(SysRoleVO role);
+    public void checkRoleAllowed(SysRole role);
 
     /**
      * 通过角色ID查询角色使用数量
@@ -99,7 +99,7 @@ public interface ISysRoleService extends CrudService<SysRoleVO>
      * @param role 角色信息
      * @return 结果
      */
-    public int insertRole(SysRoleVO role);
+    public int insertRole(SysRole role);
 
     /**
      * 修改保存角色信息
@@ -107,7 +107,7 @@ public interface ISysRoleService extends CrudService<SysRoleVO>
      * @param role 角色信息
      * @return 结果
      */
-    public int updateRole(SysRoleVO role);
+    public int updateRole(SysRole role);
 
     /**
      * 修改角色状态
@@ -115,7 +115,7 @@ public interface ISysRoleService extends CrudService<SysRoleVO>
      * @param role 角色信息
      * @return 结果
      */
-    public int updateRoleStatus(SysRoleVO role);
+    public int updateRoleStatus(SysRole role);
 
     /**
      * 修改数据权限信息
@@ -123,7 +123,7 @@ public interface ISysRoleService extends CrudService<SysRoleVO>
      * @param role 角色信息
      * @return 结果
      */
-    public int authDataScope(SysRoleVO role);
+    public int authDataScope(SysRole role);
 
     /**
      * 通过角色ID删除角色

service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysDeptServiceImpl.java

@@ -7,7 +7,7 @@ import com.usky.common.core.util.Convert;
 import com.usky.common.core.util.StringUtils;
 import com.usky.common.mvc.base.AbstractCrudService;
 import com.usky.system.domain.SysDept;
-import com.usky.system.domain.SysRoleVO;
+import com.usky.system.domain.SysRole;
 import com.usky.system.domain.constants.UserConstants;
 import com.usky.system.mapper.SysDeptMapper;
 import com.usky.system.mapper.SysRoleMapper;
@@ -103,7 +103,7 @@ public class SysDeptServiceImpl extends AbstractCrudService<SysDeptMapper, SysDe
     @Override
     public List<Integer> selectDeptListByRoleId(Long roleId)
     {
-        SysRoleVO role = roleMapper.selectRoleById(roleId);
+        SysRole role = roleMapper.selectRoleById(roleId);
         return deptMapper.selectDeptListByRoleId(roleId, role.isDeptCheckStrictly());
     }
 
@@ -266,60 +266,6 @@ public class SysDeptServiceImpl extends AbstractCrudService<SysDeptMapper, SysDe
         return deptMapper.deleteDeptById(deptId);
     }
 
-    @Override
-    public void setDeptTree(List<SysDept> sysDepts) {
-        List<String> tempList = sysDepts.stream().map(SysDept::getCenterDeptId).collect(Collectors.toList());
-        for (SysDept sysDept:sysDepts) {
-            try {
-                // 如果是顶级节点, 遍历该父节点的所有子节点
-                if (!tempList.contains(sysDept.getCenterParentId()))
-                {
-                    sysDept.setParentId(0L);
-                    sysDept.setAncestors("0");
-                    recursionFnOne(sysDepts, sysDept);
-                    this.updateById(sysDept);
-                }
-            }catch (Exception e){
-                log.error("同步部门异常:"+e.getMessage());
-            }
-        }
-    }
-
-    private void recursionFnOne(List<SysDept> list, SysDept t){
-        // 得到子节点列表
-        List<SysDept> childList = getChildListOne(list, t);
-        t.setChildren(childList);
-        for (SysDept tChild : childList)
-        {
-            tChild.setParentId(t.getDeptId());
-            tChild.setAncestors(t.getAncestors() + "," + tChild.getParentId());
-            this.updateById(tChild);
-            if (hasChildOne(list, tChild))
-            {
-                recursionFnOne(list, tChild);
-            }
-        }
-    }
-
-    public List<SysDept> getChildListOne(List<SysDept> list, SysDept t){
-        List<SysDept> tlist = new ArrayList<SysDept>();
-        Iterator<SysDept> it = list.iterator();
-        while (it.hasNext())
-        {
-            SysDept n = (SysDept) it.next();
-            if (StringUtils.isNotBlank(n.getCenterParentId()) && n.getCenterParentId().equals(t.getCenterDeptId()))
-            {
-                tlist.add(n);
-            }
-        }
-        return tlist;
-    }
-
-    private boolean hasChildOne(List<SysDept> list, SysDept t)
-    {
-        return getChildListOne(list, t).size() > 0 ? true : false;
-    }
-
     /**
      * 递归列表
      */

service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysDictDataServiceImpl.java

@@ -2,7 +2,7 @@ package com.usky.system.service.impl;
 
 
 import com.usky.common.mvc.base.AbstractCrudService;
-import com.usky.system.domain.SysDictDataVO;
+import com.usky.system.domain.SysDictData;
 import com.usky.system.mapper.SysDictDataMapper;
 import com.usky.system.service.ISysDictDataService;
 import com.usky.system.service.util.DictUtils;
@@ -18,7 +18,7 @@ import java.util.List;
  * @author yq
  */
 @Service
-public class SysDictDataServiceImpl extends AbstractCrudService<SysDictDataMapper, SysDictDataVO> implements ISysDictDataService
+public class SysDictDataServiceImpl extends AbstractCrudService<SysDictDataMapper, SysDictData> implements ISysDictDataService
 {
     @Autowired
     private SysDictDataMapper dictDataMapper;
@@ -30,7 +30,7 @@ public class SysDictDataServiceImpl extends AbstractCrudService<SysDictDataMappe
      * @return 字典数据集合信息
      */
     @Override
-    public List<SysDictDataVO> selectDictDataList(SysDictDataVO dictData)
+    public List<SysDictData> selectDictDataList(SysDictData dictData)
     {
         return dictDataMapper.selectDictDataList(dictData);
     }
@@ -55,7 +55,7 @@ public class SysDictDataServiceImpl extends AbstractCrudService<SysDictDataMappe
      * @return 字典数据
      */
     @Override
-    public SysDictDataVO selectDictDataById(Long dictCode)
+    public SysDictData selectDictDataById(Long dictCode)
     {
         return dictDataMapper.selectDictDataById(dictCode);
     }
@@ -71,9 +71,9 @@ public class SysDictDataServiceImpl extends AbstractCrudService<SysDictDataMappe
     {
         for (Long dictCode : dictCodes)
         {
-            SysDictDataVO data = selectDictDataById(dictCode);
+            SysDictData data = selectDictDataById(dictCode);
             dictDataMapper.deleteDictDataById(dictCode);
-            List<SysDictDataVO> dictDatas = dictDataMapper.selectDictDataByType(data.getDictType());
+            List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(data.getDictType());
             DictUtils.setDictCache(data.getDictType(), dictDatas);
         }
     }
@@ -85,12 +85,12 @@ public class SysDictDataServiceImpl extends AbstractCrudService<SysDictDataMappe
      * @return 结果
      */
     @Override
-    public int insertDictData(SysDictDataVO data)
+    public int insertDictData(SysDictData data)
     {
         int row = dictDataMapper.insertDictData(data);
         if (row > 0)
         {
-            List<SysDictDataVO> dictDatas = dictDataMapper.selectDictDataByType(data.getDictType());
+            List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(data.getDictType());
             DictUtils.setDictCache(data.getDictType(), dictDatas);
         }
         return row;
@@ -103,12 +103,12 @@ public class SysDictDataServiceImpl extends AbstractCrudService<SysDictDataMappe
      * @return 结果
      */
     @Override
-    public int updateDictData(SysDictDataVO data)
+    public int updateDictData(SysDictData data)
     {
         int row = dictDataMapper.updateDictData(data);
         if (row > 0)
         {
-            List<SysDictDataVO> dictDatas = dictDataMapper.selectDictDataByType(data.getDictType());
+            List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(data.getDictType());
             DictUtils.setDictCache(data.getDictType(), dictDatas);
         }
         return row;

service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysDictTypeServiceImpl.java

@@ -4,8 +4,8 @@ package com.usky.system.service.impl;
 
 import com.usky.common.core.exception.BusinessException;
 import com.usky.common.mvc.base.AbstractCrudService;
-import com.usky.system.domain.SysDictDataVO;
-import com.usky.system.domain.SysDictTypeVO;
+import com.usky.system.domain.SysDictData;
+import com.usky.system.domain.SysDictType;
 import com.usky.system.domain.constants.UserConstants;
 import com.usky.system.mapper.SysDictDataMapper;
 import com.usky.system.mapper.SysDictTypeMapper;
@@ -26,7 +26,7 @@ import java.util.Objects;
  * @author yq
  */
 @Service
-public class SysDictTypeServiceImpl extends AbstractCrudService<SysDictTypeMapper, SysDictTypeVO> implements ISysDictTypeService
+public class SysDictTypeServiceImpl extends AbstractCrudService<SysDictTypeMapper, SysDictType> implements ISysDictTypeService
 {
     @Autowired
     private SysDictTypeMapper dictTypeMapper;
@@ -50,7 +50,7 @@ public class SysDictTypeServiceImpl extends AbstractCrudService<SysDictTypeMappe
      * @return 字典类型集合信息
      */
     @Override
-    public List<SysDictTypeVO> selectDictTypeList(SysDictTypeVO dictType)
+    public List<SysDictType> selectDictTypeList(SysDictType dictType)
     {
         return dictTypeMapper.selectDictTypeList(dictType);
     }
@@ -61,7 +61,7 @@ public class SysDictTypeServiceImpl extends AbstractCrudService<SysDictTypeMappe
      * @return 字典类型集合信息
      */
     @Override
-    public List<SysDictTypeVO> selectDictTypeAll()
+    public List<SysDictType> selectDictTypeAll()
     {
         return dictTypeMapper.selectDictTypeAll();
     }
@@ -73,9 +73,9 @@ public class SysDictTypeServiceImpl extends AbstractCrudService<SysDictTypeMappe
      * @return 字典数据集合信息
      */
     @Override
-    public List<SysDictDataVO> selectDictDataByType(String dictType)
+    public List<SysDictData> selectDictDataByType(String dictType)
     {
-        List<SysDictDataVO> dictDatas = DictUtils.getDictCache(dictType);
+        List<SysDictData> dictDatas = DictUtils.getDictCache(dictType);
         if (Objects.nonNull(dictDatas))
         {
             return dictDatas;
@@ -96,7 +96,7 @@ public class SysDictTypeServiceImpl extends AbstractCrudService<SysDictTypeMappe
      * @return 字典类型
      */
     @Override
-    public SysDictTypeVO selectDictTypeById(Long dictId)
+    public SysDictType selectDictTypeById(Long dictId)
     {
         return dictTypeMapper.selectDictTypeById(dictId);
     }
@@ -108,7 +108,7 @@ public class SysDictTypeServiceImpl extends AbstractCrudService<SysDictTypeMappe
      * @return 字典类型
      */
     @Override
-    public SysDictTypeVO selectDictTypeByType(String dictType)
+    public SysDictType selectDictTypeByType(String dictType)
     {
         return dictTypeMapper.selectDictTypeByType(dictType);
     }
@@ -124,7 +124,7 @@ public class SysDictTypeServiceImpl extends AbstractCrudService<SysDictTypeMappe
     {
         for (Long dictId : dictIds)
         {
-            SysDictTypeVO dictType = selectDictTypeById(dictId);
+            SysDictType dictType = selectDictTypeById(dictId);
             if (dictDataMapper.countDictDataByType(dictType.getDictType()) > 0)
             {
                 throw new BusinessException(String.format("%1$s已分配,不能删除", dictType.getDictName()));
@@ -140,10 +140,10 @@ public class SysDictTypeServiceImpl extends AbstractCrudService<SysDictTypeMappe
     @Override
     public void loadingDictCache()
     {
-        List<SysDictTypeVO> dictTypeList = dictTypeMapper.selectDictTypeAll();
-        for (SysDictTypeVO dictType : dictTypeList)
+        List<SysDictType> dictTypeList = dictTypeMapper.selectDictTypeAll();
+        for (SysDictType dictType : dictTypeList)
         {
-            List<SysDictDataVO> dictDatas = dictDataMapper.selectDictDataByType(dictType.getDictType());
+            List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(dictType.getDictType());
             DictUtils.setDictCache(dictType.getDictType(), dictDatas);
         }
     }
@@ -174,7 +174,7 @@ public class SysDictTypeServiceImpl extends AbstractCrudService<SysDictTypeMappe
      * @return 结果
      */
     @Override
-    public int insertDictType(SysDictTypeVO dict)
+    public int insertDictType(SysDictType dict)
     {
         int row = dictTypeMapper.insertDictType(dict);
         if (row > 0)
@@ -192,14 +192,14 @@ public class SysDictTypeServiceImpl extends AbstractCrudService<SysDictTypeMappe
      */
     @Override
     @Transactional
-    public int updateDictType(SysDictTypeVO dict)
+    public int updateDictType(SysDictType dict)
     {
-        SysDictTypeVO oldDict = dictTypeMapper.selectDictTypeById(dict.getDictId());
+        SysDictType oldDict = dictTypeMapper.selectDictTypeById(dict.getDictId());
         dictDataMapper.updateDictDataType(oldDict.getDictType(), dict.getDictType());
         int row = dictTypeMapper.updateDictType(dict);
         if (row > 0)
         {
-            List<SysDictDataVO> dictDatas = dictDataMapper.selectDictDataByType(dict.getDictType());
+            List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(dict.getDictType());
             DictUtils.setDictCache(dict.getDictType(), dictDatas);
         }
         return row;
@@ -212,10 +212,10 @@ public class SysDictTypeServiceImpl extends AbstractCrudService<SysDictTypeMappe
      * @return 结果
      */
     @Override
-    public String checkDictTypeUnique(SysDictTypeVO dict)
+    public String checkDictTypeUnique(SysDictType dict)
     {
         Long dictId = null != dict.getDictId() ? -1L : dict.getDictId();
-        SysDictTypeVO dictType = dictTypeMapper.checkDictTypeUnique(dict.getDictType());
+        SysDictType dictType = dictTypeMapper.checkDictTypeUnique(dict.getDictType());
         if (Objects.nonNull(dictType) && dictType.getDictId().longValue() != dictId.longValue())
         {
             return UserConstants.NOT_UNIQUE;

service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysMenuServiceImpl.java

@@ -3,7 +3,7 @@ package com.usky.system.service.impl;
 import com.usky.common.core.util.StringUtils;
 import com.usky.common.mvc.base.AbstractCrudService;
 import com.usky.system.domain.SysMenu;
-import com.usky.system.domain.SysRoleVO;
+import com.usky.system.domain.SysRole;
 import com.usky.system.domain.SysUserVO;
 import com.usky.system.domain.constants.Constants;
 import com.usky.system.domain.constants.UserConstants;
@@ -126,7 +126,7 @@ public class SysMenuServiceImpl extends AbstractCrudService<SysMenuMapper, SysMe
     @Override
     public List<Integer> selectMenuListByRoleId(Long roleId)
     {
-        SysRoleVO role = roleMapper.selectRoleById(roleId);
+        SysRole role = roleMapper.selectRoleById(roleId);
         return menuMapper.selectMenuListByRoleId(roleId, role.isMenuCheckStrictly());
     }
 

service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysNoticeServiceImpl.java

@@ -0,0 +1,94 @@
+package com.usky.system.service.impl;
+
+import com.usky.common.mvc.base.AbstractCrudService;
+import com.usky.system.domain.SysNotice;
+import com.usky.system.mapper.SysNoticeMapper;
+import com.usky.system.service.ISysNoticeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 公告 服务层实现
+ * 
+ * @author ruoyi
+ */
+@Service
+public class SysNoticeServiceImpl extends AbstractCrudService<SysNoticeMapper, SysNotice> implements ISysNoticeService
+{
+    @Autowired
+    private SysNoticeMapper noticeMapper;
+
+    /**
+     * 查询公告信息
+     * 
+     * @param noticeId 公告ID
+     * @return 公告信息
+     */
+    @Override
+    public SysNotice selectNoticeById(Long noticeId)
+    {
+        return noticeMapper.selectNoticeById(noticeId);
+    }
+
+    /**
+     * 查询公告列表
+     * 
+     * @param notice 公告信息
+     * @return 公告集合
+     */
+    @Override
+    public List<SysNotice> selectNoticeList(SysNotice notice)
+    {
+        return noticeMapper.selectNoticeList(notice);
+    }
+
+    /**
+     * 新增公告
+     * 
+     * @param notice 公告信息
+     * @return 结果
+     */
+    @Override
+    public int insertNotice(SysNotice notice)
+    {
+        return noticeMapper.insertNotice(notice);
+    }
+
+    /**
+     * 修改公告
+     * 
+     * @param notice 公告信息
+     * @return 结果
+     */
+    @Override
+    public int updateNotice(SysNotice notice)
+    {
+        return noticeMapper.updateNotice(notice);
+    }
+
+    /**
+     * 删除公告对象
+     * 
+     * @param noticeId 公告ID
+     * @return 结果
+     */
+    @Override
+    public int deleteNoticeById(Long noticeId)
+    {
+        return noticeMapper.deleteNoticeById(noticeId);
+    }
+
+    /**
+     * 批量删除公告信息
+     * 
+     * @param noticeIds 需要删除的公告ID
+     * @return 结果
+     */
+    @Override
+    public int deleteNoticeByIds(Long[] noticeIds)
+    {
+        return noticeMapper.deleteNoticeByIds(noticeIds);
+    }
+}

service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysOperLogServiceImpl.java

@@ -3,7 +3,7 @@ package com.usky.system.service.impl;
 
 
 import com.usky.common.mvc.base.AbstractCrudService;
-import com.usky.system.domain.SysOperLogVO;
+import com.usky.system.domain.SysOperLog;
 import com.usky.system.mapper.SysOperLogMapper;
 import com.usky.system.service.ISysOperLogService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,7 +17,7 @@ import java.util.List;
  * @author yq
  */
 @Service
-public class SysOperLogServiceImpl extends AbstractCrudService<SysOperLogMapper, SysOperLogVO> implements ISysOperLogService
+public class SysOperLogServiceImpl extends AbstractCrudService<SysOperLogMapper, SysOperLog> implements ISysOperLogService
 {
     @Autowired
     private SysOperLogMapper operLogMapper;
@@ -28,7 +28,7 @@ public class SysOperLogServiceImpl extends AbstractCrudService<SysOperLogMapper,
      * @param operLog 操作日志对象
      */
     @Override
-    public void insertOperlog(SysOperLogVO operLog)
+    public void insertOperlog(SysOperLog operLog)
     {
         operLogMapper.insertOperlog(operLog);
     }
@@ -40,7 +40,7 @@ public class SysOperLogServiceImpl extends AbstractCrudService<SysOperLogMapper,
      * @return 操作日志集合
      */
     @Override
-    public List<SysOperLogVO> selectOperLogList(SysOperLogVO operLog)
+    public List<SysOperLog> selectOperLogList(SysOperLog operLog)
     {
         return operLogMapper.selectOperLogList(operLog);
     }
@@ -64,7 +64,7 @@ public class SysOperLogServiceImpl extends AbstractCrudService<SysOperLogMapper,
      * @return 操作日志对象
      */
     @Override
-    public SysOperLogVO selectOperLogById(Long operId)
+    public SysOperLog selectOperLogById(Long operId)
     {
         return operLogMapper.selectOperLogById(operId);
     }

service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysRoleServiceImpl.java

@@ -21,7 +21,7 @@ import java.util.*;
  * @author yq
  */
 @Service
-public class SysRoleServiceImpl extends AbstractCrudService<SysRoleMapper, SysRoleVO> implements ISysRoleService
+public class SysRoleServiceImpl extends AbstractCrudService<SysRoleMapper, SysRole> implements ISysRoleService
 {
     @Autowired
     private SysRoleMapper roleMapper;
@@ -42,7 +42,7 @@ public class SysRoleServiceImpl extends AbstractCrudService<SysRoleMapper, SysRo
      * @return 角色数据集合信息
      */
     @Override
-    public List<SysRoleVO> selectRoleList(SysRoleVO role)
+    public List<SysRole> selectRoleList(SysRole role)
     {
         return roleMapper.selectRoleList(role);
     }
@@ -54,13 +54,13 @@ public class SysRoleServiceImpl extends AbstractCrudService<SysRoleMapper, SysRo
      * @return 角色列表
      */
     @Override
-    public List<SysRoleVO> selectRolesByUserId(Long userId)
+    public List<SysRole> selectRolesByUserId(Long userId)
     {
-        List<SysRoleVO> userRoles = roleMapper.selectRolePermissionByUserId(userId);
-        List<SysRoleVO> roles = selectRoleAll();
-        for (SysRoleVO role : roles)
+        List<SysRole> userRoles = roleMapper.selectRolePermissionByUserId(userId);
+        List<SysRole> roles = selectRoleAll();
+        for (SysRole role : roles)
         {
-            for (SysRoleVO userRole : userRoles)
+            for (SysRole userRole : userRoles)
             {
                 if (role.getRoleId().longValue() == userRole.getRoleId().longValue())
                 {
@@ -81,9 +81,9 @@ public class SysRoleServiceImpl extends AbstractCrudService<SysRoleMapper, SysRo
     @Override
     public Set<String> selectRolePermissionByUserId(Long userId)
     {
-        List<SysRoleVO> perms = roleMapper.selectRolePermissionByUserId(userId);
+        List<SysRole> perms = roleMapper.selectRolePermissionByUserId(userId);
         Set<String> permsSet = new HashSet<>();
-        for (SysRoleVO perm : perms)
+        for (SysRole perm : perms)
         {
             if (Objects.nonNull(perm))
             {
@@ -99,15 +99,15 @@ public class SysRoleServiceImpl extends AbstractCrudService<SysRoleMapper, SysRo
      * @return 角色列表
      */
     @Override
-    public List<SysRoleVO> selectRoleAll()
+    public List<SysRole> selectRoleAll()
     {
-        return SpringContextUtils.getAopProxy(this).selectRoleList(new SysRoleVO());
+        return SpringContextUtils.getAopProxy(this).selectRoleList(new SysRole());
     }
 
     /**
      * 根据用户ID获取角色选择框列表
      * 
-     * @param userId 用户ID
+     * @param userId 用户I
      * @return 选中角色ID列表
      */
     @Override
@@ -123,7 +123,7 @@ public class SysRoleServiceImpl extends AbstractCrudService<SysRoleMapper, SysRo
      * @return 角色对象信息
      */
     @Override
-    public SysRoleVO selectRoleById(Long roleId)
+    public SysRole selectRoleById(Long roleId)
     {
         return roleMapper.selectRoleById(roleId);
     }
@@ -135,10 +135,10 @@ public class SysRoleServiceImpl extends AbstractCrudService<SysRoleMapper, SysRo
      * @return 结果
      */
     @Override
-    public String checkRoleNameUnique(SysRoleVO role)
+    public String checkRoleNameUnique(SysRole role)
     {
         Long roleId = Objects.isNull(role.getRoleId()) ? -1L : role.getRoleId();
-        SysRoleVO info = roleMapper.checkRoleNameUnique(role.getRoleName());
+        SysRole info = roleMapper.checkRoleNameUnique(role.getRoleName());
         if (Objects.nonNull(info) && info.getRoleId().longValue() != roleId.longValue())
         {
             return UserConstants.NOT_UNIQUE;
@@ -153,10 +153,10 @@ public class SysRoleServiceImpl extends AbstractCrudService<SysRoleMapper, SysRo
      * @return 结果
      */
     @Override
-    public String checkRoleKeyUnique(SysRoleVO role)
+    public String checkRoleKeyUnique(SysRole role)
     {
         Long roleId = Objects.isNull(role.getRoleId()) ? -1L : role.getRoleId();
-        SysRoleVO info = roleMapper.checkRoleKeyUnique(role.getRoleKey());
+        SysRole info = roleMapper.checkRoleKeyUnique(role.getRoleKey());
         if (Objects.nonNull(info) && info.getRoleId().longValue() != roleId.longValue())
         {
             return UserConstants.NOT_UNIQUE;
@@ -170,7 +170,7 @@ public class SysRoleServiceImpl extends AbstractCrudService<SysRoleMapper, SysRo
      * @param role 角色信息
      */
     @Override
-    public void checkRoleAllowed(SysRoleVO role)
+    public void checkRoleAllowed(SysRole role)
     {
         if (Objects.nonNull(role.getRoleId()) && role.isAdmin())
         {
@@ -198,7 +198,7 @@ public class SysRoleServiceImpl extends AbstractCrudService<SysRoleMapper, SysRo
      */
     @Override
     @Transactional
-    public int insertRole(SysRoleVO role)
+    public int insertRole(SysRole role)
     {
         // 新增角色信息
         roleMapper.insertRole(role);
@@ -213,7 +213,7 @@ public class SysRoleServiceImpl extends AbstractCrudService<SysRoleMapper, SysRo
      */
     @Override
     @Transactional
-    public int updateRole(SysRoleVO role)
+    public int updateRole(SysRole role)
     {
         // 修改角色信息
         roleMapper.updateRole(role);
@@ -229,7 +229,7 @@ public class SysRoleServiceImpl extends AbstractCrudService<SysRoleMapper, SysRo
      * @return 结果
      */
     @Override
-    public int updateRoleStatus(SysRoleVO role)
+    public int updateRoleStatus(SysRole role)
     {
         return roleMapper.updateRole(role);
     }
@@ -242,7 +242,7 @@ public class SysRoleServiceImpl extends AbstractCrudService<SysRoleMapper, SysRo
      */
     @Override
     @Transactional
-    public int authDataScope(SysRoleVO role)
+    public int authDataScope(SysRole role)
     {
         // 修改角色信息
         roleMapper.updateRole(role);
@@ -257,7 +257,7 @@ public class SysRoleServiceImpl extends AbstractCrudService<SysRoleMapper, SysRo
      * 
      * @param role 角色对象
      */
-    public int insertRoleMenu(SysRoleVO role)
+    public int insertRoleMenu(SysRole role)
     {
         int rows = 1;
         // 新增用户与角色管理
@@ -283,7 +283,7 @@ public class SysRoleServiceImpl extends AbstractCrudService<SysRoleMapper, SysRo
      *
      * @param role 角色对象
      */
-    public int insertRoleDept(SysRoleVO role)
+    public int insertRoleDept(SysRole role)
     {
         int rows = 1;
         // 新增角色与部门（数据权限）管理
@@ -331,8 +331,8 @@ public class SysRoleServiceImpl extends AbstractCrudService<SysRoleMapper, SysRo
     {
         for (Long roleId : roleIds)
         {
-            checkRoleAllowed(new SysRoleVO(roleId));
-            SysRoleVO role = selectRoleById(roleId);
+            checkRoleAllowed(new SysRole(roleId));
+            SysRole role = selectRoleById(roleId);
             if (countUserRoleByRoleId(roleId) > 0)
             {
                 throw new BusinessException(String.format("%1$s已分配,不能删除", role.getRoleName()));

service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysUserServiceImpl.java

@@ -119,9 +119,9 @@ public class SysUserServiceImpl extends AbstractCrudService<SysUserMapper, SysUs
      */
     @Override
     public String selectUserRoleGroup(String userName) {
-        List<SysRoleVO> list = roleMapper.selectRolesByUserName(userName);
+        List<SysRole> list = roleMapper.selectRolesByUserName(userName);
         StringBuffer idsStr = new StringBuffer();
-        for (SysRoleVO role : list) {
+        for (SysRole role : list) {
             idsStr.append(role.getRoleName()).append(",");
         }
         if (StringUtils.isNotBlank(idsStr.toString())) {

service-system/service-system-biz/src/main/java/com/usky/system/service/util/DictUtils.java

@@ -5,7 +5,7 @@ package com.usky.system.service.util;
 import com.usky.common.core.util.StringUtils;
 import com.usky.common.spring.config.redis.RedisHelper;
 import com.usky.common.spring.util.SpringContextUtils;
-import com.usky.system.domain.SysDictDataVO;
+import com.usky.system.domain.SysDictData;
 import com.usky.system.domain.constants.Constants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -36,7 +36,7 @@ public class DictUtils
      * @param key 参数键
      * @param dictDatas 字典数据列表
      */
-    public static void setDictCache(String key, List<SysDictDataVO> dictDatas)
+    public static void setDictCache(String key, List<SysDictData> dictDatas)
     {
         getRedisHelper().set(getCacheKey(key), dictDatas);
     }
@@ -47,12 +47,12 @@ public class DictUtils
      * @param key 参数键
      * @return dictDatas 字典数据列表
      */
-    public static List<SysDictDataVO> getDictCache(String key)
+    public static List<SysDictData> getDictCache(String key)
     {
         Object cacheObj = getRedisHelper().get(getCacheKey(key));
         if (Objects.nonNull(cacheObj))
         {
-            List<SysDictDataVO> dictDatas = (List<SysDictDataVO>) cacheObj;
+            List<SysDictData> dictDatas = (List<SysDictData>) cacheObj;
             return dictDatas;
         }
         return null;
@@ -93,11 +93,11 @@ public class DictUtils
     public static String getDictLabel(String dictType, String dictValue, String separator)
     {
         StringBuilder propertyString = new StringBuilder();
-        List<SysDictDataVO> datas = getDictCache(dictType);
+        List<SysDictData> datas = getDictCache(dictType);
 
         if (StringUtils.containsAny(separator, dictValue) && Objects.nonNull(datas))
         {
-            for (SysDictDataVO dict : datas)
+            for (SysDictData dict : datas)
             {
                 for (String value : dictValue.split(separator))
                 {
@@ -111,7 +111,7 @@ public class DictUtils
         }
         else
         {
-            for (SysDictDataVO dict : datas)
+            for (SysDictData dict : datas)
             {
                 if (dictValue.equals(dict.getDictValue()))
                 {
@@ -133,11 +133,11 @@ public class DictUtils
     public static String getDictValue(String dictType, String dictLabel, String separator)
     {
         StringBuilder propertyString = new StringBuilder();
-        List<SysDictDataVO> datas = getDictCache(dictType);
+        List<SysDictData> datas = getDictCache(dictType);
 
         if (StringUtils.containsAny(separator, dictLabel) && Objects.nonNull(datas))
         {
-            for (SysDictDataVO dict : datas)
+            for (SysDictData dict : datas)
             {
                 for (String label : dictLabel.split(separator))
                 {
@@ -151,7 +151,7 @@ public class DictUtils
         }
         else
         {
-            for (SysDictDataVO dict : datas)
+            for (SysDictData dict : datas)
             {
                 if (dictLabel.equals(dict.getDictLabel()))
                 {

service-system/service-system-biz/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -20,11 +20,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="createTime" column="create_time" />
 		<result property="updateBy"   column="update_by"   />
 		<result property="updateTime" column="update_time" />
-		<result property="centerDeptId" column="center_dept_id" />
 	</resultMap>
 	
 	<sql id="selectDeptVo">
-        select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time,d.center_dept_id
+        select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time
         from sys_dept d
     </sql>
 

service-system/service-system-biz/src/main/resources/mapper/system/SysDictDataMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.usky.system.mapper.SysDictDataMapper">
 	
-	<resultMap type="com.usky.system.domain.SysDictDataVO" id="SysDictDataResult">
+	<resultMap type="com.usky.system.domain.SysDictData" id="SysDictDataResult">
 		<id     property="dictCode"   column="dict_code"   />
 		<result property="dictSort"   column="dict_sort"   />
 		<result property="dictLabel"  column="dict_label"  />
@@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		from sys_dict_data
     </sql>
 
-	<select id="selectDictDataList" parameterType="com.usky.system.domain.SysDictDataVO" resultMap="SysDictDataResult">
+	<select id="selectDictDataList" parameterType="com.usky.system.domain.SysDictData" resultMap="SysDictDataResult">
 	    <include refid="selectDictDataVo"/>
 		<where>
 		    <if test="dictType != null and dictType != ''">
@@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		order by dict_sort asc
 	</select>
 	
-	<select id="selectDictDataByType" parameterType="com.usky.system.domain.SysDictDataVO" resultMap="SysDictDataResult">
+	<select id="selectDictDataByType" parameterType="com.usky.system.domain.SysDictData" resultMap="SysDictDataResult">
 		<include refid="selectDictDataVo"/>
 		where status = '0' and dict_type = #{dictType} order by dict_sort asc
 	</select>
@@ -71,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach> 
  	</delete>
 	
-	<update id="updateDictData" parameterType="com.usky.system.domain.SysDictDataVO">
+	<update id="updateDictData" parameterType="com.usky.system.domain.SysDictData">
  		update sys_dict_data
  		<set>
  			<if test="dictSort != null">dict_sort = #{dictSort},</if>
@@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		update sys_dict_data set dict_type = #{newDictType} where dict_type = #{oldDictType}
 	</update>
  	
- 	<insert id="insertDictData" parameterType="com.usky.system.domain.SysDictDataVO">
+ 	<insert id="insertDictData" parameterType="com.usky.system.domain.SysDictData">
  		insert into sys_dict_data(
  			<if test="dictSort != null">dict_sort,</if>
  			<if test="dictLabel != null and dictLabel != ''">dict_label,</if>

service-system/service-system-biz/src/main/resources/mapper/system/SysDictTypeMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.usky.system.mapper.SysDictTypeMapper">
 
-	<resultMap type="com.usky.system.domain.SysDictTypeVO" id="SysDictTypeResult">
+	<resultMap type="com.usky.system.domain.SysDictType" id="SysDictTypeResult">
 		<id     property="dictId"     column="dict_id"     />
 		<result property="dictName"   column="dict_name"   />
 		<result property="dictType"   column="dict_type"   />
@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		from sys_dict_type
     </sql>
 
-	<select id="selectDictTypeList" parameterType="com.usky.system.domain.SysDictTypeVO" resultMap="SysDictTypeResult">
+	<select id="selectDictTypeList" parameterType="com.usky.system.domain.SysDictType" resultMap="SysDictTypeResult">
 	    <include refid="selectDictTypeVo"/>
 		<where>
 		    <if test="dictName != null and dictName != ''">
@@ -71,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach> 
  	</delete>
 
- 	<update id="updateDictType" parameterType="com.usky.system.domain.SysDictTypeVO">
+ 	<update id="updateDictType" parameterType="com.usky.system.domain.SysDictType">
  		update sys_dict_type
  		<set>
  			<if test="dictName != null and dictName != ''">dict_name = #{dictName},</if>
@@ -84,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		where dict_id = #{dictId}
 	</update>
  	
- 	<insert id="insertDictType" parameterType="com.usky.system.domain.SysDictTypeVO">
+ 	<insert id="insertDictType" parameterType="com.usky.system.domain.SysDictType">
  		insert into sys_dict_type(
  			<if test="dictName != null and dictName != ''">dict_name,</if>
  			<if test="dictType != null and dictType != ''">dict_type,</if>

service-system/service-system-biz/src/main/resources/mapper/system/SysNoticeMapper.xml

@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.usky.system.mapper.SysNoticeMapper">
+    
+    <resultMap type="com.usky.system.domain.SysNotice" id="SysNoticeResult">
+        <result property="noticeId"       column="notice_id"       />
+        <result property="noticeTitle"    column="notice_title"    />
+        <result property="noticeType"     column="notice_type"     />
+        <result property="noticeContent"  column="notice_content"  />
+        <result property="status"         column="status"          />
+        <result property="createBy"       column="create_by"       />
+        <result property="createTime"     column="create_time"     />
+        <result property="updateBy"       column="update_by"       />
+        <result property="updateTime"     column="update_time"     />
+        <result property="remark"         column="remark"          />
+    </resultMap>
+    
+    <sql id="selectNoticeVo">
+        select notice_id, notice_title, notice_type, cast(notice_content as char) as notice_content, status, create_by, create_time, update_by, update_time, remark 
+		from sys_notice
+    </sql>
+    
+    <select id="selectNoticeById" parameterType="Long" resultMap="SysNoticeResult">
+        <include refid="selectNoticeVo"/>
+        where notice_id = #{noticeId}
+    </select>
+    
+    <select id="selectNoticeList" parameterType="com.usky.system.domain.SysNotice" resultMap="SysNoticeResult">
+        <include refid="selectNoticeVo"/>
+        <where>
+			<if test="noticeTitle != null and noticeTitle != ''">
+				AND notice_title like concat('%', #{noticeTitle}, '%')
+			</if>
+			<if test="noticeType != null and noticeType != ''">
+				AND notice_type = #{noticeType}
+			</if>
+			<if test="createBy != null and createBy != ''">
+				AND create_by like concat('%', #{createBy}, '%')
+			</if>
+		</where>
+    </select>
+    
+    <insert id="insertNotice" parameterType="com.usky.system.domain.SysNotice">
+        insert into sys_notice (
+			<if test="noticeTitle != null and noticeTitle != '' ">notice_title, </if>
+			<if test="noticeType != null and noticeType != '' ">notice_type, </if>
+			<if test="noticeContent != null and noticeContent != '' ">notice_content, </if>
+			<if test="status != null and status != '' ">status, </if>
+			<if test="remark != null and remark != ''">remark,</if>
+ 			<if test="createBy != null and createBy != ''">create_by,</if>
+ 			create_time
+ 		)values(
+			<if test="noticeTitle != null and noticeTitle != ''">#{noticeTitle}, </if>
+			<if test="noticeType != null and noticeType != ''">#{noticeType}, </if>
+			<if test="noticeContent != null and noticeContent != ''">#{noticeContent}, </if>
+			<if test="status != null and status != ''">#{status}, </if>
+			<if test="remark != null and remark != ''">#{remark},</if>
+ 			<if test="createBy != null and createBy != ''">#{createBy},</if>
+ 			sysdate()
+		)
+    </insert>
+	 
+    <update id="updateNotice" parameterType="com.usky.system.domain.SysNotice">
+        update sys_notice 
+        <set>
+            <if test="noticeTitle != null and noticeTitle != ''">notice_title = #{noticeTitle}, </if>
+            <if test="noticeType != null and noticeType != ''">notice_type = #{noticeType}, </if>
+            <if test="noticeContent != null">notice_content = #{noticeContent}, </if>
+            <if test="status != null and status != ''">status = #{status}, </if>
+            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+ 			update_time = sysdate()
+        </set>
+        where notice_id = #{noticeId}
+    </update>
+	
+    <delete id="deleteNoticeById" parameterType="Long">
+        delete from sys_notice where notice_id = #{noticeId}
+    </delete>
+    
+    <delete id="deleteNoticeByIds" parameterType="Long">
+        delete from sys_notice where notice_id in 
+        <foreach item="noticeId" collection="array" open="(" separator="," close=")">
+            #{noticeId}
+        </foreach>
+    </delete>
+    
+</mapper>

service-system/service-system-biz/src/main/resources/mapper/system/SysOperLogMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.usky.system.mapper.SysOperLogMapper">
 
-	<resultMap type="com.usky.system.domain.SysOperLogVO" id="SysOperLogResult">
+	<resultMap type="com.usky.system.domain.SysOperLog" id="SysOperLogResult">
 		<id     property="operId"         column="oper_id"        />
 		<result property="title"          column="title"          />
 		<result property="businessType"   column="business_type"  />
@@ -28,12 +28,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from sys_oper_log
     </sql>
     
-	<insert id="insertOperlog" parameterType="com.usky.system.domain.SysOperLogVO">
+	<insert id="insertOperlog" parameterType="com.usky.system.domain.SysOperLog">
 		insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time)
         values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, sysdate())
 	</insert>
 	
-	<select id="selectOperLogList" parameterType="com.usky.system.domain.SysOperLogVO" resultMap="SysOperLogResult">
+	<select id="selectOperLogList" parameterType="com.usky.system.domain.SysOperLog" resultMap="SysOperLogResult">
 		<include refid="selectOperLogVo"/>
 		<where>
 			<if test="title != null and title != ''">

service-system/service-system-biz/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.usky.system.mapper.SysRoleMapper">
 
-	<resultMap type="com.usky.system.domain.SysRoleVO" id="SysRoleResult">
+	<resultMap type="com.usky.system.domain.SysRole" id="SysRoleResult">
 		<id     property="roleId"             column="role_id"               />
 		<result property="roleName"           column="role_name"             />
 		<result property="roleKey"            column="role_key"              />
@@ -30,14 +30,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	        left join sys_dept d on u.dept_id = d.dept_id
     </sql>
     
-    <select id="selectRoleList" parameterType="com.usky.system.domain.SysRoleVO" resultMap="SysRoleResult">
+    <select id="selectRoleList" parameterType="com.usky.system.domain.SysRole" resultMap="SysRoleResult">
 		<include refid="selectRoleVo"/>
 		where r.del_flag = '0'
 		<if test="roleName != null and roleName != ''">
 			AND r.role_name like concat('%', #{roleName}, '%')
 		</if>
-		<if test="createByOne != null and createByOne != ''">
-			AND r.create_by = #{createByOne}
+		<if test="createBy != null and createBy != ''">
+			AND r.create_by = #{createBy}
 		</if>
 		<if test="status != null and status != ''">
 			AND r.status = #{status}
@@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		 where r.role_key=#{roleKey} limit 1
 	</select>
 	
- 	<insert id="insertRole" parameterType="com.usky.system.domain.SysRoleVO" useGeneratedKeys="true" keyProperty="roleId">
+ 	<insert id="insertRole" parameterType="com.usky.system.domain.SysRole" useGeneratedKeys="true" keyProperty="roleId">
  		insert into sys_role(
  			<if test="roleId != null and roleId != 0">role_id,</if>
  			<if test="roleName != null and roleName != ''">role_name,</if>
@@ -121,7 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		)
 	</insert>
 	
-	<update id="updateRole" parameterType="com.usky.system.domain.SysRoleVO">
+	<update id="updateRole" parameterType="com.usky.system.domain.SysRole">
  		update sys_role
  		<set>
  			<if test="roleName != null and roleName != ''">role_name = #{roleName},</if>

service-system/service-system-biz/src/main/resources/mapper/system/SysUserMapper.xml

@@ -57,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
     
     <select id="selectUserList" parameterType="com.usky.system.domain.SysUser" resultMap="SysUserResult">
-		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader,u.center_user_id from sys_user u
+		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
 		where u.del_flag = '0'
 		<if test="userName != null and userName != ''">

service-system/service-system-biz/src/test/java/com/usky/dm/controller/DcsArchetypeApplicationTests.java

@@ -0,0 +1,9 @@
+package com.usky.dm.controller;
+
+
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+class DcsArchetypeApplicationTests {
+
+}