系统先跑起来

modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ICoreTreeService.java

@@ -12,4 +12,11 @@ import cn.estsh.i3plus.pojo.platform.bean.Department;
 public interface ICoreTreeService {
 
     Department getDepartmentTreeByParentId(long depParentId);
+
+    /**
+     * 生成子集树递归方法
+     * @param parent 父类对象
+     * @param step 层级
+     */
+    void findDepartmentChildrenTreePack(Department parent,int step);
 }

modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMenuService.java

@@ -1,9 +1,8 @@
 package cn.estsh.i3plus.core.api.iservice.busi;
 
-import cn.estsh.i3plus.pojo.model.busi.ResultBean;
+
+import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
 import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
-import cn.estsh.i3plus.pojo.platform.bean.SysUser;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -21,24 +20,23 @@ public interface ISysMenuService {
      *
      * @param sysMenu
      */
-    ResultBean updateSysMenu(SysMenu sysMenu);
+    void updateSysMenu(SysMenu sysMenu);
 
     /**
      * 修改权限状态
      * @param id        修改权限状态
      * @param status    状态
-     * @param modifyUser  当前用户名称
+     * @param user      当前会话用户
      * @return
      */
-    ResultBean updateSysMenuStatus(long id,int status,String modifyUser);
+    void updateSysMenuStatus(long id, int status, SessionUser user);
 
     /**
      * 根据Key 删除数据
      * @param id
-     * @param modifyUser 当前用户名称
      * @return
      */
-    ResultBean deleteSysMenuById(long id,String modifyUser);
+    void deleteSysMenuById(long id);
 
     /**
      * 新增数据
@@ -46,7 +44,7 @@ public interface ISysMenuService {
      * @param sysMenu
      * @return
      */
-    ResultBean insertSysMenu(SysMenu sysMenu);
+    SysMenu insertSysMenu(SysMenu sysMenu);
 
     /**
      * 查询所有数据

modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysRoleService.java

@@ -1,6 +1,6 @@
 package cn.estsh.i3plus.core.api.iservice.busi;
 
-import cn.estsh.i3plus.pojo.model.busi.ResultBean;
+import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
 import cn.estsh.i3plus.pojo.platform.bean.SysRole;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -26,17 +26,16 @@ public interface ISysRoleService {
      * 修改权限状态
      * @param id        修改权限状态
      * @param status    状态
-     * @param modifyUser  当前用户名称
+     * @param user      当前用户会话
      * @return
      */
-    ResultBean updateSysRoleStatus(long id, int status, String modifyUser);
+    void updateSysRoleStatus(long id, int status, SessionUser user);
 
     /**
      * 根据Key 删除数据
-     *
      * @param id
      */
-    void deleteSysRoleById(long id,String modifyUser);
+    void deleteSysRoleById(long id);
 
     /**
      * 新增数据

modules/i3plus-core-apiservice/pom.xml

@@ -85,8 +85,10 @@
         <dependency>
             <groupId>i3plus.pojo</groupId>
             <artifactId>i3plus-pojo-mes</artifactId>
-            <version>1.0-SNAPSHOT</version>
+        </dependency>
-            <scope>compile</scope>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
         </dependency>
     </dependencies>
 

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/EnumController.java

@@ -2,14 +2,14 @@ package cn.estsh.i3plus.core.apiservice.controller.busi;
 
 import cn.estsh.i3plus.platform.common.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.platform.common.enumutil.ImppEnumUtil;
-import cn.estsh.i3plus.pojo.model.busi.ResultBean;
+
+import cn.estsh.impp.framework.boot.util.ResultBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 
 /**
@@ -24,23 +24,23 @@ import java.util.Arrays;
 @Api(description = "系统枚举服务")
 public class EnumController {
 
-    @GetMapping("/find/method-level")
+    @GetMapping("/method-level")
     @ApiOperation(value = "功能类型", notes = "查询全部功能类型功能")
-    public ResultBean getByEnumMethodLevel(){
+    public ResultBean getEnumMethodLevel(){
          return new ResultBean(true, "操作成功",
                  Arrays.asList(CommonEnumUtil.METHOD_LEVEL.values()));
     }
 
-    @GetMapping("/find/status")
+    @GetMapping("/data-status")
-    @ApiOperation(value = "功能状态", notes = "查询全部功能状态功能")
+    @ApiOperation(value = "数据功能状态", notes = "查询全部数据状态功能")
-    public ResultBean getByStatus(){
+    public ResultBean getEnumDataStatus(){
         return new ResultBean(true, "操作成功",
-                Arrays.asList(CommonEnumUtil.STATUS.values()));
+                Arrays.asList(CommonEnumUtil.DATA_STATUS.values()));
     }
 
-    @GetMapping("/find/organize-type")
+    @GetMapping("/organize-type")
     @ApiOperation(value = "组织类型", notes = "查询全部组织类型功能")
-    public ResultBean getByOrganizeType(){
+    public ResultBean getEnumOrganizeType(){
         return new ResultBean(true, "操作成功",
                 Arrays.asList(ImppEnumUtil.ORGANIZE_YTPE.values()));
     }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java

@@ -1,18 +1,21 @@
-package cn.estsh.i3plus.core.apiservice.controller.busi;
+ package cn.estsh.i3plus.core.apiservice.controller.busi;
 
-import cn.estsh.i3plus.core.api.iservice.busi.ISysMenuService;
+ import cn.estsh.i3plus.core.api.iservice.busi.ISysMenuService;
-import cn.estsh.i3plus.platform.common.enumutil.CommonEnumUtil;
+ import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
-import cn.estsh.i3plus.pojo.model.busi.ResultBean;
+ import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
-import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
+ import cn.estsh.i3plus.pojo.platform.bean.SysUser;
-import cn.estsh.i3plus.pojo.platform.bean.SysUser;
+ import cn.estsh.impp.framework.boot.auth.AuthUtil;
-import io.swagger.annotations.Api;
+ import cn.estsh.impp.framework.boot.exception.ImppBusiException;
-import io.swagger.annotations.ApiOperation;
+ import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
-import org.slf4j.Logger;
+ import cn.estsh.impp.framework.boot.util.ResultBean;
-import org.slf4j.LoggerFactory;
+ import io.swagger.annotations.Api;
-import org.springframework.beans.factory.annotation.Autowired;
+ import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.*;
+ import org.slf4j.Logger;
+ import org.slf4j.LoggerFactory;
+ import org.springframework.beans.factory.annotation.Autowired;
+ import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
+ import java.util.List;
 
 /**
  * @Description : 系统功能对外接口
@@ -23,20 +26,27 @@ import java.util.List;
  **/
 @RestController
 @RequestMapping("/sys-menu")
-@Api(description = "系统功能")
+@Api(description = "系统功能服务")
 public class SysMenuController {
 
     public static final Logger LOGGER = LoggerFactory.getLogger(SysMenuController.class);
 
-    public static final SysUser USER = new SysUser(10086L, "中国移动");
-
     @Autowired
     private ISysMenuService sysMenuService;
 
     @PostMapping(value = "/insert")
     @ApiOperation(value = "新增系统功能", notes = "系统功能")
     public ResultBean insertSysMenu(SysMenu sysMenu) {
-        return sysMenuService.insertSysMenu(sysMenu);
+        try {
+            SysMenu menu = sysMenuService.insertSysMenu(sysMenu);
+            return new ResultBean(true,menu);
+        } catch(ImppBusiException busExcep){
+            LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
+            return ResultBean.fail(busExcep.getErrorShow());
+        }catch(Exception e){
+            LOGGER.error(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getDescription() + "：{}",e.getMessage(),e);
+            return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
+        }
     }
 
     @PutMapping(value = "/update")
@@ -52,8 +62,16 @@ public class SysMenuController {
     @DeleteMapping(value = "/delete")
     @ApiOperation(value = "删除系统功能", notes = "删除系统功能")
     public ResultBean deleteSysMenu(long id) {
-        return sysMenuService.deleteSysMenuById(id, USER.getOrganizationNameRdd());
+        try {
-//        return new ResultBean(true, "操作成功");
+            sysMenuService.deleteSysMenuById(id);
+             return new ResultBean(true);
+        } catch(ImppBusiException busExcep){
+            LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
+            return ResultBean.fail(busExcep.getErrorShow());
+        }catch(Exception e){
+            LOGGER.error(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getDescription() + "：{}",e.getMessage(),e);
+            return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
+        }
     }
 
     @GetMapping(value = "/findSysMenuAll")
@@ -73,7 +91,16 @@ public class SysMenuController {
     @PutMapping(value = "/updateStatus")
     @ApiOperation(value = "修改权限状态", notes = "根据ID修改权限状态")
     public ResultBean updateStatus(long id,int status) {
-        return sysMenuService.updateSysMenuStatus(id,status,USER.getEmployeeNameRdd());
+        try {
+            sysMenuService.updateSysMenuStatus(id,status,AuthUtil.getSessionUser());
+            return new ResultBean(true);
+        } catch(ImppBusiException busExcep){
+            LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
+            return ResultBean.fail(busExcep.getErrorShow());
+        }catch(Exception e){
+            LOGGER.error(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getDescription() + "：{}",e.getMessage(),e);
+            return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
+        }
     }
 
 

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java

@@ -1,9 +1,13 @@
 package cn.estsh.i3plus.core.apiservice.controller.busi;
 
 import cn.estsh.i3plus.core.api.iservice.busi.ISysRoleService;
-import cn.estsh.i3plus.pojo.model.busi.ResultBean;
+import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
 import cn.estsh.i3plus.pojo.platform.bean.SysRole;
 import cn.estsh.i3plus.pojo.platform.bean.SysUser;
+import cn.estsh.impp.framework.boot.auth.AuthUtil;
+import cn.estsh.impp.framework.boot.exception.ImppBusiException;
+import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
+import cn.estsh.impp.framework.boot.util.ResultBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
@@ -15,19 +19,18 @@ import java.util.List;
 
 /**
  * @Description : 系统角色对外接口
- * @Reference   :
+ * @Reference :
- * @Author      : wei.peng
+ * @Author : wei.peng
- * @Date        : 2018-10-22 16:58:43.790
+ * @Date : 2018-10-22 16:58:43.790
- * @Modify      :
+ * @Modify :
  **/
 @RestController
 @RequestMapping("/sys-role")
-@Api(description = "系统角色")
+@Api(description = "系统角色服务")
 public class SysRoleController {
 
     public static final Logger LOGGER = LoggerFactory.getLogger(SysRoleController.class);
 
-    public static final SysUser USER = new SysUser(10086L, "中国移动");
 
     @Autowired
     private ISysRoleService sysRoleService;
@@ -35,8 +38,16 @@ public class SysRoleController {
     @PostMapping(value = "/insert")
     @ApiOperation(value = "新增系统角色", notes = "系统角色")
     public ResultBean insertSysRole(SysRole sysRole) {
-        sysRoleService.insertSysRole(sysRole);
+        try {
-        return new ResultBean(true, "操作成功", sysRole);
+            SysRole role = sysRoleService.insertSysRole(sysRole);
+            return new ResultBean(true, role);
+        } catch (ImppBusiException busExcep) {
+            LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
+            return ResultBean.fail(busExcep.getErrorShow());
+        } catch (Exception e) {
+            LOGGER.error(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getDescription() + "：{}", e.getMessage(), e);
+            return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
+        }
     }
 
     @PutMapping(value = "/update")
@@ -49,7 +60,7 @@ public class SysRoleController {
     @DeleteMapping(value = "/delete")
     @ApiOperation(value = "删除系统角色", notes = "删除系统角色")
     public ResultBean deleteSysRole(long id) {
-        sysRoleService.deleteSysRoleById(id,USER.getEmployeeNameRdd());
+        sysRoleService.deleteSysRoleById(id);
         return new ResultBean(true, "操作成功");
     }
 
@@ -69,7 +80,17 @@ public class SysRoleController {
 
     @PutMapping(value = "/updateStatus")
     @ApiOperation(value = "修改权限状态", notes = "根据ID修改权限状态")
-    public ResultBean updateStatus(long id,int status) {
+    public ResultBean updateStatus(long id, int status) {
-        return sysRoleService.updateSysRoleStatus(id,status,USER.getEmployeeNameRdd());
+        try {
+
+            sysRoleService.updateSysRoleStatus(id, status, AuthUtil.getSessionUser());
+            return new ResultBean(true);
+        } catch (ImppBusiException busExcep) {
+            LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
+            return ResultBean.fail(busExcep.getErrorShow());
+        } catch (Exception e) {
+            LOGGER.error(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getDescription() + "：{}", e.getMessage(), e);
+            return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
+        }
     }
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeServiceImpl.java

@@ -3,9 +3,13 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
 import cn.estsh.i3plus.core.api.iservice.busi.ICoreTreeService;
 import cn.estsh.i3plus.pojo.platform.bean.Department;
 import cn.estsh.i3plus.pojo.platform.repository.DepartmentRepository;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @Description : 通用树实现类
  * @Reference :
@@ -16,12 +20,36 @@ import org.springframework.stereotype.Service;
 @Service
 public class CoreTreeServiceImpl implements ICoreTreeService {
 
+    public static final Logger LOGGER = LoggerFactory.getLogger(CoreTreeServiceImpl.class);
+
     @Autowired
-    private DepartmentRepository departmentDao
+    private DepartmentRepository departmentRDao;
 
     @Override
     public Department getDepartmentTreeByParentId(long depParentId) {
-        Department dep = new Department();
+        Department depParent = departmentRDao.getById(depParentId);
-        return dep;
+        //封装子集
+        findDepartmentChildrenTreePack(depParent,0);
+        return depParent;
+    }
+
+    /**
+     * 封装部门子集
+     * @param parent
+     */
+    @Override
+    public void findDepartmentChildrenTreePack(Department parent,int step){
+        ++step;
+        List<Department> childDepList = departmentRDao.findByProperty("parentId",parent.getId());
+
+        if(childDepList.size() > 0){
+            //说明有子集
+            for(Department depChild : childDepList){
+                findDepartmentChildrenTreePack(depChild,step);
+            }
+        }
+
+        LOGGER.info("【{}】包含子集：{},步长：{}",parent.getName(),childDepList.size(),step);
+        parent.setChildList(childDepList);
     }
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/OrganizeServiceImpl.java

@@ -2,7 +2,6 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
 
 import cn.estsh.i3plus.core.api.iservice.busi.IOrganizeService;
 import cn.estsh.i3plus.platform.common.enumutil.ImppEnumUtil;
-import cn.estsh.i3plus.pojo.model.busi.ResultBean;
 import cn.estsh.i3plus.pojo.platform.bean.Organize;
 import cn.estsh.i3plus.pojo.platform.repository.OrganizeRepository;
 import org.slf4j.Logger;

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuServiceImpl.java

@@ -3,17 +3,18 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysMenuService;
 import cn.estsh.i3plus.core.apiservice.dao.ISysMenuDao;
 import cn.estsh.i3plus.platform.common.enumutil.CommonEnumUtil;
-import cn.estsh.i3plus.pojo.model.busi.ResultBean;
+import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
 import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
-import cn.estsh.i3plus.pojo.platform.bean.SysUser;
 import cn.estsh.i3plus.pojo.platform.repository.SysMenuRepository;
+import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
+import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
+import cn.estsh.impp.framework.boot.util.ResultBean;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
-import java.util.Optional;
 
 /**
  * @Description : 系统功能业务接口实现 
@@ -34,51 +35,56 @@ public class SysMenuServiceImpl implements ISysMenuService {
     private ISysMenuDao iSysMenuDao;
 
     @Override
-    public ResultBean updateSysMenu(SysMenu sysMenu) {
+    public void updateSysMenu(SysMenu sysMenu) {
         LOGGER.info("系统功能 SYS_MENU :{}", sysMenu);
         if(sysMenu != null){
             sysMenuRepository.update(sysMenu);
-            return new ResultBean(true,"操作成功",sysMenu);
         }
-        return new ResultBean(false,"操作失败");
+        throw ImppExceptionBuilder.newInstance()
+                .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode())
+                .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode())
+                .setErrorDetail("数据不存在")
+                .setErrorSolution("请重新操作")
+                .build();
     }
 
     @Override
-    public ResultBean updateSysMenuStatus(long id, int status, String modifyUser) {
+    public void updateSysMenuStatus(long id, int status, SessionUser user) {
-        LOGGER.info("系统功能 SYS_MENU  id:{} status:{} modifyUser:{}", id,status,modifyUser);
+        LOGGER.info("系统功能 SYS_MENU  id:{} status:{} user:{}", id,status,user);
         SysMenu menu = sysMenuRepository.getById(id);
         if(null != menu){
             menu.setMenuStatus(status);
-            menu.setModifyUser(modifyUser);
+            menu.setModifyUser(user.getUserName());
             sysMenuRepository.update(menu);
-            //TODO 统一修改
+        }else{
-//            String modifyDatetime = "";
+            throw ImppExceptionBuilder.newInstance()
-//            sysMenuRepository.updateByProperties(
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode())
-//                    new String[]{"id"},
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode())
-//                    new Object[]{id},
+                    .setErrorDetail("数据不存在")
-//                    new String[]{"menuStatus","modifyUser","modifyDatetime"},
+                    .setErrorSolution("请重新操作")
-//                    new Object[]{status,modifyUser,modifyDatetime}
+                    .build();
-//            );
-//            return new ResultBean(true,"操作成功");
-            return new ResultBean(true,"操作成功");
         }
-        return new ResultBean();
     }
 
     @Override
-    public ResultBean deleteSysMenuById(long id,String modifyUser) {
+    public void deleteSysMenuById(long id) {
         LOGGER.info("系统功能 SYS_MENU Key:{}", id);
         //TODO 记录平台用户操作日志
         long count = iSysMenuDao.queryCountByParentId(id);
         if(count >= 1){
-            return new ResultBean(false,"操作失败","该数据有引用关系，请先删除引用关系");
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode())
+                    .setErrorCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode())
+                    .setErrorDetail("数据存在子集")
+                    .setErrorSolution("请删除子集在操作")
+                    .build();
+
         }
         sysMenuRepository.deleteById(id);
-        return new ResultBean(true,"操作成功");
     }
 
     @Override
-    public ResultBean insertSysMenu(SysMenu sysMenu) {
+    public SysMenu insertSysMenu(SysMenu sysMenu) {
         LOGGER.info("系统功能 SYS_MENU :{}", sysMenu);
         if(null != sysMenu.getMenuTypeId()){
             sysMenu.setRedMenuTypeName(CommonEnumUtil.METHOD_LEVEL.valueOf(sysMenu.getMenuTypeId()));
@@ -90,8 +96,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
             }
 
         }
-        SysMenu insert = sysMenuRepository.insert(sysMenu);
+        return sysMenuRepository.insert(sysMenu);
-        return new ResultBean(true,"操作成功",insert);
     }
 
     @Override

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleServiceImpl.java

@@ -1,10 +1,12 @@
 package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
 
 import cn.estsh.i3plus.core.api.iservice.busi.ISysRoleService;
-import cn.estsh.i3plus.pojo.model.busi.ResultBean;
+import cn.estsh.i3plus.platform.common.enumutil.CommonEnumUtil;
-import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
+import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
 import cn.estsh.i3plus.pojo.platform.bean.SysRole;
 import cn.estsh.i3plus.pojo.platform.repository.SysRoleRepository;
+import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
+import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,28 +36,25 @@ public class SysRoleServiceImpl implements ISysRoleService {
     }
 
     @Override
-    public ResultBean updateSysRoleStatus(long id, int status, String modifyUser) {
+    public void updateSysRoleStatus(long id, int status, SessionUser user) {
-        LOGGER.info("系统角色 SYS_MENU  id:{} status:{} modifyUser:{}", id,status,modifyUser);
+        LOGGER.info("系统角色 SYS_MENU  id:{} status:{} user:{}", id,status,user);
         SysRole role = sysRoleRepository.getById(id);
         if(null != role){
             role.setRoleStatus(status);
-            role.setModifyUser(modifyUser);
+            role.setModifyUser(user.getUserName());
             sysRoleRepository.update(role);
-            //TODO 统一修改
+        }else {
-//            String modifyDatetime = "";
+            throw ImppExceptionBuilder.newInstance()
-//            sysMenuRepository.updateByProperties(
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode())
-//                    new String[]{"id"},
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode())
-//                    new Object[]{id},
+                    .setErrorDetail("数据不存在")
-//                    new String[]{"menuStatus","modifyUser","modifyDatetime"},
+                    .setErrorSolution("请重新操作")
-//                    new Object[]{status,modifyUser,modifyDatetime}
+                    .build();
-//            );
-//            return new ResultBean(true,"操作成功");
-            return new ResultBean(true,"操作成功");
         }
-        return new ResultBean();    }
+    }
 
     @Override
-    public void deleteSysRoleById(long id,String modifyUser) {
+    public void deleteSysRoleById(long id) {
         LOGGER.info("系统角色 SYS_ROLE Key:{}", id);
         sysRoleRepository.deleteById(id);
     }

modules/i3plus-core-apiservice/src/main/resources/application.properties

@@ -1,7 +1,7 @@
 #项目名称
 spring.application.name=${project.name}
 #项目端口
-server.port=8081
+server.port=8080
 
 #使用配置
 spring.profiles.active=dev

pom.xml

@@ -80,6 +80,12 @@
                 <version>${project.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>i3plus.pojo</groupId>
+                <artifactId>i3plus-pojo-mes</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
             <!-- mysql -->
             <dependency>
                 <groupId>mysql</groupId>