ignore整理

modules/i3plus-core-api/pom.xml

@@ -16,8 +16,10 @@
         <dependency>
             <groupId>i3plus.pojo</groupId>
             <artifactId>i3plus-pojo-platform</artifactId>
-            <version>1.0-SNAPSHOT</version>
+        </dependency>
-            <scope>compile</scope>
+        <dependency>
+            <groupId>i3plus.pojo</groupId>
+            <artifactId>i3plus-pojo-mes</artifactId>
         </dependency>
 
         <!-- shiro -->
@@ -25,12 +27,6 @@
             <groupId>org.apache.shiro</groupId>
             <artifactId>shiro-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>i3plus.pojo</groupId>
-            <artifactId>i3plus-pojo-mes</artifactId>
-            <version>1.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
 </project>

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

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

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

@@ -1,6 +1,5 @@
 package cn.estsh.i3plus.core.api.iservice.busi;
 
-import cn.estsh.i3plus.pojo.model.busi.ResultBean;
 import cn.estsh.i3plus.pojo.platform.bean.SysRole;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -29,7 +28,7 @@ public interface ISysRoleService {
      * @param modifyUser  当前用户名称
      * @return
      */
-    ResultBean updateSysRoleStatus(long id, int status, String modifyUser);
+    void updateSysRoleStatus(long id, int status, String modifyUser);
 
     /**
      * 根据Key 删除数据

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

@@ -1,8 +1,8 @@
 package cn.estsh.i3plus.core.apiservice.controller.busi;
 
-import cn.estsh.i3plus.platform.common.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
-import cn.estsh.i3plus.platform.common.enumutil.ImppEnumUtil;
+import cn.estsh.i3plus.pojo.base.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;

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

@@ -1,8 +1,8 @@
 package cn.estsh.i3plus.core.apiservice.controller.busi;
 
 import cn.estsh.i3plus.core.api.iservice.busi.ISysMenuService;
-import cn.estsh.i3plus.platform.common.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
-import cn.estsh.i3plus.pojo.model.busi.ResultBean;
+import cn.estsh.impp.framework.boot.util.ResultBean;
 import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
 import cn.estsh.i3plus.pojo.platform.bean.SysUser;
 import io.swagger.annotations.Api;
@@ -28,15 +28,14 @@ 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);
+        sysMenuService.insertSysMenu(sysMenu);
+        return null;
     }
 
     @PutMapping(value = "/update")
@@ -52,8 +51,9 @@ public class SysMenuController {
     @DeleteMapping(value = "/delete")
     @ApiOperation(value = "删除系统功能", notes = "删除系统功能")
     public ResultBean deleteSysMenu(long id) {
-        return sysMenuService.deleteSysMenuById(id, USER.getOrganizationNameRdd());
+        sysMenuService.deleteSysMenuById(id, "");
 //        return new ResultBean(true, "操作成功");
+        return null;
     }
 
     @GetMapping(value = "/findSysMenuAll")
@@ -73,7 +73,9 @@ public class SysMenuController {
     @PutMapping(value = "/updateStatus")
     @ApiOperation(value = "修改权限状态", notes = "根据ID修改权限状态")
     public ResultBean updateStatus(long id,int status) {
-        return sysMenuService.updateSysMenuStatus(id,status,USER.getEmployeeNameRdd());
+        sysMenuService.updateSysMenuStatus(id,status,"");
+
+        return null;
     }
 
 

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

@@ -1,9 +1,9 @@
 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.SysRole;
 import cn.estsh.i3plus.pojo.platform.bean.SysUser;
+import cn.estsh.impp.framework.boot.util.ResultBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
@@ -27,8 +27,6 @@ public class SysRoleController {
 
     public static final Logger LOGGER = LoggerFactory.getLogger(SysRoleController.class);
 
-    public static final SysUser USER = new SysUser(10086L, "中国移动");
-
     @Autowired
     private ISysRoleService sysRoleService;
 
@@ -49,7 +47,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, "操作成功");
     }
 
@@ -70,6 +68,7 @@ public class SysRoleController {
     @PutMapping(value = "/updateStatus")
     @ApiOperation(value = "修改权限状态", notes = "根据ID修改权限状态")
     public ResultBean updateStatus(long id,int status) {
-        return sysRoleService.updateSysRoleStatus(id,status,USER.getEmployeeNameRdd());
+        //return sysRoleService.updateSysRoleStatus(id,status,USER.getEmployeeNameRdd());
+        return null;
     }
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/dao/ISysMenuDao.java

@@ -1,6 +1,5 @@
 package cn.estsh.i3plus.core.apiservice.dao;
 
-import cn.estsh.i3plus.core.apiservice.serviceimpl.busi.SysMenuServiceImpl;
 import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/ISysMenuDaoImpl.java

@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.core.apiservice.daoimpl;
 
 import cn.estsh.i3plus.core.apiservice.dao.ISysMenuDao;
-import cn.estsh.i3plus.core.apiservice.serviceimpl.busi.SysMenuServiceImpl;
 import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

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

@@ -17,7 +17,7 @@ import org.springframework.stereotype.Service;
 public class CoreTreeServiceImpl implements ICoreTreeService {
 
     @Autowired
-    private DepartmentRepository departmentDao
+    private DepartmentRepository departmentDao;
 
     @Override
     public Department getDepartmentTreeByParentId(long depParentId) {

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

@@ -1,8 +1,8 @@
 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.base.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

@@ -2,8 +2,8 @@ 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.base.enumutil.CommonEnumUtil;
-import cn.estsh.i3plus.pojo.model.busi.ResultBean;
+import cn.estsh.impp.framework.boot.util.ResultBean;
 import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
 import cn.estsh.i3plus.pojo.platform.bean.SysUser;
 import cn.estsh.i3plus.pojo.platform.repository.SysMenuRepository;
@@ -34,17 +34,17 @@ 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(true,"操作成功",sysMenu);
         }
-        return new ResultBean(false,"操作失败");
+        //return new ResultBean(false,"操作失败");
     }
 
     @Override
-    public ResultBean updateSysMenuStatus(long id, int status, String modifyUser) {
+    public void updateSysMenuStatus(long id, int status, String modifyUser) {
         LOGGER.info("系统功能 SYS_MENU  id:{} status:{} modifyUser:{}", id,status,modifyUser);
         SysMenu menu = sysMenuRepository.getById(id);
         if(null != menu){
@@ -60,38 +60,38 @@ public class SysMenuServiceImpl implements ISysMenuService {
 //                    new Object[]{status,modifyUser,modifyDatetime}
 //            );
 //            return new ResultBean(true,"操作成功");
-            return new ResultBean(true,"操作成功");
+            //return new ResultBean(true,"操作成功");
         }
-        return new ResultBean();
+       // return new ResultBean();
     }
 
     @Override
-    public ResultBean deleteSysMenuById(long id,String modifyUser) {
+    public void deleteSysMenuById(long id,String modifyUser) {
         LOGGER.info("系统功能 SYS_MENU Key:{}", id);
         //TODO 记录平台用户操作日志
         long count = iSysMenuDao.queryCountByParentId(id);
         if(count >= 1){
-            return new ResultBean(false,"操作失败","该数据有引用关系，请先删除引用关系");
+            //return new ResultBean(false,"操作失败","该数据有引用关系，请先删除引用关系");
         }
         sysMenuRepository.deleteById(id);
-        return new ResultBean(true,"操作成功");
+        //return new ResultBean(true,"操作成功");
     }
 
     @Override
-    public ResultBean insertSysMenu(SysMenu sysMenu) {
+    public void insertSysMenu(SysMenu sysMenu) {
         LOGGER.info("系统功能 SYS_MENU :{}", sysMenu);
         if(null != sysMenu.getMenuTypeId()){
             sysMenu.setRedMenuTypeName(CommonEnumUtil.METHOD_LEVEL.valueOf(sysMenu.getMenuTypeId()));
         }
-        if(0 != sysMenu.getParentId()){
+        /*if(0 != sysMenu.getParentId()){
             SysMenu parent = sysMenuRepository.getById(sysMenu.getParentId());
             if(null != parent){
                 sysMenu.setRedParentName(parent.getName());
             }
 
-        }
+        }*/
         SysMenu insert = sysMenuRepository.insert(sysMenu);
-        return new ResultBean(true,"操作成功",insert);
+        //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,10 @@
 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.pojo.platform.bean.SysMenu;
 import cn.estsh.i3plus.pojo.platform.bean.SysRole;
 import cn.estsh.i3plus.pojo.platform.repository.SysRoleRepository;
+import cn.estsh.impp.framework.boot.util.ResultBean;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,11 +34,11 @@ public class SysRoleServiceImpl implements ISysRoleService {
     }
 
     @Override
-    public ResultBean updateSysRoleStatus(long id, int status, String modifyUser) {
+    public void updateSysRoleStatus(long id, int status, String modifyUser) {
         LOGGER.info("系统角色 SYS_MENU  id:{} status:{} modifyUser:{}", id,status,modifyUser);
         SysRole role = sysRoleRepository.getById(id);
         if(null != role){
-            role.setRoleStatus(status);
+            //role.setRoleStatus(status);
             role.setModifyUser(modifyUser);
             sysRoleRepository.update(role);
             //TODO 统一修改
@@ -50,9 +50,8 @@ public class SysRoleServiceImpl implements ISysRoleService {
 //                    new Object[]{status,modifyUser,modifyDatetime}
 //            );
 //            return new ResultBean(true,"操作成功");
-            return new ResultBean(true,"操作成功");
         }
-        return new ResultBean();    }
+    }
 
     @Override
     public void deleteSysRoleById(long id,String modifyUser) {

pom.xml

@@ -79,6 +79,16 @@
                 <artifactId>i3plus-platform-common</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>i3plus.pojo</groupId>
+                <artifactId>i3plus-pojo-platform</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>i3plus.pojo</groupId>
+                <artifactId>i3plus-pojo-mes</artifactId>
+                <version>${project.version}</version>
+            </dependency>
 
             <!-- mysql -->
             <dependency>