diff --git a/modules/i3plus-core-api/i3plus-core-api.iml b/modules/i3plus-core-api/i3plus-core-api.iml deleted file mode 100644 index fda6d1f..0000000 --- a/modules/i3plus-core-api/i3plus-core-api.iml +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IOrganizeService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IOrganizeService.java new file mode 100644 index 0000000..cfaabfd --- /dev/null +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IOrganizeService.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.core.api.iservice.busi; + +import cn.estsh.i3plus.pojo.platform.bean.Organize; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * @Description : 组织业务接口 + * @Reference : + * @Author : wei.peng + * @Date : 2018-10-22 16:58:42.941 + * @Modify : + **/ +public interface IOrganizeService { + + /** + * 修改数据 + * @param organize + */ + void updateOrganize(Organize organize); + + /** + * 根据Key 删除数据 + * @param id + * @param modifyUser 当前用户名称 + */ + void deleteOrganizeById(long id,String modifyUser); + + /** + * 新增数据 + * @param organize + * @return + */ + Organize insertOrganize(Organize organize); + + /** + * 查询所有数据 + * @return + */ + List findOrganizeAll(); + + /** + * 根据id 数据 + * @param id + * @return + */ + Organize getOrganizeById(long id); +} diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMenuService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMenuService.java new file mode 100644 index 0000000..173e10a --- /dev/null +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMenuService.java @@ -0,0 +1,68 @@ +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; + +import java.util.List; + +/** + * @Description : 系统功能业务接口 + * @Reference : + * @Author : wei.peng + * @Date : 2018-10-22 15:18:14.958 + * @Modify : + **/ +public interface ISysMenuService { + + /** + * 修改数据 + * + * @param sysMenu + */ + ResultBean updateSysMenu(SysMenu sysMenu); + + /** + * 修改权限状态 + * @param id 修改权限状态 + * @param status 状态 + * @param modifyUser 当前用户名称 + * @return + */ + ResultBean updateSysMenuStatus(long id,int status,String modifyUser); + + /** + * 根据Key 删除数据 + * @param id + * @param modifyUser 当前用户名称 + * @return + */ + ResultBean deleteSysMenuById(long id,String modifyUser); + + /** + * 新增数据 + * + * @param sysMenu + * @return + */ + ResultBean insertSysMenu(SysMenu sysMenu); + + /** + * 查询所有数据 + * + * @return + */ + List findSysMenuAll(); + + /** + * 根据id 数据 + * + * @param id + * @return + */ + SysMenu getSysMenuById(long id); + + + +} diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysRoleService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysRoleService.java new file mode 100644 index 0000000..e038e9a --- /dev/null +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysRoleService.java @@ -0,0 +1,63 @@ +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; + +import java.util.List; + +/** + * @Description : 系统角色业务接口 + * @Reference : + * @Author : wei.peng + * @Date : 2018-10-22 16:58:43.771 + * @Modify : + **/ +public interface ISysRoleService { + + /** + * 修改数据 + * + * @param sysRole + */ + void updateSysRole(SysRole sysRole); + + /** + * 修改权限状态 + * @param id 修改权限状态 + * @param status 状态 + * @param modifyUser 当前用户名称 + * @return + */ + ResultBean updateSysRoleStatus(long id, int status, String modifyUser); + + /** + * 根据Key 删除数据 + * + * @param id + */ + void deleteSysRoleById(long id,String modifyUser); + + /** + * 新增数据 + * + * @param sysRole + * @return + */ + SysRole insertSysRole(SysRole sysRole); + + /** + * 查询所有数据 + * + * @return + */ + List findSysRoleAll(); + + /** + * 根据id 数据 + * + * @param id + * @return + */ + SysRole getSysRoleById(long id); +} diff --git a/modules/i3plus-core-api/target/classes/cn/estsh/i3plus/core/api/iservice/base/IDataSimpleService.class b/modules/i3plus-core-api/target/classes/cn/estsh/i3plus/core/api/iservice/base/IDataSimpleService.class deleted file mode 100644 index d7c9b13..0000000 Binary files a/modules/i3plus-core-api/target/classes/cn/estsh/i3plus/core/api/iservice/base/IDataSimpleService.class and /dev/null differ diff --git a/modules/i3plus-core-api/target/classes/cn/estsh/i3plus/core/api/iservice/busi/IDataMoreService.class b/modules/i3plus-core-api/target/classes/cn/estsh/i3plus/core/api/iservice/busi/IDataMoreService.class deleted file mode 100644 index cd70fe9..0000000 Binary files a/modules/i3plus-core-api/target/classes/cn/estsh/i3plus/core/api/iservice/busi/IDataMoreService.class and /dev/null differ diff --git a/modules/i3plus-core-api/target/classes/cn/estsh/i3plus/core/api/iservice/busi/ISystemResourceService.class b/modules/i3plus-core-api/target/classes/cn/estsh/i3plus/core/api/iservice/busi/ISystemResourceService.class deleted file mode 100644 index 6a0eba7..0000000 Binary files a/modules/i3plus-core-api/target/classes/cn/estsh/i3plus/core/api/iservice/busi/ISystemResourceService.class and /dev/null differ diff --git a/modules/i3plus-core-api/target/classes/cn/estsh/i3plus/core/api/iservice/busi/ISystemUserService.class b/modules/i3plus-core-api/target/classes/cn/estsh/i3plus/core/api/iservice/busi/ISystemUserService.class deleted file mode 100644 index d9ef57c..0000000 Binary files a/modules/i3plus-core-api/target/classes/cn/estsh/i3plus/core/api/iservice/busi/ISystemUserService.class and /dev/null differ diff --git a/modules/i3plus-core-api/target/classes/cn/estsh/i3plus/core/api/token/AdminToken.class b/modules/i3plus-core-api/target/classes/cn/estsh/i3plus/core/api/token/AdminToken.class deleted file mode 100644 index 562f3c8..0000000 Binary files a/modules/i3plus-core-api/target/classes/cn/estsh/i3plus/core/api/token/AdminToken.class and /dev/null differ diff --git a/modules/i3plus-core-api/target/classes/cn/estsh/i3plus/core/api/token/BaseToken.class b/modules/i3plus-core-api/target/classes/cn/estsh/i3plus/core/api/token/BaseToken.class deleted file mode 100644 index 61743c7..0000000 Binary files a/modules/i3plus-core-api/target/classes/cn/estsh/i3plus/core/api/token/BaseToken.class and /dev/null differ diff --git a/modules/i3plus-core-api/target/classes/cn/estsh/i3plus/core/api/token/SaAdminToken.class b/modules/i3plus-core-api/target/classes/cn/estsh/i3plus/core/api/token/SaAdminToken.class deleted file mode 100644 index 0dd2fea..0000000 Binary files a/modules/i3plus-core-api/target/classes/cn/estsh/i3plus/core/api/token/SaAdminToken.class and /dev/null differ diff --git a/modules/i3plus-core-api/target/classes/cn/estsh/i3plus/core/api/token/UserToken.class b/modules/i3plus-core-api/target/classes/cn/estsh/i3plus/core/api/token/UserToken.class deleted file mode 100644 index 5e7bcac..0000000 Binary files a/modules/i3plus-core-api/target/classes/cn/estsh/i3plus/core/api/token/UserToken.class and /dev/null differ diff --git a/modules/i3plus-core-api/target/i3plus-core-api-1.0-SNAPSHOT.jar b/modules/i3plus-core-api/target/i3plus-core-api-1.0-SNAPSHOT.jar deleted file mode 100644 index 4a81a49..0000000 Binary files a/modules/i3plus-core-api/target/i3plus-core-api-1.0-SNAPSHOT.jar and /dev/null differ diff --git a/modules/i3plus-core-api/target/maven-archiver/pom.properties b/modules/i3plus-core-api/target/maven-archiver/pom.properties deleted file mode 100644 index 7396c0b..0000000 --- a/modules/i3plus-core-api/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Apache Maven -#Sun Sep 30 10:24:52 CST 2018 -version=1.0-SNAPSHOT -groupId=i3plus.core -artifactId=i3plus-core-api diff --git a/modules/i3plus-core-apiservice/i3plus-core-apiservice.iml b/modules/i3plus-core-apiservice/i3plus-core-apiservice.iml deleted file mode 100644 index 09ebf16..0000000 --- a/modules/i3plus-core-apiservice/i3plus-core-apiservice.iml +++ /dev/null @@ -1,164 +0,0 @@ - - - - - - - file://$MODULE_DIR$/src/main/java/cn/estsh/i3plus/core/apiservice/mq/I3CoreQueue.java - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/EnumController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/EnumController.java new file mode 100644 index 0000000..44c1e8d --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/EnumController.java @@ -0,0 +1,49 @@ +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 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; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @Date : 2018-10-22 15:58 + * @Modify : + **/ +@RestController +@RequestMapping("/enum") +@Api(description = "系统枚举服务") +public class EnumController { + + @GetMapping("/find/method-level") + @ApiOperation(value = "功能类型", notes = "查询全部功能类型功能") + public ResultBean getByEnumMethodLevel(){ + return new ResultBean(true, "操作成功", + Arrays.asList(CommonEnumUtil.METHOD_LEVEL.values())); + } + + @GetMapping("/find/status") + @ApiOperation(value = "功能状态", notes = "查询全部功能状态功能") + public ResultBean getByStatus(){ + return new ResultBean(true, "操作成功", + Arrays.asList(CommonEnumUtil.STATUS.values())); + } + + @GetMapping("/find/organize-type") + @ApiOperation(value = "组织类型", notes = "查询全部组织类型功能") + public ResultBean getByOrganizeType(){ + return new ResultBean(true, "操作成功", + Arrays.asList(ImppEnumUtil.ORGANIZE_YTPE.values())); + } + + +} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/OrganizeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/OrganizeController.java new file mode 100644 index 0000000..5dc0b4e --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/OrganizeController.java @@ -0,0 +1,70 @@ +package cn.estsh.i3plus.core.apiservice.controller.busi; + +import cn.estsh.i3plus.core.api.iservice.busi.IOrganizeService; +import cn.estsh.i3plus.pojo.model.busi.ResultBean; +import cn.estsh.i3plus.pojo.platform.bean.Organize; +import cn.estsh.i3plus.pojo.platform.bean.SysUser; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +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; + +/** + * @Description : 组织对外接口 + * @Reference : + * @Author : wei.peng + * @Date : 2018-10-22 16:58:42.972 + * @Modify : + **/ +@RestController +@RequestMapping("/organize") +@Api(description = "组织") +public class OrganizeController { + + public static final Logger LOGGER = LoggerFactory.getLogger(OrganizeController.class); + + public static final SysUser USER = new SysUser(10086L, "中国移动"); + + + @Autowired + private IOrganizeService organizeService; + + @PostMapping(value = "/insert") + @ApiOperation(value = "新增组织", notes = "组织") + public ResultBean insertOrganize(Organize organize) { + organizeService.insertOrganize(organize); + return new ResultBean(true, "操作成功", organize); + } + + @PutMapping(value = "/update") + @ApiOperation(value = "修改组织", notes = "组织") + public ResultBean updateOrganize(Organize organize) { + organizeService.updateOrganize(organize); + return new ResultBean(true, "操作成功", organize); + } + + @DeleteMapping(value = "/delete") + @ApiOperation(value = "删除组织", notes = "删除组织") + public ResultBean deleteOrganize(Long id) { + organizeService.deleteOrganizeById(id,USER.getEmployeeNameRdd()); + return new ResultBean(true, "操作成功"); + } + + @GetMapping(value = "/findOrganizeAll") + @ApiOperation(value = "查询Organize", notes = "查询所有组织") + public ResultBean findOrganizeAll() { + List list = organizeService.findOrganizeAll(); + return new ResultBean(true, "操作成功", list); + } + + @GetMapping(value = "/getOrganize/{id}") + @ApiOperation(value = "查询组织", notes = "查询根据ID查询组织") + public ResultBean getByOrganizeId(@PathVariable("id") long id) { + Organize organize = organizeService.getOrganizeById(id); + return new ResultBean(true, "操作成功", organize); + } +} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java new file mode 100644 index 0000000..823d551 --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java @@ -0,0 +1,80 @@ +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.model.busi.ResultBean; +import cn.estsh.i3plus.pojo.platform.bean.SysMenu; +import cn.estsh.i3plus.pojo.platform.bean.SysUser; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +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; + +/** + * @Description : 系统功能对外接口 + * @Reference : + * @Author : wei.peng + * @Date : 2018-10-22 15:18:14.982 + * @Modify : + **/ +@RestController +@RequestMapping("/sys-menu") +@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); + } + + @PutMapping(value = "/update") + @ApiOperation(value = "修改系统功能", notes = "系统功能") + public ResultBean updateSysMenu(SysMenu sysMenu) { + if(null == sysMenu || null == sysMenu.getId()){ + return new ResultBean(false, "操作失败","对象id不能为空为空"); + } + sysMenuService.updateSysMenu(sysMenu); + return new ResultBean(true, "操作成功", sysMenu); + } + + @DeleteMapping(value = "/delete") + @ApiOperation(value = "删除系统功能", notes = "删除系统功能") + public ResultBean deleteSysMenu(long id) { + return sysMenuService.deleteSysMenuById(id, USER.getOrganizationNameRdd()); +// return new ResultBean(true, "操作成功"); + } + + @GetMapping(value = "/findSysMenuAll") + @ApiOperation(value = "查询SysMenu", notes = "查询所有系统功能") + public ResultBean findSysMenuAll() { + List list = sysMenuService.findSysMenuAll(); + return new ResultBean(true, "操作成功", list); + } + + @GetMapping(value = "/getSysMenu/{id}") + @ApiOperation(value = "查询系统功能", notes = "查询根据ID查询系统功能") + public ResultBean getBySysMenuId(@PathVariable("id") long id) { + SysMenu sysMenu = sysMenuService.getSysMenuById(id); + return new ResultBean(true, "操作成功", sysMenu); + } + + @PutMapping(value = "/updateStatus") + @ApiOperation(value = "修改权限状态", notes = "根据ID修改权限状态") + public ResultBean updateStatus(long id,int status) { + return sysMenuService.updateSysMenuStatus(id,status,USER.getEmployeeNameRdd()); + } + + +} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java new file mode 100644 index 0000000..430667a --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java @@ -0,0 +1,75 @@ +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 io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +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; + +/** + * @Description : 系统角色对外接口 + * @Reference : + * @Author : wei.peng + * @Date : 2018-10-22 16:58:43.790 + * @Modify : + **/ +@RestController +@RequestMapping("/sys-role") +@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; + + @PostMapping(value = "/insert") + @ApiOperation(value = "新增系统角色", notes = "系统角色") + public ResultBean insertSysRole(SysRole sysRole) { + sysRoleService.insertSysRole(sysRole); + return new ResultBean(true, "操作成功", sysRole); + } + + @PutMapping(value = "/update") + @ApiOperation(value = "修改系统角色", notes = "系统角色") + public ResultBean updateSysRole(SysRole sysRole) { + sysRoleService.updateSysRole(sysRole); + return new ResultBean(true, "操作成功", sysRole); + } + + @DeleteMapping(value = "/delete") + @ApiOperation(value = "删除系统角色", notes = "删除系统角色") + public ResultBean deleteSysRole(long id) { + sysRoleService.deleteSysRoleById(id,USER.getEmployeeNameRdd()); + return new ResultBean(true, "操作成功"); + } + + @GetMapping(value = "/findSysRoleAll") + @ApiOperation(value = "查询SysRole", notes = "查询所有系统角色") + public ResultBean findSysRoleAll() { + List list = sysRoleService.findSysRoleAll(); + return new ResultBean(true, "操作成功", list); + } + + @GetMapping(value = "/getSysRole/{id}") + @ApiOperation(value = "查询系统角色", notes = "查询根据ID查询系统角色") + public ResultBean getBySysRoleId(@PathVariable("id") long id) { + SysRole sysRole = sysRoleService.getSysRoleById(id); + return new ResultBean(true, "操作成功", sysRole); + } + + @PutMapping(value = "/updateStatus") + @ApiOperation(value = "修改权限状态", notes = "根据ID修改权限状态") + public ResultBean updateStatus(long id,int status) { + return sysRoleService.updateSysRoleStatus(id,status,USER.getEmployeeNameRdd()); + } +} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/dao/IFactoryStoreDao.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/dao/IFactoryStoreDao.java index 18c2e2c..9691907 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/dao/IFactoryStoreDao.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/dao/IFactoryStoreDao.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.core.apiservice.dao; import cn.estsh.i3plus.pojo.wms.bean.FactoryStore; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; import java.util.List; @@ -16,4 +18,6 @@ import java.util.List; public interface IFactoryStoreDao { List listFactoryStore(); + + } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/dao/ISysMenuDao.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/dao/ISysMenuDao.java new file mode 100644 index 0000000..40b2a4a --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/dao/ISysMenuDao.java @@ -0,0 +1,20 @@ +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; +import org.springframework.data.repository.query.Param; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @Date : 2018-10-22 23:54 + * @Modify : + **/ +public interface ISysMenuDao { + + @Query("select count(id ) SysMenu sm where sm.parentId = :parentId") + long queryCountByParentId(@Param("id") long parentId); +} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/ISysMenuDaoImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/ISysMenuDaoImpl.java new file mode 100644 index 0000000..435a3c3 --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/ISysMenuDaoImpl.java @@ -0,0 +1,39 @@ +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; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.persistence.EntityManager; +import javax.persistence.criteria.CriteriaBuilder; +import javax.persistence.criteria.CriteriaQuery; +import javax.persistence.criteria.ParameterExpression; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @Date : 2018-10-22 23:55 + * @Modify : + **/ +@Service +public class ISysMenuDaoImpl implements ISysMenuDao { + + public static final Logger LOGGER = LoggerFactory.getLogger(ISysMenuDaoImpl.class); + + @Autowired + private EntityManager entityManager; + + @Override + public long queryCountByParentId(long parentId) { + LOGGER.info(" Parent Id :{}",parentId); + String hql = "select count(id) from SysMenu as sm where parentId =:parentId"; + + return (long)entityManager.createQuery(hql) + .setParameter("parentId",parentId).getSingleResult(); + } +} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/OrganizeServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/OrganizeServiceImpl.java new file mode 100644 index 0000000..5407356 --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/OrganizeServiceImpl.java @@ -0,0 +1,63 @@ +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; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @Description : 组织业务接口实现 + * @Reference : + * @Author : wei.peng + * @Date : 2018-10-22 16:58:42.957 + * @Modify : + **/ +@Service +public class OrganizeServiceImpl implements IOrganizeService { + + public static final Logger LOGGER = LoggerFactory.getLogger(OrganizeServiceImpl.class); + + @Autowired + private OrganizeRepository organizeRepository; + + @Override + public void updateOrganize(Organize organize) { + LOGGER.info("组织 ORGANIZE :{}", organize); + organizeRepository.update(organize); + } + + @Override + public void deleteOrganizeById(long id,String modifyUser) { + LOGGER.info("组织 ORGANIZE Key:{}", id); + //TODO 记录平台用户操作日志 + organizeRepository.deleteById(id); + } + + @Override + public Organize insertOrganize(Organize organize) { + LOGGER.info("组织 ORGANIZE :{}", organize); + if(null != organize.getOrganizationTypeId()){ + organize.setOrganizationTypeName(ImppEnumUtil.ORGANIZE_YTPE.valueOfCode(organize.getOrganizationTypeId())); + } + return organizeRepository.insert(organize); + } + + @Override + public List findOrganizeAll() { + LOGGER.info("组织 ORGANIZE find All"); + return organizeRepository.findAll(); + } + + @Override + public Organize getOrganizeById(long id) { + LOGGER.info("组织 ORGANIZE find id:{}", id); + return organizeRepository.getOne(id); + } +} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuServiceImpl.java new file mode 100644 index 0000000..8b38126 --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuServiceImpl.java @@ -0,0 +1,108 @@ +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.SysMenu; +import cn.estsh.i3plus.pojo.platform.bean.SysUser; +import cn.estsh.i3plus.pojo.platform.repository.SysMenuRepository; +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 : 系统功能业务接口实现 + * @Reference : + * @Author : wei.peng + * @Date : 2018-10-22 15:18:14.969 + * @Modify : + **/ +@Service +public class SysMenuServiceImpl implements ISysMenuService { + + public static final Logger LOGGER = LoggerFactory.getLogger(SysMenuServiceImpl.class); + + @Autowired + private SysMenuRepository sysMenuRepository; + + @Autowired + private ISysMenuDao iSysMenuDao; + + @Override + public ResultBean updateSysMenu(SysMenu sysMenu) { + LOGGER.info("系统功能 SYS_MENU :{}", sysMenu); + if(sysMenu != null){ + sysMenuRepository.update(sysMenu); + return new ResultBean(true,"操作成功",sysMenu); + } + return new ResultBean(false,"操作失败"); + } + + @Override + public ResultBean 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){ + menu.setMenuStatus(status); + menu.setModifyUser(modifyUser); + sysMenuRepository.update(menu); + //TODO 统一修改 +// String modifyDatetime = ""; +// sysMenuRepository.updateByProperties( +// new String[]{"id"}, +// new Object[]{id}, +// new String[]{"menuStatus","modifyUser","modifyDatetime"}, +// new Object[]{status,modifyUser,modifyDatetime} +// ); +// return new ResultBean(true,"操作成功"); + return new ResultBean(true,"操作成功"); + } + return new ResultBean(); + } + + @Override + public ResultBean deleteSysMenuById(long id,String modifyUser) { + LOGGER.info("系统功能 SYS_MENU Key:{}", id); + //TODO 记录平台用户操作日志 + long count = iSysMenuDao.queryCountByParentId(id); + if(count >= 1){ + return new ResultBean(false,"操作失败","该数据有引用关系，请先删除引用关系"); + } + sysMenuRepository.deleteById(id); + return new ResultBean(true,"操作成功"); + } + + @Override + public ResultBean insertSysMenu(SysMenu sysMenu) { + LOGGER.info("系统功能 SYS_MENU :{}", sysMenu); + if(null != sysMenu.getMenuTypeId()){ + sysMenu.setRedMenuTypeName(CommonEnumUtil.METHOD_LEVEL.valueOf(sysMenu.getMenuTypeId())); + } + 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); + } + + @Override + public List findSysMenuAll() { + LOGGER.info("系统功能 SYS_MENU find All"); + return sysMenuRepository.findAll(); + } + + @Override + public SysMenu getSysMenuById(long id) { + LOGGER.info("系统功能 SYS_MENU find id:{}", id); + return sysMenuRepository.getOne(id); + } +} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleServiceImpl.java new file mode 100644 index 0000000..0325ade --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleServiceImpl.java @@ -0,0 +1,81 @@ +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 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 : + * @Author : wei.peng + * @Date : 2018-10-22 16:58:43.779 + * @Modify : + **/ +@Service +public class SysRoleServiceImpl implements ISysRoleService { + + public static final Logger LOGGER = LoggerFactory.getLogger(SysRoleServiceImpl.class); + + @Autowired + private SysRoleRepository sysRoleRepository; + + @Override + public void updateSysRole(SysRole sysRole) { + LOGGER.info("系统角色 SYS_ROLE :{}", sysRole); + sysRoleRepository.update(sysRole); + } + + @Override + public ResultBean 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.setModifyUser(modifyUser); + sysRoleRepository.update(role); + //TODO 统一修改 +// String modifyDatetime = ""; +// sysMenuRepository.updateByProperties( +// new String[]{"id"}, +// new Object[]{id}, +// new String[]{"menuStatus","modifyUser","modifyDatetime"}, +// new Object[]{status,modifyUser,modifyDatetime} +// ); +// return new ResultBean(true,"操作成功"); + return new ResultBean(true,"操作成功"); + } + return new ResultBean(); } + + @Override + public void deleteSysRoleById(long id,String modifyUser) { + LOGGER.info("系统角色 SYS_ROLE Key:{}", id); + sysRoleRepository.deleteById(id); + } + + + @Override + public SysRole insertSysRole(SysRole sysRole) { + LOGGER.info("系统角色 SYS_ROLE :{}", sysRole); + return sysRoleRepository.insert(sysRole); + } + + @Override + public List findSysRoleAll() { + LOGGER.info("系统角色 SYS_ROLE find All"); + return sysRoleRepository.findAll(); + } + + @Override + public SysRole getSysRoleById(long id) { + LOGGER.info("系统角色 SYS_ROLE find id:{}", id); + return sysRoleRepository.getOne(id); + } +} diff --git a/modules/i3plus-core-apiservice/target/classes/application-dev.properties b/modules/i3plus-core-apiservice/target/classes/application-dev.properties deleted file mode 100644 index 9ac50cf..0000000 --- a/modules/i3plus-core-apiservice/target/classes/application-dev.properties +++ /dev/null @@ -1,81 +0,0 @@ -################ ������Դ ################ -# mysql -#spring.datasource.driver-class-name=com.mysql.jdbc.Driver -#spring.datasource.url=jdbc:mysql://localhost:3306/i3wms -##Sql-server## -#spring.datasource.driver-class-name=com.microsoft.sqlserver.jdbc.SQLServerDriver -#spring.datasource.url=jdbc:sqlserver://127.0.0.1:1433;databaseName=i3wms -##oracle## -#spring.datasource.driver-class-name=oracle.jdbc.driver.OracleDriver -#spring.datasource.url=jdbc:oracle:thin:@127.0.0.1:1521:i3wms -#spring.datasource.username=root -#spring.datasource.password=123456 - -##������Դ����д -#impp.write.datasource.type=com.zaxxer.hikari.HikariDataSource -impp.write.datasource.driver-class-name=com.mysql.jdbc.Driver -impp.write.datasource.jdbc-url=jdbc:mysql://localhost:3306/i3core -impp.write.datasource.username=root -impp.write.datasource.password=123456 - -##������Դ��ֻ�� -#impp.read.datasource.type=com.zaxxer.hikari.HikariDataSource -impp.read.datasource.driver-class-name=com.mysql.jdbc.Driver -impp.read.datasource.jdbc-url=jdbc:mysql://localhost:3306/i3core -impp.read.datasource.username=root -impp.read.datasource.password=123456 - -##############��ʱ����־û�############## -impp.schedule.datasource.driver-class-name=com.mysql.jdbc.Driver -impp.schedule.datasource.jdbc-url=jdbc:mysql://localhost:3306/i3_schedule -impp.schedule.datasource.username=root -impp.schedule.datasource.password=123456 -impp.schedule.datasource.max-connections=20 -#��ʱ�����ڷ��������������ִ�� -impp.schedule.start.after-second=20 -#�Ƿ�Ⱥ���� -impp.schedule.datasource.is-clustered=true -#ִ�м�⣨���룩����崻���������ʱ��ִ�� -impp.schedule.datasource.cluster-checkin-interval=30000 -#�߳��� -impp.schedule.thread-count=10 -#�߳����ȼ���1-10��Ĭ��Ϊ5 -impp.schedule.thread-priority=5 - - -################ ���ݳ����� ################ -spring.datasource.maximum-pool-size=100 -spring.datasource.max-active=3 -spring.datasource.max-idle=3 -spring.datasource.min-idle=1 -spring.datasource.initial-size=1 -spring.datasource.max-wait=10000 -spring.datasource.validation-query=SELECT 1 -spring.datasource.test-on-borrow=false -spring.datasource.test-while-idle=true -spring.datasource.time-between-eviction-runs-millis=18800 - -################ JPA�������� ################ -# mysql -spring.jpa.database=MYSQL -spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect -##Sql-server## -#spring.jpa.database=sql_server -#spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.SQLServerDialect -##oracle## -#spring.jpa.database=oracle -#spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.Oracle10gDialect - -# mysql -spring.datasource.validationQuery=SELECT 1 -##Sql-server## -# spring.datasource.validationQuery=SELECT 1 -##oracle## -# spring.datasource.validationQuery=SELECT 1 FROM DUAL - -#ImprovedNamingStrategy / physical_naming_strategy java����ӳ�䵽���ݿ��ֶ�ʱ�������� -# spring.jpa.properties.hibernate.physical_naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy/org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl -#���ϵcreate,create-drop,update,validate -spring.jpa.properties.hibernate.hbm2ddl.auto=update -#�Ƿ���ʾsql -spring.jpa.show-sql=true diff --git a/modules/i3plus-core-apiservice/target/classes/application-prod.properties b/modules/i3plus-core-apiservice/target/classes/application-prod.properties deleted file mode 100644 index e69de29..0000000 diff --git a/modules/i3plus-core-apiservice/target/classes/application-test.properties b/modules/i3plus-core-apiservice/target/classes/application-test.properties deleted file mode 100644 index e69de29..0000000 diff --git a/modules/i3plus-core-apiservice/target/classes/application.properties b/modules/i3plus-core-apiservice/target/classes/application.properties deleted file mode 100644 index 653b92d..0000000 --- a/modules/i3plus-core-apiservice/target/classes/application.properties +++ /dev/null @@ -1,32 +0,0 @@ -#��Ŀ���� -spring.application.name=i3plus-core -#��Ŀ�˿� -server.port=8080 - -#ʹ������ -spring.profiles.active=dev - -######### �Զ������ ######### -#��Ŀ������Ϣ��swagger����ʽ�� -desc.application.name=Intelligent Manufacturing System -#��ǰ��Ŀ�汾 -version=1.0-SNAPSHOT - -#��־Ĭ��ʹ��log4j2 -logging.config=classpath:log4j2.xml - -#�ϴ������ļ���С -spring.servlet.multipart.max-file-size=1MB -#request����ȫ������������� -spring.servlet.multipart.max-request-size=10MB -#�Ƿ��Ƴ��ļ�������true���������ٽ��� -spring.servlet.multipart.resolve-lazily=true - -########## ҳ������ ######## -#����������� -server.tomcat.uri-encoding=UTF-8 -#Spring boot��ͼ���� -spring.mvc.view.prefix=/upload_demo -spring.mvc.view.suffix=.jsp -#��̬�ļ��������� -spring.resources.static-locations=/static/**,/** \ No newline at end of file diff --git a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/auth/AuthUtil.class b/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/auth/AuthUtil.class deleted file mode 100644 index dea09d0..0000000 Binary files a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/auth/AuthUtil.class and /dev/null differ diff --git a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/auth/ShiroEhCacheImpl.class b/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/auth/ShiroEhCacheImpl.class deleted file mode 100644 index c8376b1..0000000 Binary files a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/auth/ShiroEhCacheImpl.class and /dev/null differ diff --git a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/auth/ShiroRedisCacheImpl.class b/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/auth/ShiroRedisCacheImpl.class deleted file mode 100644 index 5cb5570..0000000 Binary files a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/auth/ShiroRedisCacheImpl.class and /dev/null differ diff --git a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/auth/ShiroRedisCacheManager.class b/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/auth/ShiroRedisCacheManager.class deleted file mode 100644 index 9948815..0000000 Binary files a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/auth/ShiroRedisCacheManager.class and /dev/null differ diff --git a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/auth/ShiroSessionRedisDao.class b/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/auth/ShiroSessionRedisDao.class deleted file mode 100644 index 98576fd..0000000 Binary files a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/auth/ShiroSessionRedisDao.class and /dev/null differ diff --git a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/auth/filter/AdminFilter.class b/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/auth/filter/AdminFilter.class deleted file mode 100644 index 4274e87..0000000 Binary files a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/auth/filter/AdminFilter.class and /dev/null differ diff --git a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/auth/filter/SaAdminFilter.class b/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/auth/filter/SaAdminFilter.class deleted file mode 100644 index 75d2a87..0000000 Binary files a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/auth/filter/SaAdminFilter.class and /dev/null differ diff --git a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/auth/filter/UserFilter.class b/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/auth/filter/UserFilter.class deleted file mode 100644 index d34d429..0000000 Binary files a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/auth/filter/UserFilter.class and /dev/null differ diff --git a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/auth/realm/AdminAuthRealm.class b/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/auth/realm/AdminAuthRealm.class deleted file mode 100644 index 182e6f7..0000000 Binary files a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/auth/realm/AdminAuthRealm.class and /dev/null differ diff --git a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/auth/realm/DefaultModularRealm.class b/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/auth/realm/DefaultModularRealm.class deleted file mode 100644 index c84ce1e..0000000 Binary files a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/auth/realm/DefaultModularRealm.class and /dev/null differ diff --git a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/auth/realm/SaAuthRealm.class b/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/auth/realm/SaAuthRealm.class deleted file mode 100644 index 9c9fa6b..0000000 Binary files a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/auth/realm/SaAuthRealm.class and /dev/null differ diff --git a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/auth/realm/UserAuthRealm.class b/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/auth/realm/UserAuthRealm.class deleted file mode 100644 index 51764e2..0000000 Binary files a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/auth/realm/UserAuthRealm.class and /dev/null differ diff --git a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/configuration/ShiroAuthConfiguration.class b/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/configuration/ShiroAuthConfiguration.class deleted file mode 100644 index 3898355..0000000 Binary files a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/configuration/ShiroAuthConfiguration.class and /dev/null differ diff --git a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/configuration/i3PlusCoreConfig.class b/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/configuration/i3PlusCoreConfig.class deleted file mode 100644 index 5111d9c..0000000 Binary files a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/configuration/i3PlusCoreConfig.class and /dev/null differ diff --git a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/controller/DemoAuthController.class b/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/controller/DemoAuthController.class deleted file mode 100644 index 5e5b752..0000000 Binary files a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/controller/DemoAuthController.class and /dev/null differ diff --git a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/controller/DemoController.class b/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/controller/DemoController.class deleted file mode 100644 index f98a6e6..0000000 Binary files a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/controller/DemoController.class and /dev/null differ diff --git a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/controller/DemoRestController.class b/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/controller/DemoRestController.class deleted file mode 100644 index ba7311a..0000000 Binary files a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/controller/DemoRestController.class and /dev/null differ diff --git a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/controller/DemoScheduleController.class b/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/controller/DemoScheduleController.class deleted file mode 100644 index 3467f3b..0000000 Binary files a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/controller/DemoScheduleController.class and /dev/null differ diff --git a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/controller/DemoSystemController.class b/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/controller/DemoSystemController.class deleted file mode 100644 index 33c71b0..0000000 Binary files a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/controller/DemoSystemController.class and /dev/null differ diff --git a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/controller/base/SimpleController.class b/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/controller/base/SimpleController.class deleted file mode 100644 index b7c3702..0000000 Binary files a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/controller/base/SimpleController.class and /dev/null differ diff --git a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/controller/busi/FactoryStoreController.class b/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/controller/busi/FactoryStoreController.class deleted file mode 100644 index 84daad5..0000000 Binary files a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/controller/busi/FactoryStoreController.class and /dev/null differ diff --git a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/controller/websocket/DemoWebSocket.class b/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/controller/websocket/DemoWebSocket.class deleted file mode 100644 index 4c553e6..0000000 Binary files a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/controller/websocket/DemoWebSocket.class and /dev/null differ diff --git a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/dao/IFactoryStoreDao.class b/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/dao/IFactoryStoreDao.class deleted file mode 100644 index 930d890..0000000 Binary files a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/dao/IFactoryStoreDao.class and /dev/null differ diff --git a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/dao/IMachineFactoryDao.class b/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/dao/IMachineFactoryDao.class deleted file mode 100644 index bdcc782..0000000 Binary files a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/dao/IMachineFactoryDao.class and /dev/null differ diff --git a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/daoimpl/FactoryStoreDaoImpl.class b/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/daoimpl/FactoryStoreDaoImpl.class deleted file mode 100644 index 06c522d..0000000 Binary files a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/daoimpl/FactoryStoreDaoImpl.class and /dev/null differ diff --git a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/listener/SysResourceBindleListener.class b/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/listener/SysResourceBindleListener.class deleted file mode 100644 index e2cb429..0000000 Binary files a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/listener/SysResourceBindleListener.class and /dev/null differ diff --git a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/mq/I3CoreQueue.class b/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/mq/I3CoreQueue.class deleted file mode 100644 index 9d2330b..0000000 Binary files a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/mq/I3CoreQueue.class and /dev/null differ diff --git a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/mq/I3CoreQueueReceiver.class b/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/mq/I3CoreQueueReceiver.class deleted file mode 100644 index 334c6c5..0000000 Binary files a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/mq/I3CoreQueueReceiver.class and /dev/null differ diff --git a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/schedulejob/DemoJob.class b/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/schedulejob/DemoJob.class deleted file mode 100644 index b788ee3..0000000 Binary files a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/schedulejob/DemoJob.class and /dev/null differ diff --git a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/serviceimpl/base/DataSimpleServiceImpl.class b/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/serviceimpl/base/DataSimpleServiceImpl.class deleted file mode 100644 index 05fcafa..0000000 Binary files a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/serviceimpl/base/DataSimpleServiceImpl.class and /dev/null differ diff --git a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/DataMoreServiceImpl.class b/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/DataMoreServiceImpl.class deleted file mode 100644 index fd16374..0000000 Binary files a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/DataMoreServiceImpl.class and /dev/null differ diff --git a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SystemResourceService.class b/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SystemResourceService.class deleted file mode 100644 index 1cd4c89..0000000 Binary files a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SystemResourceService.class and /dev/null differ diff --git a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SystemUserService.class b/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SystemUserService.class deleted file mode 100644 index 6243e6e..0000000 Binary files a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SystemUserService.class and /dev/null differ diff --git a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/util/ConstWords.class b/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/util/ConstWords.class deleted file mode 100644 index 38dc9c5..0000000 Binary files a/modules/i3plus-core-apiservice/target/classes/cn/estsh/i3plus/core/apiservice/util/ConstWords.class and /dev/null differ diff --git a/modules/i3plus-core-apiservice/target/classes/log4j2.xml b/modules/i3plus-core-apiservice/target/classes/log4j2.xml deleted file mode 100644 index e75dde7..0000000 --- a/modules/i3plus-core-apiservice/target/classes/log4j2.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - %d{yyyy-MM-dd HH:mm:ss,SSS} %5p %c{1}:%L - %m%n - - - - - - - - - - - - - - - - - ${pattern} - - - - - - - ${pattern} - - - - - - - - - - - ${pattern} - - - - \ No newline at end of file diff --git a/modules/i3plus-core-apiservice/target/i3plus-core-apiservice-1.0-SNAPSHOT.jar b/modules/i3plus-core-apiservice/target/i3plus-core-apiservice-1.0-SNAPSHOT.jar deleted file mode 100644 index c121466..0000000 Binary files a/modules/i3plus-core-apiservice/target/i3plus-core-apiservice-1.0-SNAPSHOT.jar and /dev/null differ diff --git a/modules/i3plus-core-apiservice/target/i3plus-core-apiservice-1.0-SNAPSHOT.jar.original b/modules/i3plus-core-apiservice/target/i3plus-core-apiservice-1.0-SNAPSHOT.jar.original deleted file mode 100644 index 6e4c6cd..0000000 Binary files a/modules/i3plus-core-apiservice/target/i3plus-core-apiservice-1.0-SNAPSHOT.jar.original and /dev/null differ diff --git a/modules/i3plus-core-apiservice/target/maven-archiver/pom.properties b/modules/i3plus-core-apiservice/target/maven-archiver/pom.properties deleted file mode 100644 index 30d862d..0000000 --- a/modules/i3plus-core-apiservice/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Apache Maven -#Sun Sep 30 10:24:52 CST 2018 -version=1.0-SNAPSHOT -groupId=i3plus.core -artifactId=i3plus-core-apiservice diff --git a/modules/i3plus-core-icloud/i3plus-core-icloud.iml b/modules/i3plus-core-icloud/i3plus-core-icloud.iml deleted file mode 100644 index 15b415d..0000000 --- a/modules/i3plus-core-icloud/i3plus-core-icloud.iml +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-core-icloud/target/i3plus-core-icloud-1.0-SNAPSHOT.jar b/modules/i3plus-core-icloud/target/i3plus-core-icloud-1.0-SNAPSHOT.jar deleted file mode 100644 index 8f0a04c..0000000 Binary files a/modules/i3plus-core-icloud/target/i3plus-core-icloud-1.0-SNAPSHOT.jar and /dev/null differ diff --git a/modules/i3plus-core-icloud/target/maven-archiver/pom.properties b/modules/i3plus-core-icloud/target/maven-archiver/pom.properties deleted file mode 100644 index 9c02d36..0000000 --- a/modules/i3plus-core-icloud/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Apache Maven -#Thu Oct 18 20:43:09 CST 2018 -version=1.0-SNAPSHOT -groupId=i3plus.core -artifactId=i3plus-core-icloud