From 18dc8d980def45268af443b56dd2b380adbc5fc8 Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Wed, 12 Dec 2018 22:43:17 +0800 Subject: [PATCH 1/7] Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev # Conflicts: # modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/websocket/MessageWebSocket.java --- modules/i3plus-core-api/pom.xml | 4 -- .../core/api/iservice/base/IDataSimpleService.java | 3 +- modules/i3plus-core-apiservice/pom.xml | 6 +- .../apiservice/auth/ShiroAuthConfiguration.java | 4 +- .../configuration/ScanPackageConfiguration.java | 42 +++++++++++ .../controller/DemoRedisMqController.java | 17 ++--- .../controller/base/SimpleController.java | 16 ++--- .../core/apiservice/dao/IMachineFactoryDao.java | 84 ++++++++++------------ .../serviceimpl/base/DataSimpleServiceImpl.java | 20 +++--- .../src/main/resources/application.properties | 16 +++-- pom.xml | 11 --- 11 files changed, 122 insertions(+), 101 deletions(-) create mode 100644 modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/ScanPackageConfiguration.java diff --git a/modules/i3plus-core-api/pom.xml b/modules/i3plus-core-api/pom.xml index cbfbca2..0d3172b 100644 --- a/modules/i3plus-core-api/pom.xml +++ b/modules/i3plus-core-api/pom.xml @@ -19,10 +19,6 @@ i3plus.pojo - i3plus-pojo-mes - - - i3plus.pojo i3plus-pojo-model diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/IDataSimpleService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/IDataSimpleService.java index 3602c5c..9426ca6 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/IDataSimpleService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/IDataSimpleService.java @@ -1,6 +1,5 @@ package cn.estsh.i3plus.core.api.iservice.base; -import cn.estsh.i3plus.pojo.mes.MachineFactory; import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -15,7 +14,7 @@ import java.util.List; **/ public interface IDataSimpleService { - void saveMachineFactory(MachineFactory machineFactory); + //void saveMachineFactory(MachineFactory machineFactory); /*@Transactional void updateMachineFactoryNameById(long id, String factoryName); diff --git a/modules/i3plus-core-apiservice/pom.xml b/modules/i3plus-core-apiservice/pom.xml index 50107af..d757f80 100644 --- a/modules/i3plus-core-apiservice/pom.xml +++ b/modules/i3plus-core-apiservice/pom.xml @@ -103,10 +103,6 @@ ehcache-core - i3plus.pojo - i3plus-pojo-mes - - org.slf4j slf4j-api @@ -161,7 +157,7 @@ org.springframework.boot spring-boot-maven-plugin - cn.estsh.ImppGo + cn.estsh.impp.framework.run.ImppGo JAR diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/auth/ShiroAuthConfiguration.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/auth/ShiroAuthConfiguration.java index 2ba0cf6..fcf1d38 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/auth/ShiroAuthConfiguration.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/auth/ShiroAuthConfiguration.java @@ -23,6 +23,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.DependsOn; import javax.annotation.Resource; import javax.servlet.Filter; @@ -93,12 +94,13 @@ public class ShiroAuthConfiguration { return realms; } - @Bean + @Bean(name="modularRealmAuthenticator") public ModularRealmAuthenticator modularRealmAuthenticator(){ return new DefaultModularRealm(supportRealmMap()); } @Bean + @DependsOn("modularRealmAuthenticator") public SecurityManager securityManager(){ LOGGER.info("【app-shiro-加载securityManager】"); DefaultWebSecurityManager securityManager = new DefaultWebSecurityManager(); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/ScanPackageConfiguration.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/ScanPackageConfiguration.java new file mode 100644 index 0000000..dd3e21f --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/ScanPackageConfiguration.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.core.apiservice.configuration; + +import cn.estsh.i3plus.platform.common.util.CommonConstWords; +import cn.estsh.i3plus.pojo.base.jpa.factory.BaseMongoRepositoryFactoryBean; +import cn.estsh.i3plus.pojo.base.jpa.factory.BaseRepositoryFactoryBean; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.boot.autoconfigure.domain.EntityScan; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.annotation.Order; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; +import org.springframework.data.mongodb.repository.config.EnableMongoRepositories; + +/** + * @Description : 需要扫描其他包的配置文件 + * 此类专门添加需要单独加载的其他模块的包 + * @Reference : + * @Author : alwaysfrin + * @CreateDate : 2018-12-12 20:49 + * @Modify: + **/ +@Configuration +@Order(0) +//扫描需要单独处理的对象类 +@EntityScan(basePackageClasses = { + //需要单独处理的其他模块对象 +}) + +@EnableJpaRepositories(basePackages = { + //需要单独处理的其他模块持久化仓 +}, repositoryFactoryBeanClass = BaseRepositoryFactoryBean.class) + +@EnableMongoRepositories(basePackageClasses = { + //需要单独处理的其他模块mongo持久化仓 +},repositoryFactoryBeanClass = BaseMongoRepositoryFactoryBean.class) +public class ScanPackageConfiguration { + public static final Logger LOGGER = LoggerFactory.getLogger(CommonConstWords.SYSTEM_LOG); + + public ScanPackageConfiguration(){ + LOGGER.info("【关联模块加载包处理...】"); + } +} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoRedisMqController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoRedisMqController.java index 66c918e..22c90ed 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoRedisMqController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoRedisMqController.java @@ -4,11 +4,10 @@ import cn.estsh.i3plus.core.apiservice.mq.I3CoreQueueConfig; import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.impp.framework.base.controller.CoreBaseController; -import cn.estsh.impp.framework.boot.util.ResultBean; -import cn.estsh.i3plus.pojo.mes.MachineFactory; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ImppRedis; +import cn.estsh.impp.framework.boot.util.ResultBean; import com.rabbitmq.client.Channel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -19,7 +18,9 @@ import org.springframework.amqp.rabbit.connection.CachingConnectionFactory; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.i18n.LocaleContextHolder; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.io.IOException; @@ -63,7 +64,7 @@ public class DemoRedisMqController extends CoreBaseController{ @ApiOperation(value="缓存",notes="放入数据") public ResultBean putCache(){ //放入缓存 - redisCore.putObject("machineFactory",new MachineFactory("111","nnnn")); + //redisCore.putObject("machineFactory",new MachineFactory("111","nnnn")); redisCore.putObject("wms","123123123"); return new ResultBean(true,"已放入缓存"); @@ -72,11 +73,11 @@ public class DemoRedisMqController extends CoreBaseController{ @GetMapping(value="/get-cache") @ApiOperation(value="缓存",notes="获取数据") public ResultBean getCache(){ - MachineFactory mf = (MachineFactory) redisCore.getObject("machineFactory"); - System.out.println("1===== " + mf); + //MachineFactory mf = (MachineFactory) redisCore.getObject("machineFactory"); + //System.out.println("1===== " + mf); System.out.println("2===== " + redisCore.getObject("wms")); - return new ResultBean(true,mf); + return new ResultBean(true); } @GetMapping(value="/send-mq") @@ -91,7 +92,7 @@ public class DemoRedisMqController extends CoreBaseController{ this.rabbitTemplate.convertAndSend(I3CoreQueueConfig.DEMO_HANDLE_QUEUE, context); System.out.println("发送Object数据 : " + context); - this.rabbitTemplate.convertAndSend(I3CoreQueueConfig.DEMO_OBJ_QUEUE, new MachineFactory("111mq","rabbit")); + //this.rabbitTemplate.convertAndSend(I3CoreQueueConfig.DEMO_OBJ_QUEUE, new MachineFactory("111mq","rabbit")); return new ResultBean(true,"操作成功"); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/SimpleController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/SimpleController.java index 4c62aaa..dbcf777 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/SimpleController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/SimpleController.java @@ -4,15 +4,15 @@ import cn.estsh.i3plus.core.api.iservice.base.IDataSimpleService; import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.util.ResultBean; -import cn.estsh.i3plus.pojo.mes.MachineFactory; 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; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; /** * @Description : @@ -33,10 +33,10 @@ public class SimpleController extends CoreBaseController{ @PutMapping(value="/insert") @ApiOperation(value="service服务",notes="返回内容添加service") public ResultBean insertFactory(@RequestParam("name")String name, @RequestParam("code")String code){ - MachineFactory machineFactory = new MachineFactory(); - machineFactory.setFactoryName(name); - machineFactory.setFactoryCode(code); - dataSimpleService.saveMachineFactory(machineFactory); +// MachineFactory machineFactory = new MachineFactory(); +// machineFactory.setFactoryName(name); +// machineFactory.setFactoryCode(code); +// dataSimpleService.saveMachineFactory(machineFactory); return new ResultBean(true,"工厂已保存"); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/dao/IMachineFactoryDao.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/dao/IMachineFactoryDao.java index f3409ee..40cf596 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/dao/IMachineFactoryDao.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/dao/IMachineFactoryDao.java @@ -1,45 +1,39 @@ -package cn.estsh.i3plus.core.apiservice.dao; - -import cn.estsh.i3plus.pojo.mes.MachineFactory; -import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.CrudRepository; -import org.springframework.data.repository.query.Param; -import org.springframework.stereotype.Repository; - -import java.util.List; - -/** - * @Description : hql申明查询demo - * 继承了crudrepository，包含了常用hql方法 - * @Reference : 如果需要执行原生sql，则添加 @Query(sql,nativeQuery=true) - * @Author : alwaysfrin - * @CreateDate : 2018-09-05 16:41 - * @Modify: - **/ -//@Repository -public interface IMachineFactoryDao extends CrudRepository { - - //此处findBy开头，会自动根据属性名进行查询 - /*List findByFactoryName(String factoryName); - - @Modifying - @Query("update MachineFactory mf set mf.factoryName = :factoryName where mf.id = :id") - void updateMachineFactoryNameById(long id, String factoryName); - - @Modifying - @Query("delete from MachineFactory mf where id = :id") - void deleteMachineFactoryById(@Param("id") long id); - - //按位查询 - @Query("select mf from MachineFactory mf where factoryName = ?1") - List findMachineFactoryByFactoryName(String factoryName); - - //参数匹配 - @Query("from MachineFactory mf where mf.factoryCode = :factoryCode") - List findMachineFactoryByFactoryCode(@Param("factoryCode") String factoryCode); - - //自定义Hql - @Query("from MachineFactory mf where mf.createDatetime like '2018-01-01%'") - List findMachineFactorySpecial();*/ -} +//package cn.estsh.i3plus.core.apiservice.dao; +// +////import cn.estsh.i3plus.pojo.mes.MachineFactory; +//import org.springframework.data.repository.CrudRepository; +// +///** +// * @Description : hql申明查询demo +// * 继承了crudrepository，包含了常用hql方法 +// * @Reference : 如果需要执行原生sql，则添加 @Query(sql,nativeQuery=true) +// * @Author : alwaysfrin +// * @CreateDate : 2018-09-05 16:41 +// * @Modify: +// **/ +////@Repository +//public interface IMachineFactoryDao extends CrudRepository { +// +// //此处findBy开头，会自动根据属性名进行查询 +// /*List findByFactoryName(String factoryName); +// +// @Modifying +// @Query("update MachineFactory mf set mf.factoryName = :factoryName where mf.id = :id") +// void updateMachineFactoryNameById(long id, String factoryName); +// +// @Modifying +// @Query("delete from MachineFactory mf where id = :id") +// void deleteMachineFactoryById(@Param("id") long id); +// +// //按位查询 +// @Query("select mf from MachineFactory mf where factoryName = ?1") +// List findMachineFactoryByFactoryName(String factoryName); +// +// //参数匹配 +// @Query("from MachineFactory mf where mf.factoryCode = :factoryCode") +// List findMachineFactoryByFactoryCode(@Param("factoryCode") String factoryCode); +// +// //自定义Hql +// @Query("from MachineFactory mf where mf.createDatetime like '2018-01-01%'") +// List findMachineFactorySpecial();*/ +//} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/DataSimpleServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/DataSimpleServiceImpl.java index 33a2d5b..0cfe00c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/DataSimpleServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/DataSimpleServiceImpl.java @@ -1,12 +1,8 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.base; import cn.estsh.i3plus.core.api.iservice.base.IDataSimpleService; -import cn.estsh.i3plus.core.apiservice.dao.IMachineFactoryDao; -import cn.estsh.i3plus.pojo.base.codemaker.SnowflakeIdMaker; -import cn.estsh.i3plus.pojo.mes.MachineFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** @@ -20,15 +16,15 @@ import org.springframework.stereotype.Service; public class DataSimpleServiceImpl implements IDataSimpleService { private Logger LOGGER = LoggerFactory.getLogger(this.getClass()); - @Autowired - private IMachineFactoryDao machineFactoryDao; +// @Autowired +// private IMachineFactoryDao machineFactoryDao; - @Override - public void saveMachineFactory(MachineFactory machineFactory) { - //生成主键 - machineFactory.setId(new SnowflakeIdMaker().nextId()); - machineFactoryDao.save(machineFactory); - } +// @Override +// public void saveMachineFactory(MachineFactory machineFactory) { +// //生成主键 +// machineFactory.setId(new SnowflakeIdMaker().nextId()); +// machineFactoryDao.save(machineFactory); +// } /* @Override public void updateMachineFactoryNameById(long id, String factoryName) { diff --git a/modules/i3plus-core-apiservice/src/main/resources/application.properties b/modules/i3plus-core-apiservice/src/main/resources/application.properties index ecf9c9d..370fe1d 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application.properties @@ -32,9 +32,15 @@ spring.mvc.view.suffix=.jsp spring.resources.static-locations=/static/**,/** ########扫包路径######## -#基础包路径 +#app基础包路径 impp.app.base-packages=cn.estsh.i3plus.core -#对象包路径，可以多个包，逗号分隔 -impp.app.base-pojo=cn.estsh.i3plus.pojo.base,cn.estsh.i3plus.pojo.platform -#微服包路径 -impp.app.icloud-package=cn.estsh.i3plus.icloud \ No newline at end of file +#app对象路径 +impp.app.pojo-packages=cn.estsh.i3plus.pojo.platform +#dao接口包 +impp.app.pojo-dao=${impp.app.base-packages}.apiservice.dao +#mongo-dao接口包 +impp.app.pojo-mongo-dao=${impp.app.base-packages}.apiservice.daomongo +#对象持久化包路径，可以多个包，逗号分隔 +impp.app.pojo-repository=${impp.app.pojo-packages}.repository +#mongodb资源仓 +impp.app.pojo-mongo-repository=${impp.app.pojo-packages}.repositorymongo \ No newline at end of file diff --git a/pom.xml b/pom.xml index 0a79893..0ffa7c5 100644 --- a/pom.xml +++ b/pom.xml @@ -93,21 +93,10 @@ i3plus.pojo - i3plus-pojo-mes - ${project.version} - - - i3plus.pojo i3plus-pojo-base ${project.version} - - i3plus.pojo - i3plus-pojo-mes - ${project.version} - - i3plus.icloud From 2c1088a4315ed4bddff32a6090a06df5208ab147 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Thu, 13 Dec 2018 10:14:21 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=BE=AE=E6=9C=8D=E5=8A=A1=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=8F=90=E9=86=92=20=E5=8F=8A=E9=83=A8=E5=88=86dashbo?= =?UTF-8?q?ard?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-core-api/i3plus-core-api.iml | 85 ---------------- .../api/iservice/busi/ISysDepartmentService.java | 8 ++ .../api/iservice/busi/ISysLogOperateService.java | 8 ++ .../api/iservice/busi/ISysLogSystemService.java | 10 ++ .../api/iservice/busi/ISysOrganizeService.java | 9 +- .../core/api/iservice/busi/ISysUserService.java | 8 ++ .../controller/busi/SysDashboardController.java | 88 ++++++++++++++++ .../controller/busi/SysMessageController.java | 2 - .../core/apiservice/dao/ISysLogSystemDao.java | 28 ++++++ .../core/apiservice/mq/MailQueueReceiver.java | 97 ------------------ ...ceiver.java => MessageLetterQueueReceiver.java} | 7 +- .../apiservice/mq/MessageMailQueueReceiver.java | 112 +++++++++++++++++++++ .../serviceimpl/busi/SysDepartmentService.java | 5 + .../serviceimpl/busi/SysLogOperateService.java | 12 +++ .../serviceimpl/busi/SysLogSystemService.java | 10 +- .../serviceimpl/busi/SysMessageService.java | 3 + .../serviceimpl/busi/SysOrganizeService.java | 7 +- .../serviceimpl/busi/SysUserService.java | 6 ++ .../i3plus/core/apiservice/util/MailUtil.java | 11 ++ .../core/apiservice/serviceimpl/busi/TestBase.java | 7 ++ .../apiservice/serviceimpl/busi/TestRedis.java | 35 +++++++ 21 files changed, 368 insertions(+), 190 deletions(-) create mode 100644 modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDashboardController.java create mode 100644 modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/dao/ISysLogSystemDao.java delete mode 100644 modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MailQueueReceiver.java rename modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/{LetterQueueReceiver.java => MessageLetterQueueReceiver.java} (94%) create mode 100644 modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageMailQueueReceiver.java create mode 100644 modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestRedis.java diff --git a/modules/i3plus-core-api/i3plus-core-api.iml b/modules/i3plus-core-api/i3plus-core-api.iml index b27d1a0..5fc3092 100644 --- a/modules/i3plus-core-api/i3plus-core-api.iml +++ b/modules/i3plus-core-api/i3plus-core-api.iml @@ -14,89 +14,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDepartmentService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDepartmentService.java index 6f0f6fa..e7477e2 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDepartmentService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDepartmentService.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.api.iservice.busi; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.platform.bean.SysDepartment; +import io.swagger.annotations.ApiOperation; import java.util.List; @@ -68,4 +69,11 @@ public interface ISysDepartmentService { * @return */ ListPager findSysDepartmentByPager(SysDepartment department, Pager pager); + + /** + * 获取部门数量 + * @return + */ + @ApiOperation(value = "获取部门数量") + long getSysDepartmentCount(); } diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLogOperateService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLogOperateService.java index 94054fc..1d9576f 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLogOperateService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLogOperateService.java @@ -73,4 +73,12 @@ public interface ISysLogOperateService { */ @ApiOperation(value = "操作日志复杂查询，分页，排序",notes = "操作日志复杂查询，分页，排序") ListPager querySysLogOperateByPager(SysLogOperate logOperate, Pager pager); + + /** + * 查询最新的操作日志 + * @param num + * @return + */ + @ApiOperation(value = "查询最新的操作日志") + List findNewSysLogOperate(Integer num); } diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLogSystemService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLogSystemService.java index 82e32b4..2e86efb 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLogSystemService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLogSystemService.java @@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.platform.bean.SysLogSystem; import io.swagger.annotations.ApiOperation; import java.util.List; +import java.util.Map; /** * @Description : 系统日志服务接口 @@ -30,4 +31,13 @@ public interface ISysLogSystemService { @ApiOperation(value = "系统日志分页复杂查询",notes = "系统日志分页复杂查询") ListPager querySysLogSystemByPager(SysLogSystem logSystem, Pager pager); + + /** + * 查询时间段内平均请求耗时 + * @param startTime + * @param endTime + * @return + */ + @ApiOperation(value = "查询时间段内平均请求耗时") + Map queryAvgExecuteTime(String startTime,String endTime); } diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysOrganizeService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysOrganizeService.java index ecb7a68..cceb453 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysOrganizeService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysOrganizeService.java @@ -9,7 +9,7 @@ import io.swagger.annotations.ApiOperation; import java.util.List; /** - * @Description : 组织业务接口 + * @Description : 组织业务接口 * @Reference : * @Author : wei.peng * @Date : 2018-10-22 16:58:42.941 @@ -72,4 +72,11 @@ public interface ISysOrganizeService { * @return */ SysOrganize getSysOrganizeById(Long id); + + /** + * 查询组织个数 + * @return + */ + @ApiOperation(value = "查询组织个数") + long getSysOrganizeCount(); } diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java index a1e5cb9..4127d7f 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.api.iservice.busi; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.platform.bean.*; +import io.swagger.annotations.ApiOperation; import org.apache.shiro.authc.AuthenticationException; import java.util.List; @@ -175,4 +176,11 @@ public interface ISysUserService { * @param user */ void checkSysUserOnly(SysUser user); + + /** + * 查询账户数量 + * @return + */ + @ApiOperation(value = "查询账户数量") + long getSysUserCount(); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDashboardController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDashboardController.java new file mode 100644 index 0000000..7ce95fb --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDashboardController.java @@ -0,0 +1,88 @@ +package cn.estsh.i3plus.core.apiservice.controller.busi; + +import cn.estsh.i3plus.core.api.iservice.busi.*; +import cn.estsh.i3plus.platform.common.tool.TimeTool; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; +import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; +import cn.estsh.impp.framework.base.controller.CoreBaseController; +import cn.estsh.impp.framework.boot.exception.ImppBusiException; +import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; +import cn.estsh.impp.framework.boot.util.ImppRedis; +import cn.estsh.impp.framework.boot.util.ResultBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2018-12-10 17:04 + * @Modify: + **/ +@RestController +@Api(description = "Dashboard服务") +@RequestMapping(PlatformConstWords.BASE_URL + "/dashboard") +public class SysDashboardController { + + @Autowired + private ISysUserService sysUserService; + @Autowired + private ISysOrganizeService sysOrganizeService; + @Autowired + private ISysDepartmentService sysDepartmentService; + @Autowired + private ISysMessageService sysMessageService; + @Autowired + private ISysLogOperateService sysLogOperateService; + @Autowired + private ISysLogSystemService sysLogSystemService; +// @Autowired +// private EurekaServerContext eurekaServerContext; + @Resource(name="redisRes") + private ImppRedis redisRes; + + + @GetMapping("/get") + @ApiOperation(value = "获取dashboard数据") + public ResultBean getDashboardData(){ + try { + Map dashboardData = (Map) redisRes.getObject(PlatformConstWords.DASHBOARD_REDIS_KEY); + if(dashboardData == null){ + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); + Calendar cal = Calendar.getInstance(); + cal.setTime(new Date()); + + String startTime = sdf.format(new Date()); + cal.add(Calendar.MINUTE,10); + String endTime = sdf.format(cal.getTime()); + + dashboardData = new HashMap<>(); + dashboardData.put("userNum",sysUserService.getSysUserCount()); + dashboardData.put("orgNum",sysOrganizeService.getSysOrganizeCount()); + dashboardData.put("deptNum",sysDepartmentService.getSysDepartmentCount()); + dashboardData.put("logOperate",sysLogOperateService.findNewSysLogOperate(10)); + dashboardData.put("",sysLogSystemService.queryAvgExecuteTime(startTime,endTime)); + + redisRes.putHashMap(PlatformConstWords.DASHBOARD_REDIS_KEY,dashboardData,1000*60); + } + return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultMap(dashboardData); + } catch ( + ImppBusiException busExcep) { + return ResultBean.fail(busExcep); + } catch (Exception e) { + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + +} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java index 3d24a1c..f5cdf0c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java @@ -64,8 +64,6 @@ public class SysMessageController extends CoreBaseController { sysMessage.setMessageSendTime(sdf.format(new Date())); sysMessage.setMessageContentType(ImppEnumUtil.MESSAGE_TYPE_CONTENT.HTML.getValue()); - ConvertBean.modelInitialize(sysMessage,getSessionUser()); - sysMessageService.doSendSysMessage(sysMessage); return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/dao/ISysLogSystemDao.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/dao/ISysLogSystemDao.java new file mode 100644 index 0000000..c318ffd --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/dao/ISysLogSystemDao.java @@ -0,0 +1,28 @@ +package cn.estsh.i3plus.core.apiservice.dao; + +import io.swagger.annotations.ApiOperation; +import org.bson.Document; + +import java.util.List; +import java.util.Map; + +/** + * @Description : 操作日志 + * @Reference : + * @Author : yunhao + * @CreateDate : 2018-12-11 13:22 + * @Modify: + **/ +public interface ISysLogSystemDao { + + + /** + * 查询时间段内平均请求耗时 + * @param startTime + * @param endTime + * @return + */ + @ApiOperation(value = "查询时间段内平均请求耗时") + Map querySysLogOperateAvgExecuteTime(String startTime, String endTime); + +} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MailQueueReceiver.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MailQueueReceiver.java deleted file mode 100644 index 587584a..0000000 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MailQueueReceiver.java +++ /dev/null @@ -1,97 +0,0 @@ -package cn.estsh.i3plus.core.apiservice.mq; - -import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService; -import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService; -import cn.estsh.i3plus.core.apiservice.util.MailUtil; -import cn.estsh.i3plus.platform.common.tool.TimeTool; -import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; -import cn.estsh.i3plus.pojo.platform.bean.SysMessage; -import cn.estsh.i3plus.pojo.platform.bean.SysRefUserMessage; -import cn.estsh.i3plus.pojo.platform.bean.SysUser; -import com.rabbitmq.client.Channel; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.amqp.core.Message; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import java.io.IOException; - -/** - * @Description : 邮件队列处理 - * @Reference : - * @Author : yunhao - * @CreateDate : 2018-11-15 22:15 - * @Modify: - **/ -@Component -public class MailQueueReceiver { - private static final Logger LOGGER = LoggerFactory.getLogger(MailQueueReceiver.class); - - @Autowired - ISysMessageService sysMessageService; - @Autowired - ISysUserService sysUserService; - @Autowired - MailUtil mailUtil; - /** - * 系统邮件处理队列 - * @param msg - * @param channel - * @param message - */ -// @RabbitListener(queues = I3CoreQueueConfig.IMPP_MESSAGE_MAIL_QUEUE) - public void processImppMail(SysMessage msg, Channel channel, Message message) { - try { - LOGGER.info("【MQ-IMPP_MESSAGE_MAIL_QUEUE】数据接收成功：{}",msg);msg = sysMessageService.insertSysMessage(msg); - mailUtil.init(); - - // 收件人信息 - String[] messageReceiver = msg.getMessageReceiversId().split(","); - String[] receiverName = new String[messageReceiver.length]; - - SysRefUserMessage refUserMessage; - SysUser sysUser; - - for (int i = 0; i < messageReceiver.length; i++) { - sysUser = sysUserService.getSysUserById(Long.parseLong(messageReceiver[i])); - receiverName[i] = sysUser.getUserName(); - - refUserMessage = new SysRefUserMessage(); - refUserMessage.setMessageId(msg.getId()); - refUserMessage.setMessageTitleRdd(msg.getMessageTitle()); - refUserMessage.setMessageTypeRdd(msg.getMessageType()); - refUserMessage.setMessageSenderNameRdd(msg.getMessageSenderNameRdd()); - refUserMessage.setReceiverId(sysUser.getId()); - refUserMessage.setReceiverNameRdd(sysUser.getUserName()); - refUserMessage.setMessageStatus(ImppEnumUtil.MESSAGE_STATUS.UNREAD.getValue()); - refUserMessage.setReceiverTime(TimeTool.getNowTime(true)); - - sysMessageService.insertSysRefUserMessage(refUserMessage); - - // 发送邮件 - mailUtil.setSubject(msg.getMessageTitle()); - mailUtil.setContentType(ImppEnumUtil.MESSAGE_TYPE_CONTENT.valueOfDescription(msg.getMessageContentType())); - mailUtil.setBody(msg.getMessageContent()); - mailUtil.setTo(sysUser.getUserEmail()); - mailUtil.send(); - } - - msg.setMessageSenderNameRdd(StringUtils.join(receiverName, ",")); - sysMessageService.updateSysMessage(msg); - - //信息已处理 - channel.basicAck(message.getMessageProperties().getDeliveryTag(),false); - } catch (IOException e) { - LOGGER.error("【MQ-IMPP_MESSAGE_MAIL_QUEUE】处理出错：{}",e.getMessage(),e); - //丢弃这条消息 - try { - // 未成功处理，重新发送 - channel.basicNack(message.getMessageProperties().getDeliveryTag(),false,true); - } catch (IOException e1) { - e1.printStackTrace(); - } - } - } -} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/LetterQueueReceiver.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageLetterQueueReceiver.java similarity index 94% rename from modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/LetterQueueReceiver.java rename to modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageLetterQueueReceiver.java index 8f19e23..39472b8 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/LetterQueueReceiver.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageLetterQueueReceiver.java @@ -14,6 +14,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.amqp.core.Message; +import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -28,8 +29,8 @@ import java.util.List; * @Modify: **/ @Component -public class LetterQueueReceiver { - private static final Logger LOGGER = LoggerFactory.getLogger(LetterQueueReceiver.class); +public class MessageLetterQueueReceiver { + private static final Logger LOGGER = LoggerFactory.getLogger(MessageLetterQueueReceiver.class); @Autowired ISysMessageService sysMessageService; @@ -43,7 +44,7 @@ public class LetterQueueReceiver { * @param message * 发送：rabbitTemplate.convertAndSend(I3CoreQueueConfig.IMPP_MESSAGE_QUEUE, new SysMessage(....)); */ -// @RabbitListener(queues = I3CoreQueueConfig.IMPP_MESSAGE_LETTER_QUEUE) + @RabbitListener(queues = I3CoreQueueConfig.IMPP_MESSAGE_LETTER_QUEUE) public void processImppMessage(SysMessage msg, Channel channel, Message message) { try { LOGGER.info("【MQ-IMPP_MESSAGE_LETTER_QUEUE】数据接收成功：{}",msg); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageMailQueueReceiver.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageMailQueueReceiver.java new file mode 100644 index 0000000..462acd3 --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageMailQueueReceiver.java @@ -0,0 +1,112 @@ +package cn.estsh.i3plus.core.apiservice.mq; + +import cn.estsh.i3plus.core.api.iservice.busi.ISysConfigService; +import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService; +import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService; +import cn.estsh.i3plus.core.apiservice.util.MailUtil; +import cn.estsh.i3plus.platform.common.tool.TimeTool; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; +import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; +import cn.estsh.i3plus.pojo.platform.bean.SysMessage; +import cn.estsh.i3plus.pojo.platform.bean.SysRefUserMessage; +import cn.estsh.i3plus.pojo.platform.bean.SysUser; +import com.rabbitmq.client.Channel; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.amqp.core.Message; +import org.springframework.amqp.rabbit.annotation.RabbitListener; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.io.IOException; + +/** + * @Description : 邮件队列处理 + * @Reference : + * @Author : yunhao + * @CreateDate : 2018-11-15 22:15 + * @Modify: + **/ +@Component +public class MessageMailQueueReceiver { + private static final Logger LOGGER = LoggerFactory.getLogger(MessageMailQueueReceiver.class); + + @Autowired + ISysMessageService sysMessageService; + @Autowired + ISysUserService sysUserService; + @Autowired + ISysConfigService sysConfigService; + @Autowired + MailUtil mailUtil; + /** + * 系统邮件处理队列 + * @param msg + * @param channel + * @param message + */ + @RabbitListener(queues = I3CoreQueueConfig.IMPP_MESSAGE_MAIL_QUEUE) + public void processImppMail(SysMessage msg, Channel channel, Message message) { + try { + LOGGER.info("【MQ-IMPP_MESSAGE_MAIL_QUEUE】数据接收成功：{}",msg);msg = sysMessageService.insertSysMessage(msg); + mailUtil.init(); + + // 系统预警邮件与用户邮件判断 + if(PlatformConstWords.CONTACT_MAIL.equals(msg.getMessageReceiversId())){ + // 发送邮件 + mailUtil.setSubject(msg.getMessageTitle()); + mailUtil.setContentType(ImppEnumUtil.MESSAGE_TYPE_CONTENT.valueOfDescription(msg.getMessageContentType())); + mailUtil.setBody(msg.getMessageContent()); + mailUtil.setTo(sysConfigService.getSysConfigByCode(PlatformConstWords.CONTACT_MAIL).getConfigValue()); + mailUtil.send(); + }else { + + // 收件人信息 + String[] messageReceiver = msg.getMessageReceiversId().split(","); + String[] receiverName = new String[messageReceiver.length]; + + SysRefUserMessage refUserMessage; + SysUser sysUser; + + for (int i = 0; i < messageReceiver.length; i++) { + sysUser = sysUserService.getSysUserById(Long.parseLong(messageReceiver[i])); + receiverName[i] = sysUser.getUserName(); + + refUserMessage = new SysRefUserMessage(); + refUserMessage.setMessageId(msg.getId()); + refUserMessage.setMessageTitleRdd(msg.getMessageTitle()); + refUserMessage.setMessageTypeRdd(msg.getMessageType()); + refUserMessage.setMessageSenderNameRdd(msg.getMessageSenderNameRdd()); + refUserMessage.setReceiverId(sysUser.getId()); + refUserMessage.setReceiverNameRdd(sysUser.getUserName()); + refUserMessage.setMessageStatus(ImppEnumUtil.MESSAGE_STATUS.UNREAD.getValue()); + refUserMessage.setReceiverTime(TimeTool.getNowTime(true)); + + sysMessageService.insertSysRefUserMessage(refUserMessage); + + // 发送邮件 + mailUtil.setSubject(msg.getMessageTitle()); + mailUtil.setContentType(ImppEnumUtil.MESSAGE_TYPE_CONTENT.valueOfDescription(msg.getMessageContentType())); + mailUtil.setBody(msg.getMessageContent()); + mailUtil.setTo(sysUser.getUserEmail()); + mailUtil.send(); + } + + msg.setMessageSenderNameRdd(StringUtils.join(receiverName, ",")); + sysMessageService.updateSysMessage(msg); + } + //信息已处理 + channel.basicAck(message.getMessageProperties().getDeliveryTag(),false); + } catch (IOException e) { + LOGGER.error("【MQ-IMPP_MESSAGE_MAIL_QUEUE】处理出错：{}",e.getMessage(),e); + //丢弃这条消息 + try { + // 未成功处理，重新发送 + channel.basicNack(message.getMessageProperties().getDeliveryTag(),false,true); + } catch (IOException e1) { + e1.printStackTrace(); + } + } + } +} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java index c925343..061e70a 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java @@ -202,4 +202,9 @@ public class SysDepartmentService implements ISysDepartmentService { } } + @Override + public long getSysDepartmentCount() { + return departmentRDao.listCount(); + } + } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLogOperateService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLogOperateService.java index 4822f16..72b66d2 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLogOperateService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLogOperateService.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysLogOperateService; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.common.PagerHelper; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.SysLogOperate; import cn.estsh.i3plus.pojo.platform.repositorymongo.SysLogOperateRepository; import cn.estsh.i3plus.pojo.platform.sqlpack.CoreBsonPack; @@ -87,4 +88,15 @@ public class SysLogOperateService implements ISysLogOperateService { return new ListPager(logOperateRDao.findByBsonPager(bson,pager,logOperate.getOrderByParam(),logOperate.getAscOrDesc()),pager); } } + + @Override + public List findNewSysLogOperate(Integer num) { + Pager page = new Pager(); + page.setCurrentPage(1); + page.setPageSize(num); + SysLogOperate sysLogOperate = new SysLogOperate(); + sysLogOperate.setOrderByParam("createDatetime"); + sysLogOperate.setAscOrDesc(CommonEnumUtil.ASC_OR_DESC.DESC.getValue()); + return logOperateRDao.findByBsonPager(null,page,sysLogOperate.getOrderByParam(),sysLogOperate.getAscOrDesc()); + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLogSystemService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLogSystemService.java index 9cc58b8..30245a2 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLogSystemService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLogSystemService.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysLogSystemService; -import cn.estsh.i3plus.core.api.iservice.busi.ISystemResourceService; +import cn.estsh.i3plus.core.apiservice.dao.ISysLogSystemDao; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.common.PagerHelper; @@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Map; /** * @Description : 系统日志服务接口实现 @@ -31,6 +32,8 @@ public class SysLogSystemService implements ISysLogSystemService { @Autowired private SysLogSystemRepository logSystemRDao; + @Autowired + private ISysLogSystemDao sysLogSystemDao; @Override @ApiOperation(value = "添加系统日志",notes = "添加系统日志") @@ -69,4 +72,9 @@ public class SysLogSystemService implements ISysLogSystemService { ,logSystem.getAscOrDesc()),pager); } } + + @Override + public Map queryAvgExecuteTime(String startTime, String endTime) { + return sysLogSystemDao.querySysLogOperateAvgExecuteTime(startTime,endTime); + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageService.java index 3b4d9d6..d97589a 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageService.java @@ -17,6 +17,7 @@ import cn.estsh.i3plus.pojo.platform.repository.SysUserRepository; import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; +import cn.estsh.impp.framework.boot.util.ImppRedis; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -24,6 +25,8 @@ import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.HashMap; import java.util.List; /** diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysOrganizeService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysOrganizeService.java index 2a0f762..113b54a 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysOrganizeService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysOrganizeService.java @@ -20,7 +20,7 @@ import org.springframework.stereotype.Service; import java.util.List; /** - * @Description : 组织业务接口实现 + * @Description : 组织业务接口实现 * @Reference : * @Author : wei.peng * @Date : 2018-10-22 16:58:42.957 @@ -167,4 +167,9 @@ public class SysOrganizeService implements ISysOrganizeService { LOGGER.info("组织 ORGANIZE find id:{}", id); return organizeRDao.getById(id); } + + @Override + public long getSysOrganizeCount() { + return organizeRDao.listCount(); + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java index 9b3a663..dd1ce44 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java @@ -410,6 +410,12 @@ public class SysUserService implements ISysUserService { } } + @Override + @ApiOperation(value = "查询账户数量") + public long getSysUserCount() { + return sysUserRDao.listCount(); + } + /** * 封装用户登陆信息 * diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/MailUtil.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/MailUtil.java index 4acefbc..0441a03 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/MailUtil.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/MailUtil.java @@ -61,6 +61,17 @@ public class MailUtil { /** * 设置收件人地址 * + * @param nick + * 收件人Email地址 + */ + public void setNick(String nick) { + this.nick = nick; + } + + + /** + * 设置收件人地址 + * * @param aEmail * 收件人Email地址 */ diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestBase.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestBase.java index 379178e..45eac3b 100644 --- a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestBase.java +++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestBase.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysConfigService; import cn.estsh.impp.framework.boot.init.ApplicationProperties; +import cn.estsh.impp.framework.boot.util.ImppRedis; import org.junit.After; import org.junit.Before; import org.junit.FixMethodOrder; @@ -12,6 +13,8 @@ import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMock import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; +import javax.annotation.Resource; + /** * @Description : * @Reference : @@ -31,10 +34,14 @@ public class TestBase { @Autowired private ISysConfigService sysConfigService; + @Resource(name="redisRes") + private ImppRedis redisRes; + @Before public void init() { System.out.println("-----------------开始测试-----------------"); app.setProfilesActive("unit-test"); + redisRes.multi(); } @After diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestRedis.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestRedis.java new file mode 100644 index 0000000..2efaf9d --- /dev/null +++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestRedis.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; + +import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService; +import cn.estsh.impp.framework.boot.util.ImppRedis; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; + +import javax.annotation.Resource; +import java.beans.Transient; +import java.util.HashMap; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2018-12-12 22:06 + * @Modify: + **/ +public class TestRedis extends TestBase { + + @Autowired + private ISysMessageService sysMessageService; + + @Test + public void testReids(){ +// // 放入缓存 +// HashMap resource = new HashMap(); +// resource.put("test","test110"); +// redisRes.putHashMap("junit3",resource,1000 * 60); +// System.out.println(redisRes.getHashMap("junit3")); +// System.out.println(redisRes.commit()); +// System.out.println(redisRes.getHashMap("junit3")); + sysMessageService.insertRedis(); + } +} From 0f414fcaeb03f17b9b5f92452df8685812d617e9 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Thu, 13 Dec 2018 15:44:53 +0800 Subject: [PATCH 3/7] =?UTF-8?q?Junit=20Test=20=E7=94=A8=E6=88=B7=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/api/iservice/busi/ISysUserService.java | 10 +++ .../core/apiservice/auth/realm/UserAuthRealm.java | 2 + .../serviceimpl/busi/SysUserService.java | 2 + .../core/apiservice/serviceimpl/busi/TestBase.java | 83 +++++++++++++++++----- 4 files changed, 78 insertions(+), 19 deletions(-) diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java index a1e5cb9..c847c83 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java @@ -175,4 +175,14 @@ public interface ISysUserService { * @param user */ void checkSysUserOnly(SysUser user); + + /** + * 登录封装用户信息 + * @param sessionUser + * @param user + * @param userType + * @param languageCode + * @return + */ + SessionUser packSessionUser(SessionUser sessionUser, SysUser user, Integer userType, String languageCode); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/auth/realm/UserAuthRealm.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/auth/realm/UserAuthRealm.java index 5e7d147..6e8a93c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/auth/realm/UserAuthRealm.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/auth/realm/UserAuthRealm.java @@ -14,6 +14,7 @@ import org.apache.shiro.subject.PrincipalCollection; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; /** * @Description : 验证规则 @@ -22,6 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired; * @CreateDate : 2018-10-13 14:04 * @Modify: **/ +@Component public class UserAuthRealm extends AuthorizingRealm { public static final Logger LOGGER = LoggerFactory.getLogger(UserAuthRealm.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java index 31a6c6e..b85f967 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java @@ -424,6 +424,8 @@ public class SysUserService implements ISysUserService { * @param languageCode 用户选择的语言 * @return */ + @Override + @ApiOperation(value = "封装用户信息", notes = "封装用户信息") public SessionUser packSessionUser(SessionUser sessionUser, SysUser user, Integer userType, String languageCode) { LOGGER.debug("平台用户 SYS_USER user id :{}", user.getId()); SysUserInfo userInfo = sysUserInfoRDao.getById(user.getUserInfoId()); diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestBase.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestBase.java index 379178e..3cc2fad 100644 --- a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestBase.java +++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestBase.java @@ -1,45 +1,90 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; -import cn.estsh.i3plus.core.api.iservice.busi.ISysConfigService; -import cn.estsh.impp.framework.boot.init.ApplicationProperties; +import cn.estsh.i3plus.pojo.base.shirotoken.UserToken; +import cn.estsh.i3plus.pojo.platform.bean.SessionUser; +import cn.estsh.impp.framework.boot.auth.AuthUtil; +import cn.estsh.impp.framework.boot.util.SpringContextsUtil; +import cn.estsh.impp.framework.run.ImppGo; +import com.alibaba.fastjson.JSON; +import org.apache.shiro.SecurityUtils; +import org.apache.shiro.authc.AuthenticationException; +import org.apache.shiro.authc.AuthenticationInfo; +import org.apache.shiro.authc.AuthenticationToken; +import org.apache.shiro.authc.SimpleAuthenticationInfo; +import org.apache.shiro.authz.AuthorizationInfo; +import org.apache.shiro.authz.SimpleAuthorizationInfo; +import org.apache.shiro.mgt.DefaultSecurityManager; +import org.apache.shiro.realm.AuthorizingRealm; +import org.apache.shiro.session.Session; +import org.apache.shiro.session.mgt.DefaultSessionContext; +import org.apache.shiro.session.mgt.SessionContext; +import org.apache.shiro.subject.PrincipalCollection; import org.junit.After; import org.junit.Before; -import org.junit.FixMethodOrder; import org.junit.runner.RunWith; -import org.junit.runners.MethodSorters; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.stereotype.Component; import org.springframework.test.context.junit4.SpringRunner; /** * @Description : * @Reference : - * @Author : wei.peng - * @Date : 2018-10-29 19:12 - * @Modify : + * @Author : Adair Peng + * @CreateDate : 2018-12-13 10:00 + * @Modify: **/ @RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +@SpringBootTest(classes = ImppGo.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) @AutoConfigureMockMvc -@FixMethodOrder(value = MethodSorters.DEFAULT) // <<--- I will change here for testing ... public class TestBase { - @Autowired - private ApplicationProperties app; - - @Autowired - private ISysConfigService sysConfigService; + public static final String JSON_SESSION_USER = "{\"languageCode\":\"zh\",\"user\":{\"ascOrDesc\":1,\"id\":400001,\"isValid\":1,\"menuList\":[],\"orderByParam\":\"\",\"roleList\":[],\"userEmail\":\"wei.peng@estsh.com\",\"userInfoId\":300001,\"userLoginLastDateTime\":\"2018-12-13 14:52:09\",\"userLoginName\":\"admin\",\"userLoginNum\":170,\"userLoginPassword\":\"e10adc3949ba59abbe56e057f20f883e\",\"userName\":\"系统管理员\",\"userPhone\":\"18507256660\",\"userStatus\":1,\"userType\":1},\"userCode\":\"100001\",\"userId\":300001,\"userInfo\":{\"ascOrDesc\":1,\"department\":{\"ascOrDesc\":1,\"createDatetime\":\"2018-12-10 15:52:38\",\"createUser\":\"系统管理员\",\"departmentCode\":\"10001\",\"id\":1072036353472073728,\"isDeleted\":2,\"isValid\":1,\"modifyDatetime\":\"2018-12-10 15:52:38\",\"modifyUser\":\"系统管理员\",\"name\":\"闵行一部\",\"orderByParam\":\"\",\"organizeId\":1072033924571598848,\"organizeNameRdd\":\"闵行车轮工厂\",\"parentId\":-1,\"parentNameRdd\":\"顶级部门\"},\"departmentId\":1072036353472073728,\"departmentList\":[{\"ascOrDesc\":1,\"createDatetime\":\"2018-12-10 15:52:38\",\"createUser\":\"系统管理员\",\"departmentCode\":\"10001\",\"id\":1072036353472073728,\"isDeleted\":2,\"isValid\":1,\"modifyDatetime\":\"2018-12-10 15:52:38\",\"modifyUser\":\"系统管理员\",\"name\":\"闵行一部\",\"orderByParam\":\"\",\"organizeId\":1072033924571598848,\"organizeNameRdd\":\"闵行车轮工厂\",\"parentId\":-1,\"parentNameRdd\":\"顶级部门\"},{\"ascOrDesc\":1,\"createDatetime\":\"2018-12-10 15:52:52\",\"createUser\":\"系统管理员\",\"departmentCode\":\"10002\",\"id\":1072036412234272768,\"isDeleted\":2,\"isValid\":1,\"modifyDatetime\":\"2018-12-10 15:52:52\",\"modifyUser\":\"系统管理员\",\"name\":\"闵行二部\",\"orderByParam\":\"\",\"organizeId\":1072033995035906048,\"organizeNameRdd\":\"闵行车门工厂\",\"parentId\":-1,\"parentNameRdd\":\"顶级部门\"},{\"ascOrDesc\":1,\"createDatetime\":\"2018-12-10 15:53:07\",\"createUser\":\"系统管理员\",\"departmentCode\":\"10003\",\"id\":1072036474448384000,\"isDeleted\":2,\"isValid\":1,\"modifyDatetime\":\"2018-12-10 15:53:07\",\"modifyUser\":\"系统管理员\",\"name\":\"浦东一部\",\"orderByParam\":\"\",\"organizeId\":1072034176548605952,\"organizeNameRdd\":\"浦东车窗工厂\",\"parentId\":-1,\"parentNameRdd\":\"顶级部门\"},{\"ascOrDesc\":1,\"createDatetime\":\"2018-12-10 15:53:26\",\"createUser\":\"系统管理员\",\"departmentCode\":\"10004\",\"id\":1072036552160448512,\"isDeleted\":2,\"isValid\":1,\"modifyDatetime\":\"2018-12-10 15:53:26\",\"modifyUser\":\"系统管理员\",\"name\":\"浦东二部\",\"orderByParam\":\"\",\"organizeId\":1072034276020719616,\"organizeNameRdd\":\"浦东发动机工厂\",\"parentId\":-1,\"parentNameRdd\":\"顶级部门\"},{\"ascOrDesc\":1,\"createDatetime\":\"2018-12-10 15:54:42\",\"createUser\":\"系统管理员\",\"departmentCode\":\"10005\",\"id\":1072036873070841856,\"isDeleted\":2,\"isValid\":1,\"modifyDatetime\":\"2018-12-10 15:54:52\",\"modifyUser\":\"系统管理员\",\"name\":\"浙江AD部\",\"orderByParam\":\"\",\"organizeId\":1072034411442212864,\"organizeNameRdd\":\"浙江AD钙工厂\",\"parentId\":-1,\"parentNameRdd\":\"顶级部门\"},{\"ascOrDesc\":1,\"createDatetime\":\"2018-12-10 15:55:05\",\"createUser\":\"系统管理员\",\"departmentCode\":\"10006\",\"id\":1072036970013790208,\"isDeleted\":2,\"isValid\":1,\"modifyDatetime\":\"2018-12-10 15:55:05\",\"modifyUser\":\"系统管理员\",\"name\":\"江苏一部\",\"orderByParam\":\"\",\"organizeId\":1072034525309177856,\"organizeNameRdd\":\"江苏爽歪歪工厂\",\"parentId\":-1,\"parentNameRdd\":\"顶级部门\"},{\"ascOrDesc\":1,\"createDatetime\":\"2018-12-10 15:55:48\",\"createUser\":\"系统管理员\",\"departmentCode\":\"10007\",\"id\":1072037153732694016,\"isDeleted\":2,\"isValid\":1,\"modifyDatetime\":\"2018-12-10 15:55:48\",\"modifyUser\":\"系统管理员\",\"name\":\"闵行一部一组\",\"orderByParam\":\"\",\"organizeId\":1072033924571598848,\"organizeNameRdd\":\"闵行车轮工厂\",\"parentId\":1072036353472073728,\"parentNameRdd\":\"闵行一部\"},{\"ascOrDesc\":1,\"createDatetime\":\"2018-12-10 15:56:08\",\"createUser\":\"系统管理员\",\"departmentCode\":\"10008\",\"id\":1072037232132624384,\"isDeleted\":2,\"isValid\":1,\"modifyDatetime\":\"2018-12-10 15:56:08\",\"modifyUser\":\"系统管理员\",\"name\":\"闵行二部一组\",\"orderByParam\":\"\",\"organizeId\":1072033995035906048,\"organizeNameRdd\":\"闵行车门工厂\",\"parentId\":1072036412234272768,\"parentNameRdd\":\"闵行二部\"},{\"ascOrDesc\":1,\"createDatetime\":\"2018-12-10 20:43:11\",\"createUser\":\"系统管理员\",\"departmentCode\":\"10010\",\"id\":1072109473407045632,\"isDeleted\":2,\"isValid\":1,\"modifyDatetime\":\"2018-12-10 20:43:11\",\"modifyUser\":\"系统管理员\",\"name\":\"东尚总部\",\"orderByParam\":\"\",\"organizeId\":1072028266539388928,\"organizeNameRdd\":\"东尚集团\",\"parentId\":-1,\"parentNameRdd\":\"顶级部门\"},{\"ascOrDesc\":1,\"createDatetime\":\"2018-12-10 20:43:37\",\"createUser\":\"系统管理员\",\"departmentCode\":\"20010\",\"id\":1072109580340826112,\"isDeleted\":2,\"isValid\":1,\"modifyDatetime\":\"2018-12-10 20:43:37\",\"modifyUser\":\"系统管理员\",\"name\":\"娃哈哈总部\",\"orderByParam\":\"\",\"organizeId\":1072033577438416896,\"organizeNameRdd\":\"娃哈哈集团\",\"parentId\":-1,\"parentNameRdd\":\"顶级部门\"}],\"departmentNameRdd\":\"闵行一部\",\"departmentNamesRdd\":\"闵行一部,闵行二部,浦东一部,浦东二部,浙江AD部,江苏一部,闵行一部一组,闵行二部一组,东尚总部,娃哈哈总部\",\"id\":300001,\"isValid\":1,\"modifyDatetime\":\"2018-12-12 16:34:45\",\"modifyUser\":\"系统管理员\",\"name\":\"系统管理员\",\"orderByParam\":\"\",\"organize\":{\"ascOrDesc\":1,\"createDatetime\":\"2018-12-10 15:42:59\",\"createUser\":\"系统管理员\",\"id\":1072033924571598848,\"isDeleted\":2,\"isValid\":1,\"modifyDatetime\":\"2018-12-10 15:42:59\",\"modifyUser\":\"系统管理员\",\"name\":\"闵行车轮工厂\",\"orderByParam\":\"\",\"organizeCode\":\"10004\",\"organizeType\":3,\"parentId\":1072032375745155072,\"parentNameRdd\":\"闵行公司\"},\"organizeId\":1072033924571598848,\"organizeList\":[{\"ascOrDesc\":1,\"createDatetime\":\"2018-12-10 15:42:59\",\"createUser\":\"系统管理员\",\"id\":1072033924571598848,\"isDeleted\":2,\"isValid\":1,\"modifyDatetime\":\"2018-12-10 15:42:59\",\"modifyUser\":\"系统管理员\",\"name\":\"闵行车轮工厂\",\"orderByParam\":\"\",\"organizeCode\":\"10004\",\"organizeType\":3,\"parentId\":1072032375745155072,\"parentNameRdd\":\"闵行公司\"},{\"ascOrDesc\":1,\"createDatetime\":\"2018-12-10 15:43:16\",\"createUser\":\"系统管理员\",\"id\":1072033995035906048,\"isDeleted\":2,\"isValid\":1,\"modifyDatetime\":\"2018-12-10 15:43:16\",\"modifyUser\":\"系统管理员\",\"name\":\"闵行车门工厂\",\"orderByParam\":\"\",\"organizeCode\":\"10005\",\"organizeType\":3,\"parentId\":1072032375745155072,\"parentNameRdd\":\"闵行公司\"},{\"ascOrDesc\":1,\"createDatetime\":\"2018-12-10 15:43:59\",\"createUser\":\"系统管理员\",\"id\":1072034176548605952,\"isDeleted\":2,\"isValid\":1,\"modifyDatetime\":\"2018-12-10 15:43:59\",\"modifyUser\":\"系统管理员\",\"name\":\"浦东车窗工厂\",\"orderByParam\":\"\",\"organizeCode\":\"10006\",\"organizeType\":3,\"parentId\":1072033520731426816,\"parentNameRdd\":\"浦东公司\"},{\"ascOrDesc\":1,\"createDatetime\":\"2018-12-10 15:44:23\",\"createUser\":\"系统管理员\",\"id\":1072034276020719616,\"isDeleted\":2,\"isValid\":1,\"modifyDatetime\":\"2018-12-10 15:44:23\",\"modifyUser\":\"系统管理员\",\"name\":\"浦东发动机工厂\",\"orderByParam\":\"\",\"organizeCode\":\"10007\",\"organizeType\":3,\"parentId\":1072033520731426816,\"parentNameRdd\":\"浦东公司\"},{\"ascOrDesc\":1,\"createDatetime\":\"2018-12-10 15:44:55\",\"createUser\":\"系统管理员\",\"id\":1072034411442212864,\"isDeleted\":2,\"isValid\":1,\"modifyDatetime\":\"2018-12-12 15:47:10\",\"modifyUser\":\"系统管理员\",\"name\":\"浙江AD钙工厂\",\"orderByParam\":\"\",\"organizeCode\":\"20004\",\"organizeSort\":999999999,\"organizeType\":3,\"parentId\":1072033722552946688,\"parentNameRdd\":\"浙江娃哈哈有限公司\"},{\"ascOrDesc\":1,\"createDatetime\":\"2018-12-10 15:45:22\",\"createUser\":\"系统管理员\",\"id\":1072034525309177856,\"isDeleted\":2,\"isValid\":1,\"modifyDatetime\":\"2018-12-12 15:47:57\",\"modifyUser\":\"系统管理员\",\"name\":\"江苏爽歪歪工厂\",\"orderByParam\":\"\",\"organizeCode\":\"20005\",\"organizeSort\":222222222,\"organizeType\":3,\"parentId\":1072033806300614656,\"parentNameRdd\":\"江苏娃哈哈有限公司\"}],\"organizeNameRdd\":\"闵行车轮工厂\",\"position\":{\"ascOrDesc\":1,\"createDatetime\":\"2018-12-10 16:07:07\",\"createUser\":\"系统管理员\",\"id\":1072039995872776192,\"isDeleted\":2,\"isValid\":1,\"modifyDatetime\":\"2018-12-12 15:22:50\",\"modifyUser\":\"系统管理员\",\"name\":\"Java开发工程师\",\"orderByParam\":\"\",\"parentId\":1072039995872776192,\"parentNameRdd\":\"Java开发工程师\",\"positionCode\":\"10001\"},\"positionId\":1072039995872776192,\"positionList\":[{\"ascOrDesc\":1,\"createDatetime\":\"2018-12-10 16:20:17\",\"createUser\":\"系统管理员\",\"id\":1072043310375374848,\"isDeleted\":2,\"isValid\":1,\"modifyDatetime\":\"2018-12-10 16:20:17\",\"modifyUser\":\"系统管理员\",\"name\":\"运维工程师\",\"orderByParam\":\"\",\"parentId\":-1,\"parentNameRdd\":\"顶级岗位\",\"positionCode\":\"10002\"},{\"ascOrDesc\":1,\"createDatetime\":\"2018-12-10 16:20:31\",\"createUser\":\"系统管理员\",\"id\":1072043370869821440,\"isDeleted\":2,\"isValid\":1,\"modifyDatetime\":\"2018-12-12 15:22:34\",\"modifyUser\":\"系统管理员\",\"name\":\"Android 开发工程师\",\"orderByParam\":\"\",\"parentId\":-1,\"parentNameRdd\":\"顶级岗位\",\"positionCode\":\"10003\"},{\"ascOrDesc\":1,\"createDatetime\":\"2018-12-10 16:20:50\",\"createUser\":\"系统管理员\",\"id\":1072043447055159296,\"isDeleted\":2,\"isValid\":1,\"modifyDatetime\":\"2018-12-10 16:20:50\",\"modifyUser\":\"系统管理员\",\"name\":\"数据库运维\",\"orderByParam\":\"\",\"parentId\":1072043310375374848,\"parentNameRdd\":\"运维工程师\",\"positionCode\":\"10004\"},{\"ascOrDesc\":1,\"createDatetime\":\"2018-12-10 16:21:38\",\"createUser\":\"系统管理员\",\"id\":1072043651225489408,\"isDeleted\":2,\"isValid\":1,\"modifyDatetime\":\"2018-12-10 16:21:38\",\"modifyUser\":\"系统管理员\",\"name\":\"部署工程师\",\"orderByParam\":\"\",\"parentId\":1072043310375374848,\"parentNameRdd\":\"运维工程师\",\"positionCode\":\"10006\"}],\"positionNameRdd\":\"Java开发工程师\",\"positionNamesRdd\":\"运维工程师,Android 开发工程师,数据库运维,部署工程师\",\"user\":{\"$ref\":\"$.user\"},\"userAge\":110,\"userEmpNo\":\"100001\",\"userImageId\":1072104117033373696,\"userInfoStatus\":1,\"userLoginLastDateTime\":\"2018-12-13 14:52:09\",\"userLoginNum\":170},\"userName\":\"系统管理员\",\"userType\":\"普通用户\"}\n"; @Before - public void init() { - System.out.println("-----------------开始测试-----------------"); - app.setProfilesActive("unit-test"); + public void before() { + System.out.println("----------------->> 注入登录用户 <<-----------------"); + SessionContext sessionContext = new DefaultSessionContext(); + sessionContext.setHost("localhost"); + + UserAuthRealm userAuthRealm = (UserAuthRealm) SpringContextsUtil.getBean(UserAuthRealm.class); + org.apache.shiro.mgt.SecurityManager securityManager = new DefaultSecurityManager(userAuthRealm); + SecurityUtils.setSecurityManager(securityManager); + securityManager.start(sessionContext); + + UserToken token = new UserToken("login_name", "login_pwd", "zh"); + SessionUser sessionUser = AuthUtil.login(token); + AuthUtil.setSessionUser(sessionUser); + System.out.println("----------------->> 开始测试 <<-----------------"); } @After public void after() { - System.out.println("-----------------测试结束-----------------"); + System.out.println("----------------->> 测试结束 <<-----------------"); + } } + +@Component +class UserAuthRealm extends AuthorizingRealm { + + public UserAuthRealm() { + //添加支持的token + this.setAuthenticationTokenClass(UserToken.class); + } + + @Override + protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principalCollection) { + return new SimpleAuthorizationInfo(); + } + + @Override + protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken authenticationToken) throws AuthenticationException { + SessionUser user = JSON.parseObject(TestBase.JSON_SESSION_USER, SessionUser.class); + return new SimpleAuthenticationInfo(user, ((UserToken) authenticationToken).getLoginPwd(), this.getName()); + } + +} + + From 6ecf276183fc7c814157cfd222b6d95620a8fb35 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Thu, 13 Dec 2018 19:11:37 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20ApiOperation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/iservice/base/ISystemLoginService.java | 7 ++ .../core/api/iservice/busi/ICoreTreeService.java | 24 ++++- .../api/iservice/busi/ISysDepartmentService.java | 9 ++ .../core/api/iservice/busi/ISysFileService.java | 20 ++-- .../iservice/busi/ISysLocaleLanguageService.java | 1 + .../core/api/iservice/busi/ISysMenuService.java | 10 ++ .../api/iservice/busi/ISysOrganizeService.java | 6 ++ .../api/iservice/busi/ISysPositionService.java | 13 ++- .../core/api/iservice/busi/ISysRoleService.java | 13 +++ .../busi/ISysTaskTimeRecordingService.java | 6 ++ .../core/api/iservice/busi/ISysToolService.java | 23 ++-- .../api/iservice/busi/ISysToolTypeService.java | 8 ++ .../api/iservice/busi/ISysUserInfoService.java | 3 + .../core/api/iservice/busi/ISysUserService.java | 68 ++++++++---- .../controller/busi/SysLogOperateController.java | 1 - .../controller/busi/SysLogSystemController.java | 1 - .../controller/busi/SysOrderNoRuleController.java | 12 ++- .../controller/busi/SysOrganizeController.java | 2 +- .../controller/busi/SysRoleController.java | 2 +- .../controller/busi/SysTreeController.java | 10 +- .../controller/busi/SysUserController.java | 2 - .../controller/busi/SysUserInfoController.java | 1 + .../serviceimpl/base/SystemLoginService.java | 7 ++ .../serviceimpl/busi/CoreTreeService.java | 20 ++++ .../serviceimpl/busi/SysDepartmentService.java | 9 ++ .../serviceimpl/busi/SysFileServiceImpl.java | 19 ++-- .../serviceimpl/busi/SysLocaleLanguageService.java | 11 ++ .../serviceimpl/busi/SysMenuService.java | 10 ++ .../serviceimpl/busi/SysOrganizeService.java | 9 ++ .../serviceimpl/busi/SysPositionService.java | 9 ++ .../serviceimpl/busi/SysRoleService.java | 13 +++ .../busi/SysTaskTimeRecordingService.java | 6 ++ .../serviceimpl/busi/SysToolService.java | 10 ++ .../serviceimpl/busi/SysToolTypeService.java | 8 ++ .../serviceimpl/busi/SysUserInfoService.java | 120 ++++++++++++--------- .../serviceimpl/busi/SysUserService.java | 7 +- 36 files changed, 382 insertions(+), 118 deletions(-) diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISystemLoginService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISystemLoginService.java index 849fb8c..abd69bc 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISystemLoginService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISystemLoginService.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.shirotoken.AdminToken; import cn.estsh.i3plus.pojo.base.shirotoken.SaAdminToken; import cn.estsh.i3plus.pojo.base.shirotoken.UserToken; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; +import io.swagger.annotations.ApiOperation; /** * @Description : 用户登陆方法，平台统一登陆 @@ -14,15 +15,21 @@ import cn.estsh.i3plus.pojo.platform.bean.SessionUser; **/ public interface ISystemLoginService { + @ApiOperation(value = "用户登录",notes = "普通用户登录") SessionUser queryUserLogin(String loginName, String s, String languageCode); + @ApiOperation(value = "用户登录",notes = "管理用户登录") SessionUser queryAdminLogin(String loginName, String s, String languageCode); + @ApiOperation(value = "封装用户",notes = "封装普通用户信息") SessionUser queryCheckUserLogin(UserToken authenticationToken); + @ApiOperation(value = "封装用户",notes = "封装管理员信息") SessionUser queryCheckAdminLogin(AdminToken authenticationToken); + @ApiOperation(value = "封装用户",notes = "封装超级管理员信息") SessionUser queryCheckSaAdminLogin(SaAdminToken authenticationToken); + @ApiOperation(value = "登录密码错误",notes = "登录密码错误记录错误次数功能") Integer doLoginPasswordError(String loginName); } diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ICoreTreeService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ICoreTreeService.java index 85c0d43..7301494 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ICoreTreeService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ICoreTreeService.java @@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.platform.bean.SysDepartment; import cn.estsh.i3plus.pojo.platform.bean.SysMenu; import cn.estsh.i3plus.pojo.platform.bean.SysOrganize; import cn.estsh.i3plus.pojo.platform.bean.SysPosition; +import io.swagger.annotations.ApiOperation; import java.util.List; @@ -23,6 +24,7 @@ public interface ICoreTreeService { * @param parentId * @return */ + @ApiOperation(value = "获取岗位树",notes = "根据父节点获取岗位树集合") List findSysPositionTreeByParentId(long parentId); /** @@ -30,6 +32,7 @@ public interface ICoreTreeService { * @param id * @return */ + @ApiOperation(value = "获取岗位树",notes = "根据父节点获取岗位树") SysPosition getSysPositionTreeById(long id); /** @@ -37,12 +40,14 @@ public interface ICoreTreeService { * @param parent 父类对象 * @param step 层级 */ + @ApiOperation(value = "封装岗位树",notes = "封装当前岗位树") void findSysPositionChildrenTreePack(SysPosition parent,int step); /** * 检查父节点是否是子节点ID或者为当前节点ID * @param position */ + @ApiOperation(value = "父节点检查",notes = "检查岗位的父节点是否是当前节点的子节点") void doValidatorSysPositionParentId(SysPosition position) ; /** @@ -50,6 +55,7 @@ public interface ICoreTreeService { * @param parentId * @return */ + @ApiOperation(value = "获取部门树",notes = "根据父节点获取部门树集合") List findSysDepartmentTreeByParentId(long parentId); /** @@ -57,6 +63,7 @@ public interface ICoreTreeService { * @param id * @return */ + @ApiOperation(value = "获取部门树",notes = "根据父节点获取部门树") SysDepartment getSysDepartmentTreeById(long id); /** @@ -64,12 +71,14 @@ public interface ICoreTreeService { * @param parent 父类对象 * @param step 层级 */ + @ApiOperation(value = "封装部门树",notes = "封装当前部门树") void findSysDepartmentChildrenTreePack(SysDepartment parent,int step); /** * 检查父节点是否是子节点ID或者为当前节点ID * @param department */ + @ApiOperation(value = "父节点检查",notes = "检查部门的父节点是否是当前节点的子节点") void doValidatorSysDepartmentParentId(SysDepartment department) ; /** @@ -77,6 +86,7 @@ public interface ICoreTreeService { * @param parentId * @return */ + @ApiOperation(value = "获取组织树",notes = "根据父节点获取组织树集合") List findSysOrganizeTreeByParentId(long parentId); /** @@ -84,6 +94,7 @@ public interface ICoreTreeService { * @param id * @return */ + @ApiOperation(value = "获取组织树",notes = "根据父节点获取组织树") SysOrganize getSysOrganizeTreeById(long id); /** @@ -91,26 +102,30 @@ public interface ICoreTreeService { * @param parent 父类对象 * @param step 层级 */ + @ApiOperation(value = "封装组织树",notes = "封装当前组织树") void findSysOrganizeChildrenTreePack(SysOrganize parent,int step); /** * 检查父节点是否是子节点ID或者为当前节点ID * @param organize */ + @ApiOperation(value = "父节点检查",notes = "检查组织的父节点是否是当前节点的子节点") void doValidatorSysOrganizeParentId(SysOrganize organize) ; /** - * 获取组织树 + * 获取菜单树 * @param parentId * @return */ + @ApiOperation(value = "获取菜单树",notes = "根据父节点获取菜单树集合") List findSysMenuTreeByParentId(long parentId); /** - * 获取组织树 + * 获取菜单树 * @param id * @return */ + @ApiOperation(value = "获取菜单树",notes = "根据父节点获取菜单树") SysMenu getSysMenuTreeById(long id); /** @@ -118,12 +133,14 @@ public interface ICoreTreeService { * @param parent 父类对象 * @param step 层级 */ + @ApiOperation(value = "封装菜单树",notes = "封装当前菜单树") void findSysMenuChildrenTreePack(SysMenu parent, int step); /** * 检查父节点是否是子节点ID或者为当前节点ID * @param menu */ + @ApiOperation(value = "父节点检查",notes = "检查菜单的父节点是否是当前节点的子节点") void doValidatorSysMenuParentId(SysMenu menu) ; /** @@ -131,6 +148,7 @@ public interface ICoreTreeService { * @param parentId * @return */ + @ApiOperation(value = "获取组织部门树",notes = "根据父节点获取组织部门树集合") List findOrganizeDepartment(long parentId); /** @@ -138,6 +156,7 @@ public interface ICoreTreeService { * @param id * @return */ + @ApiOperation(value = "获取组织部门树",notes = "根据父节点获取组织部门树") CommonTreeModel getOrganizeById(long id); /** @@ -145,6 +164,7 @@ public interface ICoreTreeService { * @param parent 父类对象 * @param step 层级 */ + @ApiOperation(value = "封装菜单树",notes = "封装当前组织部门树") void findOrganizeTreePack(CommonTreeModel parent, int step); } diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDepartmentService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDepartmentService.java index 6f0f6fa..83111a4 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDepartmentService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDepartmentService.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.api.iservice.busi; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.platform.bean.SysDepartment; +import io.swagger.annotations.ApiOperation; import java.util.List; @@ -19,12 +20,14 @@ public interface ISysDepartmentService { * 添加部门 * @param department */ + @ApiOperation(value = "新增部门信息") SysDepartment insertSysDepartment(SysDepartment department); /** * 根据id删除部门 * @param id */ + @ApiOperation(value = "删除部门信息",notes = "根据ID 删除部门信息") void deleteSysDepartmentById(Long id); /** @@ -32,18 +35,21 @@ public interface ISysDepartmentService { * @param ids id数组 * @return */ + @ApiOperation(value = "删除部门信息",notes = "根据ID 批量删除部门信息") void deleteSysDepartmentByIds(Long[] ids); /** * 修改部门信息 * @param department */ + @ApiOperation(value = "更新部门信息") void updateSysDepartment(SysDepartment department); /** * 查询全部部门 * @return */ + @ApiOperation(value = "查询部门信息",notes = "查询所有部门信息") List listSysDepartment(); /** @@ -52,6 +58,7 @@ public interface ISysDepartmentService { * @param pager * @return */ + @ApiOperation(value = "查询部门信息",notes = "查询部门信息(分页、组合)") ListPager querySysDepartment(SysDepartment department, Pager pager); /** @@ -59,6 +66,7 @@ public interface ISysDepartmentService { * @param id * @return */ + @ApiOperation(value = "查询部门信息",notes = "根据ID查询部门信息") SysDepartment getSysDepartmentById(Long id); /** @@ -67,5 +75,6 @@ public interface ISysDepartmentService { * @param pager * @return */ + @ApiOperation(value = "查询部门信息",notes = "查询部门信息(分页、组合)") ListPager findSysDepartmentByPager(SysDepartment department, Pager pager); } diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysFileService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysFileService.java index de0ad57..e0303a3 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysFileService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysFileService.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.api.iservice.busi; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.platform.bean.SysFile; +import io.swagger.annotations.ApiOperation; import java.util.List; @@ -19,24 +20,21 @@ public interface ISysFileService { * 添加文件资源信息 * @param sysFile */ + @ApiOperation(value = "新增资源信息") SysFile insertSysFile(SysFile sysFile); /** - * 删除文件资源小新 - * @param id - */ - void deleteSysFileById(Long id); - - /** * 修改文件资源信息 * @param sysFile */ + @ApiOperation(value = "更新资源信息") void updateSysFile(SysFile sysFile); /** * 查询全部文件资源信息 * @return */ + @ApiOperation(value = "查询资源信息",notes = "查询所有资源信息") List listSysFile(); /** @@ -44,6 +42,7 @@ public interface ISysFileService { * @param id * @return */ + @ApiOperation(value = "查询资源信息",notes = "根据 ID查询资源信息") SysFile getSysFileById(Long id); /** @@ -52,11 +51,20 @@ public interface ISysFileService { * @param pager * @return */ + @ApiOperation(value = "查询资源信息",notes = "查询资源信息(分页、组合)") ListPager querySysFileByPager(SysFile sysFile, Pager pager); /** + * 删除文件资源小新 + * @param id + */ + @ApiOperation(value = "删除资源信息",notes = "根据ID删除资源信息") + void deleteSysFileById(Long id); + + /** * 批量删除文件资源 * @param ids */ + @ApiOperation(value = "删除资源信息",notes = "根据ID批量删除资源信息") void deleteSysFileByIds(Long[] ids); } diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLocaleLanguageService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLocaleLanguageService.java index 64efd55..1d9d40d 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLocaleLanguageService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLocaleLanguageService.java @@ -43,5 +43,6 @@ public interface ISysLocaleLanguageService { @ApiOperation(value = "根据语言id修改语言状态") void updateSysLocaleLanguageStatusById(Long id,Integer status); + @ApiOperation(value = "根据语言id批量修改语言状态") void updateSysLocaleLanguageStatusByIds(Long[] ids,Integer status); } 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 index 157bb09..ee18289 100644 --- 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 @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.SysMenu; +import io.swagger.annotations.ApiOperation; import java.util.List; @@ -22,6 +23,7 @@ public interface ISysMenuService { * * @param sysMenu */ + @ApiOperation(value = "更新菜单信息") void updateSysMenu(SysMenu sysMenu); /** @@ -31,6 +33,7 @@ public interface ISysMenuService { * @param user 当前会话用户 * @return */ + @ApiOperation(value = "更新菜单信息",notes = "根据ID 更新菜单状态信息") void updateSysMenuStatus(Long id, int status, SessionUser user); /** @@ -39,6 +42,7 @@ public interface ISysMenuService { * @param status * @param user */ + @ApiOperation(value = "更新菜单信息",notes = "根据ID 批量更新菜单状态信息") void updateSysMenuStatusByIds(Long[] ids, int status, SessionUser user); /** @@ -46,6 +50,7 @@ public interface ISysMenuService { * @param id * @return */ + @ApiOperation(value = "删除菜单信息",notes = "根据ID 删除菜单信息") void deleteSysMenuById(Long id); /** @@ -53,6 +58,7 @@ public interface ISysMenuService { * @param ids id数组 * @return */ + @ApiOperation(value = "删除菜单信息",notes = "根据ID 批量删除菜单信息") void deleteSysMenuByIds(Long[] ids); /** @@ -61,6 +67,7 @@ public interface ISysMenuService { * @param sysMenu * @return */ + @ApiOperation(value = "新增菜单信息") SysMenu insertSysMenu(SysMenu sysMenu); /** @@ -68,6 +75,7 @@ public interface ISysMenuService { * * @return */ + @ApiOperation(value = "查询菜单信息",notes = "查询所有菜单信息") List findSysMenuAll(); /** @@ -76,6 +84,7 @@ public interface ISysMenuService { * @param id * @return */ + @ApiOperation(value = "查询菜单信息",notes = "根据ID查询菜单信息") SysMenu getSysMenuById(Long id); /** @@ -84,6 +93,7 @@ public interface ISysMenuService { * @param pager * @return */ + @ApiOperation(value = "查询菜单信息",notes = "查询菜单信息(分页、组合)") ListPager querySysMenu(SysMenu menu, Pager pager); diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysOrganizeService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysOrganizeService.java index ecb7a68..025bb95 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysOrganizeService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysOrganizeService.java @@ -36,6 +36,7 @@ public interface ISysOrganizeService { * 根据Key 删除数据 * @param id */ + @ApiOperation(value = "删除组织信息",notes = "根据 ID 删除组织信息") void deleteSysOrganizeById(Long id); /** @@ -43,6 +44,7 @@ public interface ISysOrganizeService { * @param ids id数组 * @return */ + @ApiOperation(value = "删除组织信息",notes = "根据 ID 批量删除组织信息") void deleteSysOrganizeByIds(Long[] ids); /** @@ -50,12 +52,14 @@ public interface ISysOrganizeService { * @param organize * @return */ + @ApiOperation(value = "新增组织信息") SysOrganize insertSysOrganize(SysOrganize organize); /** * 查询所有数据 * @return */ + @ApiOperation(value = "查询组织信息",notes = "查询所有组织信息") List listSysOrganize(); /** @@ -64,6 +68,7 @@ public interface ISysOrganizeService { * @param pager * @return */ + @ApiOperation(value = "查询组织信息",notes = "查询 组织信息(分页、组合)") ListPager querySysOrganize(SysOrganize organize, Pager pager); /** @@ -71,5 +76,6 @@ public interface ISysOrganizeService { * @param id * @return */ + @ApiOperation(value = "查询组织信息",notes = "根据ID查询组织信息") SysOrganize getSysOrganizeById(Long id); } diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysPositionService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysPositionService.java index cbc7aad..d6d13e5 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysPositionService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysPositionService.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.api.iservice.busi; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.platform.bean.SysPosition; +import io.swagger.annotations.ApiOperation; import org.springframework.data.domain.Page; import java.util.List; @@ -18,16 +19,16 @@ public interface ISysPositionService { /** * 修改数据 - * * @param position */ + @ApiOperation(value = "更新岗位信息") void updateSysPosition(SysPosition position); /** * 根据Key 删除数据 - * * @param id */ + @ApiOperation(value = "删除岗位信息",notes = "根据ID 删除岗位信息") void deleteSysPositionById(Long id); /** @@ -35,21 +36,22 @@ public interface ISysPositionService { * @param ids id数组 * @return */ + @ApiOperation(value = "删除岗位信息",notes = "根据ID 批量删除岗位信息") void deleteSysPositionByIds(Long[] ids); /** * 新增数据 - * * @param position * @return */ + @ApiOperation(value = "新增岗位信息") SysPosition insertSysPosition(SysPosition position); /** * 查询所有数据 - * * @return */ + @ApiOperation(value = "新增岗位信息") List listSysPosition(); /** @@ -58,6 +60,7 @@ public interface ISysPositionService { * @param pager * @return */ + @ApiOperation(value = "查询岗位信息",notes = "查询岗位信息 (分页，组合)") ListPager querySysPosition(SysPosition position, Pager pager); /** @@ -66,6 +69,7 @@ public interface ISysPositionService { * @param id * @return */ + @ApiOperation(value = "查询岗位信息",notes = "根据 ID 查询岗位信息") SysPosition getSysPositionById(Long id); /** @@ -74,6 +78,7 @@ public interface ISysPositionService { * @param pager * @return */ + @ApiOperation(value = "查询岗位信息",notes = "查询岗位信息 (分页，组合)") ListPager findSysPositionByPager(SysPosition position, Pager pager); 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 index b4e56e6..ca2b69f 100644 --- 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 @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.SysRefRoleMenu; import cn.estsh.i3plus.pojo.platform.bean.SysRole; +import io.swagger.annotations.ApiOperation; import java.util.List; @@ -22,6 +23,7 @@ public interface ISysRoleService { * * @param sysRole */ + @ApiOperation(value = "更新角色信息",notes = "更新角色信息") void updateSysRole(SysRole sysRole); /** @@ -31,6 +33,7 @@ public interface ISysRoleService { * @param user 当前用户会话 * @return */ + @ApiOperation(value = "更新角色信息",notes = "更新角色状态信息") void updateSysRoleStatus(Long id, int status, SessionUser user); /** @@ -39,12 +42,14 @@ public interface ISysRoleService { * @param status * @param user */ + @ApiOperation(value = "更新角色信息",notes = "根据ID 批量更新角色状态信息") void updateSysRoleStatusByIds(Long[] ids, int status, SessionUser user); /** * 根据Key 删除数据 * @param id */ + @ApiOperation(value = "删除角色信息",notes = "根据ID 删除角色信息") void deleteSysRoleById(Long id); /** @@ -52,6 +57,7 @@ public interface ISysRoleService { * @param ids id数组 * @return */ + @ApiOperation(value = "删除角色信息",notes = "根据ID 批量删除角色信息") void deleteSysRoleByIds(Long[] ids); /** @@ -60,6 +66,7 @@ public interface ISysRoleService { * @param sysRole * @return */ + @ApiOperation(value = "新增角色信息") SysRole insertSysRole(SysRole sysRole); /** @@ -67,6 +74,7 @@ public interface ISysRoleService { * @param roleId * @param ids */ + @ApiOperation(value = "刷新角色菜单关系",notes = "刷新 角色 菜单关系信息") void refreshSysRoleRef(Long roleId,Long[] ids,String userName); /** @@ -74,6 +82,7 @@ public interface ISysRoleService { * @param roleIds * @param ids */ + @ApiOperation(value = "刷新角色菜单关系",notes = "批量刷新 角色 菜单关系信息") void refreshBatchSysRoleRef(Long[] roleIds,Long[] ids,String userName); /** @@ -81,6 +90,7 @@ public interface ISysRoleService { * @param roleId * @return */ + @ApiOperation(value = "查信角色菜单关系",notes = "查询 ID 查询角色菜单关系") List findSysRefRoleMenuByRoleId(Long roleId); /** @@ -88,6 +98,7 @@ public interface ISysRoleService { * * @return */ + @ApiOperation(value = "查信角色信息",notes = "查询所有角色信息") List findSysRoleAll(); /** @@ -96,6 +107,7 @@ public interface ISysRoleService { * @param id * @return */ + @ApiOperation(value = "查信角色信息",notes = "根据 ID 查询角色信息") SysRole getSysRoleById(Long id); /** @@ -104,5 +116,6 @@ public interface ISysRoleService { * @param pager * @return */ + @ApiOperation(value = "查信角色信息",notes = "查询角色信息(分页/组合)") ListPager querySysRole(SysRole role, Pager pager); } diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysTaskTimeRecordingService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysTaskTimeRecordingService.java index 8791da0..b325271 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysTaskTimeRecordingService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysTaskTimeRecordingService.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.api.iservice.busi; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.SysTaskTimeRecording; +import io.swagger.annotations.ApiOperation; import java.util.List; @@ -18,12 +19,14 @@ public interface ISysTaskTimeRecordingService { * 修改数据 * @param taskTimeRecording */ + @ApiOperation(value = "更新任务表达式信息") void updateSysTaskTimeRecording(SysTaskTimeRecording taskTimeRecording); /** * 根据Key 删除数据 * @param id */ + @ApiOperation(value = "删除任务表达式信息",notes = "根据 ID 删除任务表达式信息") void deleteSysTaskTimeRecordingById(Long id); /** @@ -31,12 +34,14 @@ public interface ISysTaskTimeRecordingService { * @param taskTimeRecording * @return */ + @ApiOperation(value = "新增任务表达式信息") SysTaskTimeRecording insertSysTaskTimeRecording(SysTaskTimeRecording taskTimeRecording); /** * 查询所有数据 * @return */ + @ApiOperation(value = "查询任务表达式信息",notes = "查询所有任务表达式信息") List findSysTaskTimeRecordingAll(); /** @@ -44,5 +49,6 @@ public interface ISysTaskTimeRecordingService { * @param id * @return */ + @ApiOperation(value = "查询任务表达式信息",notes = "查询 ID 任务表达式信息") SysTaskTimeRecording getSysTaskTimeRecordingById(Long id); } diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysToolService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysToolService.java index 6c16aaf..5f21c4a 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysToolService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysToolService.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.platform.bean.SysTool; import cn.estsh.i3plus.pojo.platform.bean.SysToolType; +import io.swagger.annotations.ApiOperation; import java.util.List; @@ -20,24 +21,21 @@ public interface ISysToolService { * 添加硬件 * @param tool */ + @ApiOperation(value = "新增硬件信息") SysTool insertSysTool(SysTool tool); /** - * 删除硬件 - * @param id - */ - void deleteSysToolById(Long id); - - /** * 修改硬件 * @param tool */ + @ApiOperation(value = "更新硬件信息") void updateSysTool(SysTool tool); /** * 查找全部硬件 * @return */ + @ApiOperation(value = "查询设备信息",notes = "查询所有设备信息") List listSysTool(); /** @@ -45,6 +43,7 @@ public interface ISysToolService { * @param id * @return */ + @ApiOperation(value = "查询设备信息",notes = "根据ID 查询设备信息") SysTool getSysToolById(Long id); /** @@ -53,6 +52,7 @@ public interface ISysToolService { * @param pager * @return */ + @ApiOperation(value = "查询设备信息",notes = "根据条件 查询设备信息(分页)") ListPager querySysToolByPager(SysTool tool, Pager pager); /** @@ -60,19 +60,28 @@ public interface ISysToolService { * @param id * @param status */ + @ApiOperation(value = "更新设备信息",notes = "更新设备状态信息") void updateSysToolStatusById(Long id,Integer status); /** + * 删除硬件 + * @param id + */ + @ApiOperation(value = "删除硬件信息",notes = "根据 ID 删除硬件信息") + void deleteSysToolById(Long id); + + /** * 批量删除硬件 * @param ids */ + @ApiOperation(value = "删除硬件信息",notes = "根据 ID 批量删除硬件信息") void deleteSysToolByIds(Long[] ids); - /** * 批量修改硬件状态 * @param ids * @param status */ + @ApiOperation(value = "更新设备信息",notes = "根据 ID 批量修改硬件状态信息") void updateSysToolStatusByIds(Long[] ids,Integer status); } diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysToolTypeService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysToolTypeService.java index 8ef8385..94e9db5 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysToolTypeService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysToolTypeService.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.platform.bean.SysDictionary; import cn.estsh.i3plus.pojo.platform.bean.SysToolType; +import io.swagger.annotations.ApiOperation; import java.util.List; @@ -20,24 +21,28 @@ public interface ISysToolTypeService { * 添加硬件类型 * @param toolType */ + @ApiOperation(value = "新增硬件类型") void insertSysToolType(SysToolType toolType); /** * 删除硬件类型 * @param id */ + @ApiOperation(value = "删除硬件类型",notes = "根据 ID 删除硬件类型信息") void deleteSysToolTypeById(Long id); /** * 修改硬件类型 * @param toolType */ + @ApiOperation(value = "更新硬件类型") void updateSysToolType(SysToolType toolType); /** * 查找全部硬件类型 * @return */ + @ApiOperation(value = "查询硬件类型") List listSysToolType(); /** @@ -45,6 +50,7 @@ public interface ISysToolTypeService { * @param id * @return */ + @ApiOperation(value = "查询硬件类型",notes = "根据 ID 查询硬件类型信息") SysToolType getSysToolTypeById(Long id); /** @@ -53,11 +59,13 @@ public interface ISysToolTypeService { * @param pager * @return */ + @ApiOperation(value = "查询硬件类型",notes = "查询类型信息 复杂化查询") ListPager querySysToolTypeByPager(SysToolType toolType, Pager pager); /** * 批量删除硬件类型 * @param ids */ + @ApiOperation(value = "删除硬件类型",notes = "根据 ID 批量删除硬件类型信息") void deleteSysToolTypeByIds(Long[] ids); } diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserInfoService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserInfoService.java index de7897c..d5d8c72 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserInfoService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserInfoService.java @@ -38,6 +38,7 @@ public interface ISysUserInfoService { * @param departmentIds * @param userName */ + @ApiOperation(value = "刷新用户关系",notes = "刷新用户部门关系") void refreshRefUserDepartment(Long userInfoId, Long[] departmentIds, String userName); /** @@ -46,6 +47,7 @@ public interface ISysUserInfoService { * @param positionIds * @param userName */ + @ApiOperation(value = "刷新用户关系",notes = "刷新用户岗位关系") void refreshRefUserPosition(Long userInfoId, Long[] positionIds , String userName); /** @@ -54,6 +56,7 @@ public interface ISysUserInfoService { * @param organizeId * @param userName */ + @ApiOperation(value = "刷新用户关系",notes = "刷新用户组织关系") void refreshRefUserOrganize(Long userInfoId, Long organizeId, String userName); /** diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java index c847c83..5d0c147 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java @@ -3,11 +3,12 @@ package cn.estsh.i3plus.core.api.iservice.busi; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.platform.bean.*; +import io.swagger.annotations.ApiOperation; import org.apache.shiro.authc.AuthenticationException; import java.util.List; /** - * @Description : 用户账号服务 + * @Description : 账号账号服务 * @Reference : * @Author : wei.peng * @Date : 2018-10-25 16:21 @@ -16,64 +17,72 @@ import java.util.List; public interface ISysUserService { /** - * 用户登录 + * 账号登录 * @param loginName 登录名 * @param password 登录密码 * @param languageCode 界面语言 * @return */ + @ApiOperation(value = "账号登录",notes = "普通账号登录功能") SessionUser queryUserLogin(String loginName, String password, String languageCode) throws AuthenticationException; /** - * 修改权限状态 - * @param id 修改权限状态 + * 修改状态 + * @param id 修改账号状态 * @param status 状态 - * @param user 当前会话用户 + * @param user 当前会话账号 * @return */ + @ApiOperation(value = "修改状态",notes = "修改指定账号状态") void updateSysUserStatus(Long id, int status, SessionUser user); /** - * 批量修改用户状态 + * 批量修改账号状态 * @param ids * @param status * @param user */ + @ApiOperation(value = "修改状态",notes = "批量修改指定账号状态") void updateBatchSysUserStatus(Long[] ids, int status, SessionUser user); /** - * 修改用户信息 + * 修改账号信息 * @param sysUser */ + @ApiOperation(value = "修改账号信息",notes = "修改账号信息") void updateSysUser(SysUser sysUser) throws Exception; /** - * 修改用户密码 - * @param userId 需要修改的用户ID + * 修改账号密码 + * @param userId 需要修改的账号ID * @param password 旧密码 * @param newPwd 新密码 */ + @ApiOperation(value = "修改号密码",notes = "修改账号的密码信息") void updateSysUserPassword(Long userId,String password,String newPwd) throws Exception; /** - * 刷新用户登录信息 + * 刷新账号登录信息 * @param userId */ + @ApiOperation(value = "刷新账号",notes = "刷新账号登录信息") void refreshUserLoginInformation(Long userId); /** - * 新增用户信息 - * @param sysUser 新增用户 + * 新增账号信息 + * @param sysUser 新增账号 * @return */ + @ApiOperation(value = "新增账号",notes = "新增账号信息") SysUser insertSysUser(SysUser sysUser)throws Exception; /** - * 刷新用户角色关系 + * 刷新账号角色关系 * @param sysUser * @param roleIds * @param userName */ + @ApiOperation(value = "刷新账号",notes = "刷新账号角色关系") void refreshSysRefUserRole(SysUser sysUser, Long[] roleIds , String userName); /** @@ -81,19 +90,22 @@ public interface ISysUserService { * @param id * @return */ + @ApiOperation(value = "删除账号",notes = "根据ID 删除张哈信息") void deleteSysUserById(Long id); /** - * 批量删除用户 逻辑删除 - * @param ids 需要删除的用户ID - * @param user 当前会话用户 + * 批量删除账号 逻辑删除 + * @param ids 需要删除的账号ID + * @param user 当前会话账号 */ + @ApiOperation(value = "删除账号",notes = "根据ID 批量删除张哈信息") void deleteBatchSysUserById(Long[] ids, SessionUser user); /** * 查询所有数据 * @return */ + @ApiOperation(value = "查询所有",notes = "查询所有账号信息") List list(); /** @@ -102,6 +114,7 @@ public interface ISysUserService { * @param pager * @return */ + @ApiOperation(value = "账号查询",notes = "查询账号信息-复杂查询") ListPager querySysUserByPager(SysUser user, Pager pager); /** @@ -109,20 +122,23 @@ public interface ISysUserService { * @param id * @return */ + @ApiOperation(value = "账号查询",notes = "查询账号信息-根据ID查询") SysUser getSysUserById(Long id); /** - * 获取用户详细信息 + * 获取账号详细信息 * @param id * @return */ + @ApiOperation(value = "获取用户信息",notes = "查询用户信息-根据ID查询") SysUserInfo getSysUserInfoById(Long id); /** - * 根据登录名称 获取用户信息 + * 根据登录名称 获取账号信息 * @param loginName * @return */ + @ApiOperation(value = "获取账号信息",notes = "查询用户信息-根据登录名称查询") SysUser getSysUserByLoginName(String loginName); /** @@ -130,6 +146,7 @@ public interface ISysUserService { * @param email * @return */ + @ApiOperation(value = "获取账号信息",notes = "查询用户信息-根据邮箱查询") SysUser getSysUserByEmail(String email); /** @@ -137,21 +154,24 @@ public interface ISysUserService { * @param phone * @return */ + @ApiOperation(value = "获取账号信息",notes = "查询用户信息-根据手机查询") SysUser getSysUserByPhone(String phone); /** - * 查出用户角色关系 + * 查出账号角色关系 * @param userId * @return */ + @ApiOperation(value = "获取用户角色信息",notes = "获取指定账号的所有角色信息") List findSysRefUserRoleByUserId(Long userId); /** - * 判断用户名是否存在 + * 判断账号名是否存在 * @param userLoginName * @param id * @return */ + @ApiOperation(value = "账号检查",notes = "检查账号的登录名是否重复") boolean checkSysUserLoginName(String userLoginName, long id); /** @@ -160,6 +180,7 @@ public interface ISysUserService { * @param id * @return */ + @ApiOperation(value = "账号检查",notes = "检查账号的邮箱是否重复") boolean checkSysUserEmail(String email,long id); /** @@ -168,21 +189,24 @@ public interface ISysUserService { * @param id * @return */ + @ApiOperation(value = "账号检查",notes = "检查账号的手机号是否重复") boolean checkSysUserPhone(String phone,long id); /** - * 用户唯一教研 + * 账号唯一教研 * @param user */ + @ApiOperation(value = "账号检查",notes = "检查账号信息唯一(登录名、邮箱、手机号)") void checkSysUserOnly(SysUser user); /** - * 登录封装用户信息 + * 登录封装账号信息 * @param sessionUser * @param user * @param userType * @param languageCode * @return */ + @ApiOperation(value = "封装用户信息",notes = "封装登录完成后的用户信息(角色、权限、部门、组织、岗位)") SessionUser packSessionUser(SessionUser sessionUser, SysUser user, Integer userType, String languageCode); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java index 0b70c9c..bdb9ec6 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java @@ -79,7 +79,6 @@ public class SysLogOperateController extends CoreBaseController { } } - @GetMapping(value = "/get/{id}") @ApiOperation(value = "根据id查询操作日志",notes = "根据id查询操作日志") public ResultBean getSysLogOperateById(@PathParam("id") String id){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java index 4af9408..29885c5 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java @@ -36,7 +36,6 @@ public class SysLogSystemController extends CoreBaseController{ @Autowired private ISysLogSystemService logSystemService; - @PostMapping(value = "/insert") @ApiOperation(value="新增系统日志",notes = "新增系统日志") public ResultBean insertSysLogSystem(SysLogSystem logSystem) { diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrderNoRuleController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrderNoRuleController.java index 2f9ccf8..ef267e4 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrderNoRuleController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrderNoRuleController.java @@ -51,13 +51,17 @@ import java.util.List; public class SysOrderNoRuleController extends CoreBaseController { @Autowired - ISysOrderNoRuleService sysOrderNoRuleService; + private ISysOrderNoRuleService sysOrderNoRuleService; + @Autowired - ISysDictionaryService sysDictionaryService; + private ISysDictionaryService sysDictionaryService; + @Autowired - ISysConfigService sysConfigService; + private ISysConfigService sysConfigService; + @Autowired - ISysFileService sysFileService; + private ISysFileService sysFileService; + @Autowired private FastDFSClient dfsClient; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java index 7669312..804c892 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java @@ -115,7 +115,7 @@ public class SysOrganizeController extends CoreBaseController{ } @GetMapping(value = "/list") - @ApiOperation(value = "查询SysOrganize", notes = "查询所有组织") + @ApiOperation(value = "查询所有组织", notes = "查询所有组织") public ResultBean findSysOrganizeAll() { try { List list = organizeService.listSysOrganize(); 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 index 7a242f2..af3df02 100644 --- 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 @@ -107,7 +107,7 @@ public class SysRoleController extends CoreBaseController{ } @GetMapping(value = "/list") - @ApiOperation(value = "查询SysRole", notes = "查询所有系统角色") + @ApiOperation(value = "查询所有角色", notes = "查询所有系统角色") public ResultBean findAll() { try { List list = sysRoleService.findSysRoleAll(); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTreeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTreeController.java index eee7d02..0345188 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTreeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTreeController.java @@ -63,7 +63,6 @@ public class SysTreeController extends CoreBaseController { } } - @GetMapping(value="/position/list/{parentId}") @ApiOperation(value="查询岗位树",notes="通过部门主键获取岗位树，-1为根节点") public ResultBean listSysPositionListTree(@PathVariable("parentId") long parentId) { @@ -137,7 +136,7 @@ public class SysTreeController extends CoreBaseController { } @GetMapping(value="/department/list/{parentId}") - @ApiOperation(value="查询组织树",notes="通过部门主键获取组织树，-1为根节点") + @ApiOperation(value="查询部门树",notes="通过部门主键获取部门树集合，-1为根节点") public ResultBean listDepartmentListTree(@PathVariable("parentId") long parentId) { try { List resultList = coreTreeService.findSysDepartmentTreeByParentId(parentId); @@ -154,9 +153,8 @@ public class SysTreeController extends CoreBaseController { } } - @GetMapping(value="/sys-menu/get/{id}") - @ApiOperation(value="部门树",notes="通过部门主键获取部门树，-1为根节点") + @ApiOperation(value="菜单树",notes="通过部门主键获取菜单树，-1为根节点") public ResultBean listSysMenuTree(@PathVariable("id") long id) { try { SysMenu obj = coreTreeService.getSysMenuTreeById(id); @@ -174,7 +172,7 @@ public class SysTreeController extends CoreBaseController { } @GetMapping(value="/sys-menu/list/{parentId}") - @ApiOperation(value="查询组织树",notes="通过部门主键获取组织树，-1为根节点") + @ApiOperation(value="查询菜单树",notes="通过组织主键获取菜单树集合，-1为根节点") public ResultBean listSysMenuListTree(@PathVariable("parentId") long parentId) { try { List resultList = coreTreeService.findSysMenuTreeByParentId(parentId); @@ -192,7 +190,7 @@ public class SysTreeController extends CoreBaseController { } @GetMapping(value="/organize-department/list/{parentId}") - @ApiOperation(value="查询组织-部门树",notes="通过部门主键获取组组织-部门，-1为根节点") + @ApiOperation(value="查询组织-部门树",notes="通过组织主键获取组织-部门，-1为根节点") public ResultBean listOrganizeDepartmentListTree(@PathVariable("parentId") long parentId) { try { List resultList = coreTreeService.findOrganizeDepartment(parentId); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java index 4314738..f41118d 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java @@ -291,7 +291,6 @@ public class SysUserController extends CoreBaseController{ ValidatorBean.checkNotNull(id, "用户id 不能为空"); sysUserService.deleteSysUserById(Long.parseLong(id)); - sysUserInfoService.refreshUserInfoUserNum(Long.parseLong(id)); return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep); @@ -431,7 +430,6 @@ public class SysUserController extends CoreBaseController{ } } - @PostMapping("/password/update-verification") @ApiOperation(value = "修改密码",notes = "通过邮箱的验证码修改密码") public ResultBean getEmailVerification(String password,String email,String verification){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java index 1482bfa..a21cdb5 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java @@ -70,6 +70,7 @@ public class SysUserInfoController extends CoreBaseController{ ConvertBean.modelInitialize(userInfo,user); userInfo.setUserInfoStatus(CommonEnumUtil.USER_STATUS.ENABLE.getValue()); + userInfo.setUserLoginNum(0); SysUserInfo info = sysUserInfoService.insertSysUserInfo(userInfo); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java index cec1026..dbae5e9 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java @@ -12,6 +12,7 @@ import cn.estsh.i3plus.pojo.platform.bean.SysUser; import cn.estsh.i3plus.pojo.platform.repository.SysUserRepository; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.util.ImppRedis; +import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authc.CredentialsException; import org.apache.shiro.authc.IncorrectCredentialsException; @@ -44,6 +45,7 @@ public class SystemLoginService implements ISystemLoginService { protected ImppRedis redisCore; @Override + @ApiOperation(value = "用户登录",notes = "普通用户登录") public SessionUser queryUserLogin(String loginName, String loginPwd, String languageCode) { //生成令牌 UserToken ut = new UserToken(loginName,loginPwd,languageCode); @@ -52,6 +54,7 @@ public class SystemLoginService implements ISystemLoginService { } @Override + @ApiOperation(value = "用户登录",notes = "管理用户登录") public SessionUser queryAdminLogin(String loginName, String loginPwd, String languageCode) { //生成令牌 AdminToken adminToken = new AdminToken(loginName,loginPwd,languageCode); @@ -60,6 +63,7 @@ public class SystemLoginService implements ISystemLoginService { } @Override + @ApiOperation(value = "封装用户",notes = "封装普通用户信息") public SessionUser queryCheckUserLogin(UserToken userToken) { //验证用户 SysUser user = getUserLoginInfo(userToken.getLoginName(),userToken.getLoginPwd()); @@ -69,6 +73,7 @@ public class SystemLoginService implements ISystemLoginService { } @Override + @ApiOperation(value = "封装用户",notes = "封装管理员信息") public SessionUser queryCheckAdminLogin(AdminToken adminToken) { //验证用户 SysUser user = getUserLoginInfo(adminToken.getLoginName(),adminToken.getLoginPwd()); @@ -77,6 +82,7 @@ public class SystemLoginService implements ISystemLoginService { } @Override + @ApiOperation(value = "封装用户",notes = "封装超级管理员信息") public SessionUser queryCheckSaAdminLogin(SaAdminToken saAdminToken) { //SysUser user = getUserLoginInfo(saAdminToken.getLoginName(),saAdminToken.getLoginPwd()); SysUser user = null; @@ -90,6 +96,7 @@ public class SystemLoginService implements ISystemLoginService { } @Override + @ApiOperation(value = "登录密码错误",notes = "登录密码错误记录错误次数功能") public Integer doLoginPasswordError(String loginName) { SysUser user = sysUserRDao.getByProperty("userLoginName",loginName); if(user != null){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeService.java index 287f463..cd4c272 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeService.java @@ -17,6 +17,7 @@ import cn.estsh.i3plus.pojo.platform.repository.SysPositionRepository; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ValidatorBean; +import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -50,6 +51,7 @@ public class CoreTreeService implements ICoreTreeService { private SysMenuRepository menuRDao; @Override + @ApiOperation(value = "获取岗位树",notes = "根据父节点获取岗位树集合") public List findSysPositionTreeByParentId(long parentId) { List result = positionRDao.findByProperty("parentId", parentId); @@ -64,6 +66,7 @@ public class CoreTreeService implements ICoreTreeService { } @Override + @ApiOperation(value = "获取岗位树",notes = "根据父节点获取岗位树") public SysPosition getSysPositionTreeById(long id) { // 查找数据 SysPosition position = positionRDao.getById(id); @@ -76,6 +79,7 @@ public class CoreTreeService implements ICoreTreeService { } @Override + @ApiOperation(value = "封装岗位树",notes = "封装当前岗位树") public void findSysPositionChildrenTreePack(SysPosition parent, int step) { ++step; List childList = positionRDao.findByProperty("parentId", parent.getId()); @@ -92,12 +96,14 @@ public class CoreTreeService implements ICoreTreeService { } @Override + @ApiOperation(value = "父节点检查",notes = "检查岗位的父节点是否是当前节点的子节点") public void doValidatorSysPositionParentId(SysPosition position) { findSysPositionChildrenTreePack(position,0); validatorSysPositionParentId(position.getChildList(),position.getParentId()); } @Override + @ApiOperation(value = "获取部门树",notes = "根据父节点获取部门树集合") public List findSysDepartmentTreeByParentId(long parentId) { List result = departmentRDao.findByProperty("parentId", parentId); @@ -112,6 +118,7 @@ public class CoreTreeService implements ICoreTreeService { } @Override + @ApiOperation(value = "获取部门树",notes = "根据父节点获取部门树") public SysDepartment getSysDepartmentTreeById(long id) { // 查找数据 SysDepartment department = departmentRDao.getById(id); @@ -124,6 +131,7 @@ public class CoreTreeService implements ICoreTreeService { } @Override + @ApiOperation(value = "封装部门树",notes = "封装当前部门树") public void findSysDepartmentChildrenTreePack(SysDepartment parent, int step) { ++step; List childList = departmentRDao.findByProperty("parentId", parent.getId()); @@ -140,12 +148,14 @@ public class CoreTreeService implements ICoreTreeService { } @Override + @ApiOperation(value = "父节点检查",notes = "检查部门的父节点是否是当前节点的子节点") public void doValidatorSysDepartmentParentId(SysDepartment department) { findSysDepartmentChildrenTreePack(department,0); validatorSysDepartmentParentId(department.getChildList(),department.getParentId()); } @Override + @ApiOperation(value = "获取组织树",notes = "根据父节点获取组织树集合") public List findSysOrganizeTreeByParentId(long parentId) { StringBuffer orgHQL = new StringBuffer(); HqlPack.getNumEqualPack(parentId,"parentId",orgHQL); @@ -163,6 +173,7 @@ public class CoreTreeService implements ICoreTreeService { } @Override + @ApiOperation(value = "获取组织树",notes = "根据父节点获取组织树") public SysOrganize getSysOrganizeTreeById(long id) { // 查找数据 SysOrganize organize = organizeRDao.getById(id); @@ -175,6 +186,7 @@ public class CoreTreeService implements ICoreTreeService { } @Override + @ApiOperation(value = "封装组织树",notes = "封装当前组织树") public void findSysOrganizeChildrenTreePack(SysOrganize parent, int step) { ++step; @@ -194,12 +206,14 @@ public class CoreTreeService implements ICoreTreeService { } @Override + @ApiOperation(value = "父节点检查",notes = "检查组织的父节点是否是当前节点的子节点") public void doValidatorSysOrganizeParentId(SysOrganize organize) { findSysOrganizeChildrenTreePack(organize,0); validatorSysOrganizeParentId(organize.getChildList(),organize.getParentId()); } @Override + @ApiOperation(value = "获取菜单树",notes = "根据父节点获取菜单树集合") public List findSysMenuTreeByParentId(long parentId) { List result = menuRDao.findByProperty("parentId", parentId); @@ -214,6 +228,7 @@ public class CoreTreeService implements ICoreTreeService { } @Override + @ApiOperation(value = "获取菜单树",notes = "根据父节点获取菜单树") public SysMenu getSysMenuTreeById(long id) { // 查找数据 SysMenu menu = menuRDao.getById(id); @@ -226,6 +241,7 @@ public class CoreTreeService implements ICoreTreeService { } @Override + @ApiOperation(value = "封装菜单树",notes = "封装当前菜单树") public void findSysMenuChildrenTreePack(SysMenu parent, int step) { ++step; List childList = menuRDao.findByProperty("parentId", parent.getId()); @@ -241,6 +257,7 @@ public class CoreTreeService implements ICoreTreeService { } @Override + @ApiOperation(value = "父节点检查",notes = "检查菜单的父节点是否是当前节点的子节点") public void doValidatorSysMenuParentId(SysMenu menu) { findSysMenuChildrenTreePack(menu,0); validatorSysMenuParentId(menu.getChildList(),menu.getParentId()); @@ -319,6 +336,7 @@ public class CoreTreeService implements ICoreTreeService { } @Override + @ApiOperation(value = "获取组织部门树",notes = "根据父节点获取组织部门树集合") public List findOrganizeDepartment(long parentId) { List result = new ArrayList<>(); @@ -345,6 +363,7 @@ public class CoreTreeService implements ICoreTreeService { } @Override + @ApiOperation(value = "获取组织部门树",notes = "根据父节点获取组织部门树") public CommonTreeModel getOrganizeById(long id) { // 查找数据 SysOrganize organize = organizeRDao.getById(id); @@ -361,6 +380,7 @@ public class CoreTreeService implements ICoreTreeService { } @Override + @ApiOperation(value = "封装菜单树",notes = "封装当前组织部门树") public void findOrganizeTreePack(CommonTreeModel parent, int step) { if(null != parent){ BaseBean bean = parent.getBean(); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java index c925343..cff5499 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java @@ -13,6 +13,7 @@ import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ValidatorBean; +import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -42,6 +43,7 @@ public class SysDepartmentService implements ISysDepartmentService { private CoreTreeService coreTreeService; @Override + @ApiOperation(value = "新增部门信息") public SysDepartment insertSysDepartment(SysDepartment department) { LOGGER.info("部门信息 SysDepartment department:{}", department); // 代码唯一校验 @@ -76,6 +78,7 @@ public class SysDepartmentService implements ISysDepartmentService { } @Override + @ApiOperation(value = "删除部门信息",notes = "根据ID 删除部门信息") public void deleteSysDepartmentById(Long id) { LOGGER.info("部门信息 SysDepartment id :{}", id); // 查询是否存在子级 @@ -95,6 +98,7 @@ public class SysDepartmentService implements ISysDepartmentService { } @Override + @ApiOperation(value = "删除部门信息",notes = "根据ID 批量删除部门信息") public void deleteSysDepartmentByIds(Long[] ids) { LOGGER.info("部门信息 DEPARTMENT ids :{}", ids); long positionCount = departmentRDao.findByHqlWhereCount(CoreHqlPack.packHqlIds("parentId",ids)); @@ -111,6 +115,7 @@ public class SysDepartmentService implements ISysDepartmentService { } @Override + @ApiOperation(value = "更新部门信息") public void updateSysDepartment(SysDepartment department) { LOGGER.info("部门信息 DEPARTMENT department :{}", department); // 唯一校验 CODE 相同 ID 不同 则视为相同 @@ -158,12 +163,14 @@ public class SysDepartmentService implements ISysDepartmentService { } @Override + @ApiOperation(value = "查询部门信息",notes = "查询所有部门信息") public List listSysDepartment() { LOGGER.info("部门信息 DEPARTMENT list"); return departmentRDao.list(); } @Override + @ApiOperation(value = "查询部门信息",notes = "查询部门信息(分页、组合)") public ListPager querySysDepartment(SysDepartment department, Pager pager) { LOGGER.info("部门 SysDepartment find department :{} page:{}", department, pager); @@ -181,12 +188,14 @@ public class SysDepartmentService implements ISysDepartmentService { } @Override + @ApiOperation(value = "查询部门信息",notes = "根据ID查询部门信息") public SysDepartment getSysDepartmentById(Long id) { LOGGER.info("部门信息 DEPARTMENT id:{}",id); return departmentRDao.getById(id); } @Override + @ApiOperation(value = "查询部门信息",notes = "查询部门信息(分页、组合)") public ListPager findSysDepartmentByPager(SysDepartment department, Pager pager) { LOGGER.info("部门信息 DEPARTMENT department :{}", department); LOGGER.info("部门信息 DEPARTMENT pager :{}", pager); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysFileServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysFileServiceImpl.java index fa9c668..dc8a70d 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysFileServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysFileServiceImpl.java @@ -7,6 +7,7 @@ import cn.estsh.i3plus.pojo.base.common.PagerHelper; import cn.estsh.i3plus.pojo.platform.bean.SysFile; import cn.estsh.i3plus.pojo.platform.repository.SysFileRepository; import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; +import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -29,36 +30,35 @@ public class SysFileServiceImpl implements ISysFileService { public SysFileRepository sysFileRDao; @Override + @ApiOperation(value = "新增资源信息") public SysFile insertSysFile(SysFile sysFile) { LOGGER.info("文件资源 SYS_FILE :{}",sysFile); return sysFileRDao.insert(sysFile); } @Override - public void deleteSysFileById(Long id) { - LOGGER.info("文件资源 SYS_FILE id:{}",id); - sysFileRDao.deleteById(id); - } - - @Override + @ApiOperation(value = "更新资源信息") public void updateSysFile(SysFile sysFile) { LOGGER.info("文件资源 SYS_FILE :{}",sysFile); sysFileRDao.update(sysFile); } @Override + @ApiOperation(value = "查询资源信息",notes = "查询所有资源信息") public List listSysFile() { LOGGER.info("文件资源 SYS_FILE list"); return sysFileRDao.list(); } @Override + @ApiOperation(value = "查询资源信息",notes = "根据 ID查询资源信息") public SysFile getSysFileById(Long id) { LOGGER.info("文件资源 SYS_FILE id:{}",id); return sysFileRDao.getById(id); } @Override + @ApiOperation(value = "查询资源信息",notes = "查询资源信息(分页、组合)") public ListPager querySysFileByPager(SysFile sysFile, Pager pager) { LOGGER.info("文件资源 SYS_FILE sysFile:{}，Pager:{}",sysFile,pager); if(sysFile == null) { @@ -72,6 +72,13 @@ public class SysFileServiceImpl implements ISysFileService { } @Override + @ApiOperation(value = "删除资源信息",notes = "根据ID删除资源信息") + public void deleteSysFileById(Long id) { + LOGGER.info("文件资源 SYS_FILE id:{}",id); + sysFileRDao.deleteById(id); + } + + @Override public void deleteSysFileByIds(Long[] ids) { LOGGER.info("文件资源 SYS_FILE ids:{}", ids.toString()); sysFileRDao.deleteByIds(ids); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleLanguageService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleLanguageService.java index 6b85de1..08feda6 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleLanguageService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleLanguageService.java @@ -12,6 +12,7 @@ import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ValidatorBean; +import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -38,6 +39,7 @@ public class SysLocaleLanguageService implements ISysLocaleLanguageService { private SysLocaleResourceRepository sysLocaleResourceRDao; @Override + @ApiOperation(value = "添加系统语言",notes = "添加系统语言") public SysLocaleLanguage insertSysLocaleLanguage(SysLocaleLanguage sysLocaleLanguage) { LOGGER.info("系统语言 SYS_LOCALE_LANGUAGE SysLocaleLanguage:{}",sysLocaleLanguage); int count = sysLocaleLanguageRDao.findByPropertyCount("languageCode",sysLocaleLanguage.getLanguageCode()); @@ -54,6 +56,7 @@ public class SysLocaleLanguageService implements ISysLocaleLanguageService { } @Override + @ApiOperation(value = "修改系统语言",notes = "修改系统语言") public void updateSysLocaleLanguage(SysLocaleLanguage sysLocaleLanguage) { SysLocaleLanguage data = sysLocaleLanguageRDao.getById(sysLocaleLanguage.getId()); @@ -79,6 +82,7 @@ public class SysLocaleLanguageService implements ISysLocaleLanguageService { } @Override + @ApiOperation(value = "根据id删除系统语言",notes = "根据id删除系统语言") public void deleteSysLocaleLanguageById(Long id) { SysLocaleLanguage sysLocaleLanguage = sysLocaleLanguageRDao.getById(id); ValidatorBean.checkNotNull(sysLocaleLanguage,"需要删除的资源不存在"); @@ -95,12 +99,14 @@ public class SysLocaleLanguageService implements ISysLocaleLanguageService { } @Override + @ApiOperation(value = "查询全部系统语言",notes = "查询全部系统语言") public List listSysLocaleLanguage() { LOGGER.info("系统语言 SYS_LOCALE_LANGUAGE list"); return sysLocaleLanguageRDao.list(); } @Override + @ApiOperation(value = "系统语言复杂查询，分页，排序",notes = "系统语言复杂查询，分页，排序") public ListPager querySysLocaleLanguageByPager(SysLocaleLanguage sysLocaleLanguage, Pager pager) { if(sysLocaleLanguage == null) { pager = PagerHelper.getPager(pager, sysLocaleLanguageRDao.listCount()); @@ -113,6 +119,7 @@ public class SysLocaleLanguageService implements ISysLocaleLanguageService { } @Override + @ApiOperation(value = "根据id批量删除系统语言",notes = "根据id批量删除系统语言") public void deleteSysLocaleLanguageByIds(Long[] ids) { if(sysLocaleResourceRDao.findByHqlWhereCount(CoreHqlPack.packHqlIds("id",ids)) > 0){ throw ImppExceptionBuilder.newInstance() @@ -126,6 +133,7 @@ public class SysLocaleLanguageService implements ISysLocaleLanguageService { } @Override + @ApiOperation(value = "设置默认语言",notes = "设置默认语言") public void updateSysLocaleLanguageDefaultById(Long ids) { sysLocaleLanguageRDao.updateByHqlWhere("and 1=1","isDefault",CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); @@ -134,16 +142,19 @@ public class SysLocaleLanguageService implements ISysLocaleLanguageService { } @Override + @ApiOperation(value = "根据code查询语言") public SysLocaleLanguage getSysLocaleLanguageByCode(String code) { return sysLocaleLanguageRDao.getByProperty("languageCode",code); } @Override + @ApiOperation(value = "根据语言id修改语言状态") public void updateSysLocaleLanguageStatusById(Long id, Integer status) { sysLocaleLanguageRDao.updateByProperties("id",id,"languageStatus",status); } @Override + @ApiOperation(value = "根据语言id批量修改语言状态") public void updateSysLocaleLanguageStatusByIds(Long[] ids, Integer status) { sysLocaleLanguageRDao.updateByHqlWhere(CoreHqlPack.packHqlIds("id",ids),"languageStatus",status); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java index f6e4d09..5f28624 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java @@ -14,6 +14,7 @@ import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ValidatorBean; +import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -44,6 +45,7 @@ public class SysMenuService implements ISysMenuService { private SysRefRoleMenuRepository refRoleMenuRDao; @Override + @ApiOperation(value = "更新菜单信息") public void updateSysMenu(SysMenu sysMenu) { LOGGER.info("系统功能 SYS_MENU :{}", sysMenu); @@ -77,6 +79,7 @@ public class SysMenuService implements ISysMenuService { } @Override + @ApiOperation(value = "更新菜单信息",notes = "根据ID 更新菜单状态信息") public void updateSysMenuStatus(Long id, int status, SessionUser user) { LOGGER.info("系统功能 SYS_MENU id:{} status:{} user:{}", id,status,user); SysMenu menu = sysMenuRDao.getById(id); @@ -95,6 +98,7 @@ public class SysMenuService implements ISysMenuService { } @Override + @ApiOperation(value = "更新菜单信息",notes = "根据ID 批量更新菜单状态信息") public void updateSysMenuStatusByIds(Long[] ids, int status, SessionUser user) { LOGGER.info("系统功能 SYS_MENU ids:{} status:{} user:{}", ids, status, user); StringBuffer where = new StringBuffer(); @@ -104,6 +108,7 @@ public class SysMenuService implements ISysMenuService { } @Override + @ApiOperation(value = "删除菜单信息",notes = "根据ID 删除菜单信息") public void deleteSysMenuById(Long id) { LOGGER.info("系统功能 SYS_MENU Key:{}", id); long count = sysMenuRDao.findByPropertyCount("parentId",id); @@ -122,6 +127,7 @@ public class SysMenuService implements ISysMenuService { } @Override + @ApiOperation(value = "删除菜单信息",notes = "根据ID 批量删除菜单信息") public void deleteSysMenuByIds(Long[] ids) { LOGGER.info("系统功能 SYS_MENU ids :{}", ids); long positionCount = sysMenuRDao.findByHqlWhereCount(CoreHqlPack.packHqlIds("parentId",ids)); @@ -139,6 +145,7 @@ public class SysMenuService implements ISysMenuService { } @Override + @ApiOperation(value = "新增菜单信息") public SysMenu insertSysMenu(SysMenu sysMenu) { LOGGER.info("系统功能 SYS_MENU :{}", sysMenu); @@ -162,18 +169,21 @@ public class SysMenuService implements ISysMenuService { } @Override + @ApiOperation(value = "查询菜单信息",notes = "查询所有菜单信息") public List findSysMenuAll() { LOGGER.info("系统功能 SYS_MENU find All"); return sysMenuRDao.findAll(); } @Override + @ApiOperation(value = "查询菜单信息",notes = "根据ID查询菜单信息") public SysMenu getSysMenuById(Long id) { LOGGER.info("系统功能 SYS_MENU find id:{}", id); return sysMenuRDao.getOne(id); } @Override + @ApiOperation(value = "查询菜单信息",notes = "查询菜单信息(分页、组合)") public ListPager querySysMenu(SysMenu menu, Pager pager) { LOGGER.info("系统权限 SysMenu find menu :{} page :{}", menu, pager); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysOrganizeService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysOrganizeService.java index 2a0f762..3003211 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysOrganizeService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysOrganizeService.java @@ -12,6 +12,7 @@ import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ValidatorBean; +import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -38,6 +39,7 @@ public class SysOrganizeService implements ISysOrganizeService { private CoreTreeService coreTreeService; @Override + @ApiOperation(value = "更新组织",notes = "传入持久化组织对象，进行更新") public void updateSysOrganize(SysOrganize organize) { LOGGER.info("组织 ORGANIZE :{}", organize); // 唯一校验 CODE 相同 ID 不同 则视为相同 @@ -74,6 +76,7 @@ public class SysOrganizeService implements ISysOrganizeService { } @Override + @ApiOperation(value = "修改组织状态",notes = "") public void updateSysOrganizeStatus(Long id, int status, SessionUser user) { LOGGER.info("组织 ORGANIZE id:{} status:{} user:{}", id,status,user); SysOrganize organize = organizeRDao.getById(id); @@ -83,6 +86,7 @@ public class SysOrganizeService implements ISysOrganizeService { } @Override + @ApiOperation(value = "删除组织信息",notes = "根据 ID 删除组织信息") public void deleteSysOrganizeById(Long id) { LOGGER.info("组织 ORGANIZE Key:{}", id); long count = organizeRDao.findByPropertyCount("parentId", id); @@ -98,6 +102,7 @@ public class SysOrganizeService implements ISysOrganizeService { } @Override + @ApiOperation(value = "删除组织信息",notes = "根据 ID 批量删除组织信息") public void deleteSysOrganizeByIds(Long[] ids) { long positionCount = organizeRDao.findByHqlWhereCount(CoreHqlPack.packHqlIds("parentId",ids)); if (positionCount >= 1) { @@ -113,6 +118,7 @@ public class SysOrganizeService implements ISysOrganizeService { } @Override + @ApiOperation(value = "新增组织信息") public SysOrganize insertSysOrganize(SysOrganize organize) { LOGGER.info("组织 ORGANIZE :{}", organize); @@ -140,12 +146,14 @@ public class SysOrganizeService implements ISysOrganizeService { } @Override + @ApiOperation(value = "查询组织信息",notes = "查询所有组织信息") public List listSysOrganize() { LOGGER.info("组织 ORGANIZE find All"); return organizeRDao.findAll(); } @Override + @ApiOperation(value = "查询组织信息",notes = "查询 组织信息(分页、组合)") public ListPager querySysOrganize(SysOrganize organize, Pager pager) { LOGGER.info("组织信息 SysOrganize find SysOrganize page"); @@ -163,6 +171,7 @@ public class SysOrganizeService implements ISysOrganizeService { } @Override + @ApiOperation(value = "查询组织信息",notes = "根据ID查询组织信息") public SysOrganize getSysOrganizeById(Long id) { LOGGER.info("组织 ORGANIZE find id:{}", id); return organizeRDao.getById(id); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPositionService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPositionService.java index 4cd9f4b..d90808a 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPositionService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPositionService.java @@ -12,6 +12,7 @@ import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ValidatorBean; +import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -40,6 +41,7 @@ public class SysPositionService implements ISysPositionService { private SysUserRepository sysUserRDao; @Override + @ApiOperation(value = "新增岗位信息") public SysPosition insertSysPosition(SysPosition position) { LOGGER.info("岗位信息 POSITION position:{}", position); // CODE 唯一校验 @@ -68,6 +70,7 @@ public class SysPositionService implements ISysPositionService { } @Override + @ApiOperation(value = "更新岗位信息") public void updateSysPosition(SysPosition position) { LOGGER.info("岗位信息 POSITION position:{}", position); @@ -107,6 +110,7 @@ public class SysPositionService implements ISysPositionService { } @Override + @ApiOperation(value = "删除岗位信息",notes = "根据ID 删除岗位信息") public void deleteSysPositionById(Long id) { // 查询是否存在子级 LOGGER.info("岗位信息 POSITION id:{}", id); @@ -126,6 +130,7 @@ public class SysPositionService implements ISysPositionService { } @Override + @ApiOperation(value = "删除岗位信息",notes = "根据ID 批量删除岗位信息") public void deleteSysPositionByIds(Long[] ids) { LOGGER.info("岗位信息 POSITION ids:{}", ids); long positionCount = positionRDao.findByHqlWhereCount(CoreHqlPack.packHqlIds("parentId",ids)); @@ -143,12 +148,14 @@ public class SysPositionService implements ISysPositionService { } @Override + @ApiOperation(value = "新增岗位信息") public List listSysPosition() { LOGGER.info("岗位信息 SysPosition list"); return positionRDao.list(); } @Override + @ApiOperation(value = "查询岗位信息",notes = "查询岗位信息 (分页，组合)") public ListPager querySysPosition(SysPosition position, Pager pager) { LOGGER.info("岗位信息 SysPosition find SysPosition page"); @@ -166,12 +173,14 @@ public class SysPositionService implements ISysPositionService { } @Override + @ApiOperation(value = "查询岗位信息",notes = "根据 ID 查询岗位信息") public SysPosition getSysPositionById(Long id) { LOGGER.info("岗位信息 SysPosition id:{}", id); return positionRDao.getById(id); } @Override + @ApiOperation(value = "查询岗位信息",notes = "查询岗位信息 (分页，组合)") public ListPager findSysPositionByPager(SysPosition position, Pager pager) { LOGGER.info("岗位信息 SysPosition position", position); LOGGER.info("岗位信息 SysPosition pager:{}", pager); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleService.java index be17ad7..387744d 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleService.java @@ -17,6 +17,7 @@ import cn.estsh.i3plus.pojo.platform.repository.SysRoleRepository; import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; +import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -48,12 +49,14 @@ public class SysRoleService implements ISysRoleService { private SysRefRoleMenuRepository refRoleMenuRDao; @Override + @ApiOperation(value = "更新角色信息",notes = "更新角色信息") public void updateSysRole(SysRole sysRole) { LOGGER.info("系统角色 SYS_ROLE :{}", sysRole); sysRoleRDao.update(sysRole); } @Override + @ApiOperation(value = "更新角色信息",notes = "更新角色状态信息") public void updateSysRoleStatus(Long id, int status, SessionUser user) { LOGGER.info("系统角色 SYS_MENU id:{} status:{} user:{}", id,status,user); SysRole role = sysRoleRDao.getById(id); @@ -63,6 +66,7 @@ public class SysRoleService implements ISysRoleService { } @Override + @ApiOperation(value = "更新角色信息",notes = "根据ID 批量更新角色状态信息") public void updateSysRoleStatusByIds(Long[] ids, int status, SessionUser user) { LOGGER.info("系统功能 SYS_MENU ids:{} status:{} user:{}", ids, status, user); StringBuffer where = new StringBuffer(); @@ -72,6 +76,7 @@ public class SysRoleService implements ISysRoleService { } @Override + @ApiOperation(value = "删除角色信息",notes = "根据ID 删除角色信息") public void deleteSysRoleById(Long id) { LOGGER.info("系统角色 SYS_ROLE Key:{}", id); refRoleMenuRDao.deleteByProperty("roleId",id); @@ -79,6 +84,7 @@ public class SysRoleService implements ISysRoleService { } @Override + @ApiOperation(value = "删除角色信息",notes = "根据ID 批量删除角色信息") public void deleteSysRoleByIds(Long[] ids) { LOGGER.info("系统角色 SYS_ROLE ids :{}", ids); long positionCount = sysRoleRDao.findByHqlWhereCount(CoreHqlPack.packHqlIds("parentId",ids)); @@ -96,12 +102,14 @@ public class SysRoleService implements ISysRoleService { } @Override + @ApiOperation(value = "新增角色信息") public SysRole insertSysRole(SysRole sysRole) { LOGGER.info("系统角色 SYS_ROLE :{}", sysRole); return sysRoleRDao.insert(sysRole); } @Override + @ApiOperation(value = "刷新角色菜单关系",notes = "刷新 角色 菜单关系信息") public void refreshSysRoleRef(Long roleId,Long[] ids,String userName) { LOGGER.info("系统角色 SYS_ROLE :{}", roleId); LOGGER.info("系统角色 List :{}", ids); @@ -110,6 +118,7 @@ public class SysRoleService implements ISysRoleService { } @Override + @ApiOperation(value = "刷新角色菜单关系",notes = "批量刷新 角色 菜单关系信息") public void refreshBatchSysRoleRef(Long[] roleIds, Long[] ids,String userName) { LOGGER.info("系统角色 String[] :{}", roleIds); LOGGER.info("系统角色 List :{}", ids); @@ -188,6 +197,7 @@ public class SysRoleService implements ISysRoleService { } @Override + @ApiOperation(value = "查信角色菜单关系",notes = "查询 ID 查询角色菜单关系") public List findSysRefRoleMenuByRoleId(Long roleId) { LOGGER.info("系统角色权限关系 RefRoleMenu find By RoleId"); return refRoleMenuRDao.findByProperty( @@ -197,18 +207,21 @@ public class SysRoleService implements ISysRoleService { } @Override + @ApiOperation(value = "查信角色信息",notes = "查询所有角色信息") public List findSysRoleAll() { LOGGER.info("系统角色 SYS_ROLE find All"); return sysRoleRDao.findAll(); } @Override + @ApiOperation(value = "查信角色信息",notes = "根据 ID 查询角色信息") public SysRole getSysRoleById(Long id) { LOGGER.info("系统角色 SYS_ROLE find id:{}", id); return sysRoleRDao.getOne(id); } @Override + @ApiOperation(value = "查信角色信息",notes = "查询角色信息(分页/组合)") public ListPager querySysRole(SysRole role, Pager pager) { LOGGER.info("系统角色 SysRole find role :{} page :{}", role, pager); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskTimeRecordingService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskTimeRecordingService.java index 22cb3af..dd343e8 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskTimeRecordingService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskTimeRecordingService.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskTimeRecordingService; import cn.estsh.i3plus.pojo.platform.bean.SysTaskTimeRecording; import cn.estsh.i3plus.pojo.platform.repository.SysTaskTimeRecordingRepository; +import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -26,30 +27,35 @@ public class SysTaskTimeRecordingService implements ISysTaskTimeRecordingService private SysTaskTimeRecordingRepository taskTimeRecordingRDao; @Override + @ApiOperation(value = "更新任务表达式信息") public void updateSysTaskTimeRecording(SysTaskTimeRecording taskTimeRecording) { LOGGER.info("定时任务执行记录 TASK_TIMED_RECORDING :{}", taskTimeRecording); taskTimeRecordingRDao.update(taskTimeRecording); } @Override + @ApiOperation(value = "删除任务表达式信息",notes = "根据 ID 删除任务表达式信息") public void deleteSysTaskTimeRecordingById(Long id) { LOGGER.info("定时任务执行记录 TASK_TIMED_RECORDING Key:{}", id); taskTimeRecordingRDao.deleteById(id); } @Override + @ApiOperation(value = "新增任务表达式信息") public SysTaskTimeRecording insertSysTaskTimeRecording(SysTaskTimeRecording taskTimeRecording) { LOGGER.info("定时任务执行记录 TASK_TIMED_RECORDING :{}", taskTimeRecording); return taskTimeRecordingRDao.insert(taskTimeRecording); } @Override + @ApiOperation(value = "查询任务表达式信息",notes = "查询所有任务表达式信息") public List findSysTaskTimeRecordingAll() { LOGGER.info("定时任务执行记录 TASK_TIMED_RECORDING find All"); return taskTimeRecordingRDao.findAll(); } @Override + @ApiOperation(value = "查询任务表达式信息",notes = "查询 ID 任务表达式信息") public SysTaskTimeRecording getSysTaskTimeRecordingById(Long id) { LOGGER.info("定时任务执行记录 TASK_TIMED_RECORDING find id:{}", id); return taskTimeRecordingRDao.getOne(id); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysToolService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysToolService.java index b2c87f2..6d67bfc 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysToolService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysToolService.java @@ -11,6 +11,7 @@ import cn.estsh.i3plus.pojo.platform.repository.SysToolRepository; import cn.estsh.i3plus.pojo.platform.repository.SysToolTypeRepository; import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import cn.estsh.impp.framework.boot.util.ValidatorBean; +import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,6 +38,7 @@ public class SysToolService implements ISysToolService { private SysToolTypeRepository toolTypeRDao; @Override + @ApiOperation(value = "新增硬件信息") public SysTool insertSysTool(SysTool tool) { // 查询硬件类型名称 LOGGER.info("硬件类型 TOOL_TYPE :{}", tool); @@ -50,12 +52,14 @@ public class SysToolService implements ISysToolService { } @Override + @ApiOperation(value = "删除硬件信息",notes = "根据 ID 删除硬件信息") public void deleteSysToolById(Long id) { LOGGER.info("硬件 TOOL id:{}",id); toolRDao.deleteById(id); } @Override + @ApiOperation(value = "更新硬件信息") public void updateSysTool(SysTool tool) { // 查询硬件类型名称 LOGGER.info("硬件类型 TOOL_TYPE :{}", tool); @@ -69,18 +73,21 @@ public class SysToolService implements ISysToolService { } @Override + @ApiOperation(value = "查询设备信息",notes = "查询所有设备信息") public List listSysTool() { LOGGER.info("硬件 TOOL list"); return toolRDao.list(); } @Override + @ApiOperation(value = "查询设备信息",notes = "根据ID 查询设备信息") public SysTool getSysToolById(Long id) { LOGGER.info("硬件 TOOL id:{}",id); return toolRDao.getById(id); } @Override + @ApiOperation(value = "查询设备信息",notes = "根据条件 查询设备信息(分页)") public ListPager querySysToolByPager(SysTool tool, Pager pager) { LOGGER.info("硬件 TOOL SysTool:{}，Pager:{}",tool,pager); if(tool == null) { @@ -94,18 +101,21 @@ public class SysToolService implements ISysToolService { } @Override + @ApiOperation(value = "更新设备信息",notes = "更新设备状态信息") public void updateSysToolStatusById(Long id, Integer status) { LOGGER.info("硬件 TOOL id:{}，status：{}",id,status); toolRDao.updateByProperties("id",id,"toolStatus", status); } @Override + @ApiOperation(value = "删除硬件信息",notes = "根据 ID 批量删除硬件信息") public void deleteSysToolByIds(Long[] ids) { LOGGER.info("消息 SYS_MESSAGE ids:{}", ids.toString()); toolRDao.deleteByIds(ids); } @Override + @ApiOperation(value = "更新设备信息",notes = "根据 ID 批量修改硬件状态信息") public void updateSysToolStatusByIds(Long[] ids, Integer status) { LOGGER.info("硬件 TOOL ids：{}，status：{}",ids,status); StringBuffer where = new StringBuffer(); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysToolTypeService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysToolTypeService.java index 0bb6347..2be50ef 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysToolTypeService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysToolTypeService.java @@ -11,6 +11,7 @@ import cn.estsh.i3plus.pojo.platform.repository.SysToolTypeRepository; import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; +import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -36,12 +37,14 @@ public class SysToolTypeService implements ISysToolTypeService { private SysToolRepository toolRDao; @Override + @ApiOperation(value = "新增硬件类型") public void insertSysToolType(SysToolType toolType) { LOGGER.info("硬件类型 TOOL_TYPE toolType:{}",toolType); toolTypeRDao.insert(toolType); } @Override + @ApiOperation(value = "删除硬件类型",notes = "根据 ID 删除硬件类型信息") public void deleteSysToolTypeById(Long id) { LOGGER.info("硬件类型 TOOL_TYPE id:{}",id); long count = toolRDao.findByPropertyCount("toolTypeId",id); @@ -58,6 +61,7 @@ public class SysToolTypeService implements ISysToolTypeService { } @Override + @ApiOperation(value = "更新硬件类型") public void updateSysToolType(SysToolType toolType) { LOGGER.info("硬件类型 TOOL_TYPE toolType:{}",toolType); toolTypeRDao.update(toolType); @@ -65,18 +69,21 @@ public class SysToolTypeService implements ISysToolTypeService { } @Override + @ApiOperation(value = "查询硬件类型") public List listSysToolType() { LOGGER.info("硬件类型 TOOL_TYPE list"); return toolTypeRDao.list(); } @Override + @ApiOperation(value = "查询硬件类型",notes = "根据 ID 查询硬件类型信息") public SysToolType getSysToolTypeById(Long id) { LOGGER.info("硬件类型 TOOL_TYPE id:{}",id); return toolTypeRDao.getById(id); } @Override + @ApiOperation(value = "查询硬件类型",notes = "查询类型信息 复杂化查询") public ListPager querySysToolTypeByPager(SysToolType toolType, Pager pager) { LOGGER.info("硬件类型 TOOL_TYPE SysToolType:{}，Pager:{}",toolType,pager); if(toolType == null) { @@ -90,6 +97,7 @@ public class SysToolTypeService implements ISysToolTypeService { } @Override + @ApiOperation(value = "删除硬件类型",notes = "根据 ID 批量删除硬件类型信息") public void deleteSysToolTypeByIds(Long[] ids) { LOGGER.info("硬件类型 TOOL_TYPE ids:{}", ids.toString()); long count = toolRDao.findByHqlWhereCount(CoreHqlPack.packHqlIds("toolTypeId",ids)); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java index 2c7e08c..07b5970 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java @@ -61,6 +61,7 @@ public class SysUserInfoService implements ISysUserInfoService { * @return */ @Override + @ApiOperation(value = "新增用户",notes = "新增一个用户信息") public SysUserInfo insertSysUserInfo(SysUserInfo userInfo) { LOGGER.info("用户信息 SysUserInfo userInfo:{}",userInfo); @@ -68,48 +69,53 @@ public class SysUserInfoService implements ISysUserInfoService { } @Override + @ApiOperation(value = "修改用户",notes = "修改一个用户信息") public void updateSysUserInfo(SysUserInfo userInfo) { LOGGER.info("用户信息 SysUserInfo userInfo:{}",userInfo); sysUserInfoRDao.update(userInfo); } @Override + @ApiOperation(value = "刷新用户关系",notes = "刷新用户部门关系") public void refreshRefUserDepartment(Long userInfoId, Long[] departmentIds, String userName) { LOGGER.info("用户信息 SysUserInfo userInfoId:{} departmentIds:{} userName:{}",userInfoId,departmentIds,userName); SysUserInfo userInfo = sysUserInfoRDao.getById(userInfoId); if(userInfo != null ){ - // 查询部门信息 - StringBuffer where = new StringBuffer(); - HqlPack.getInPack(StringUtils.join(departmentIds,","),"id",where); - List departmentList = departmentRDao.findByHqlWhere(where.toString()); // 删除用户部门关系 refUserDepartmentRDao.deleteByProperty("userId",userInfo.getId()); - if(departmentList != null && departmentList.size() >0){ - List list = new ArrayList<>(); - List nameList = new ArrayList<>(); - SysRefUserDepartment ref = null; - for (SysDepartment department : departmentList) { - ref = new SysRefUserDepartment(); - ref.setDepartmentId(department.getId()); - ref.setDepartmentNameRdd(department.getName()); - ref.setUserId(userInfo.getId()); - ref.setUserNameRdd(userInfo.getName()); - ref.setCreateUser(userName); - ref.setCreateDatetime(TimeTool.getNowTime(true)); - list.add(ref); - - nameList.add(department.getName()); + if(departmentIds.length > 0){ + // 查询部门信息 + StringBuffer where = new StringBuffer(); + HqlPack.getInPack(StringUtils.join(departmentIds,","),"id",where); + List departmentList = departmentRDao.findByHqlWhere(where.toString()); + + if(departmentList != null && departmentList.size() >0){ + List list = new ArrayList<>(); + List nameList = new ArrayList<>(); + SysRefUserDepartment ref = null; + for (SysDepartment department : departmentList) { + ref = new SysRefUserDepartment(); + ref.setDepartmentId(department.getId()); + ref.setDepartmentNameRdd(department.getName()); + ref.setUserId(userInfo.getId()); + ref.setUserNameRdd(userInfo.getName()); + ref.setCreateUser(userName); + ref.setCreateDatetime(TimeTool.getNowTime(true)); + list.add(ref); + + nameList.add(department.getName()); + } + + userInfo.setDepartmentNamesRdd(String.join(",",nameList)); + + refUserDepartmentRDao.saveAll(list); + sysUserInfoRDao.save(userInfo); + + LOGGER.info("用户信息 SysUserInfo RefUserDepartmentRDao Insert Size :{}",list.size()); } - - userInfo.setDepartmentNamesRdd(String.join(",",nameList)); - - refUserDepartmentRDao.saveAll(list); - sysUserInfoRDao.save(userInfo); - - LOGGER.info("用户信息 SysUserInfo RefUserDepartmentRDao Insert Size :{}",list.size()); } }else { throw ImppExceptionBuilder.newInstance() @@ -122,42 +128,44 @@ public class SysUserInfoService implements ISysUserInfoService { } @Override + @ApiOperation(value = "刷新用户关系",notes = "刷新用户岗位关系") public void refreshRefUserPosition(Long userInfoId, Long[] positionIds , String userName) { LOGGER.info("用户信息 SysUserInfo userInfoId:{} positionIds:{} userName:{}",userInfoId,positionIds,userName); SysUserInfo userInfo = sysUserInfoRDao.getById(userInfoId); if(userInfo != null ){ - // 查询部门信息 - StringBuffer where = new StringBuffer(); - HqlPack.getInPack(StringUtils.join(positionIds,","),"id",where); - List positionList = positionRDao.findByHqlWhere(where.toString()); - // 删除用户岗位关系 refUserPositionRDao.deleteByProperty("userId",userInfo.getId()); - if(positionList != null && positionList.size() >0){ - List list = new ArrayList<>(); - List nameList = new ArrayList<>(); - SysRefUserPosition ref = null; - for (SysPosition position : positionList) { - ref = new SysRefUserPosition(); - ref.setUserId(userInfo.getId()); - ref.setUserNameRdd(userInfo.getName()); - ref.setPositionId(position.getId()); - ref.setPositionNameRdd(position.getName()); - ref.setCreateUser(userName); - ref.setCreateDatetime(TimeTool.getNowTime(true)); - list.add(ref); - - nameList.add(position.getName()); + if(positionIds.length > 0){ + StringBuffer where = new StringBuffer(); + HqlPack.getInPack(StringUtils.join(positionIds,","),"id",where); // 查询部门信息 + List positionList = positionRDao.findByHqlWhere(where.toString()); + + if(positionList != null && positionList.size() >0){ + List list = new ArrayList<>(); + List nameList = new ArrayList<>(); + SysRefUserPosition ref = null; + for (SysPosition position : positionList) { + ref = new SysRefUserPosition(); + ref.setUserId(userInfo.getId()); + ref.setUserNameRdd(userInfo.getName()); + ref.setPositionId(position.getId()); + ref.setPositionNameRdd(position.getName()); + ref.setCreateUser(userName); + ref.setCreateDatetime(TimeTool.getNowTime(true)); + list.add(ref); + + nameList.add(position.getName()); + } + + userInfo.setPositionNamesRdd(String.join(",",nameList)); + + refUserPositionRDao.saveAll(list); + sysUserInfoRDao.save(userInfo); + + LOGGER.info("用户信息 SysUserInfo RefUserPositionRDao Insert Size :{}",list.size()); } - - userInfo.setPositionNamesRdd(String.join(",",nameList)); - - refUserPositionRDao.saveAll(list); - sysUserInfoRDao.save(userInfo); - - LOGGER.info("用户信息 SysUserInfo RefUserPositionRDao Insert Size :{}",list.size()); } }else { throw ImppExceptionBuilder.newInstance() @@ -170,6 +178,7 @@ public class SysUserInfoService implements ISysUserInfoService { } @Override + @ApiOperation(value = "刷新用户关系",notes = "刷新用户组织关系") public void refreshRefUserOrganize(Long userInfoId, Long organizeId, String userName) { LOGGER.info("用户信息 SysUserInfo userInfoId:{} organizeId:{} userName:{}",userInfoId,organizeId,userName); SysUserInfo userInfo = sysUserInfoRDao.getById(userInfoId); @@ -208,28 +217,33 @@ public class SysUserInfoService implements ISysUserInfoService { } @Override + @ApiOperation(value = "删除用户",notes = "根据UserInfoId 删除用户信息") public void deleteSysUserInfoById(Long id) { LOGGER.info("用户信息 SysUserInfo id:{}",id); sysUserInfoRDao.deleteById(id); } @Override + @ApiOperation(value = "删除用户-批量",notes = "根据UserInfoId 批量删除用户信息") public void deleteSysUserInfoByIds(Long[] ids) { LOGGER.info("用户信息 SysUserInfo ids:{}",ids); sysUserInfoRDao.deleteByIds(ids); } @Override + @ApiOperation(value = "查询用户信息",notes = "根据 UserInfoId查询用户信息") public SysUserInfo getSysUserInfoById(Long id) { return sysUserInfoRDao.getById(id); } @Override + @ApiOperation(value = "查询用户信息",notes = "查询所有用户信息") public List listSysUserInfo() { return sysUserInfoRDao.findAll(); } @Override + @ApiOperation(value = "查询用户信息",notes = "根据复杂查询条件查询用户信息(分页信息)") public ListPager querySysUserInfo(SysUserInfo userInfo, Pager pager) { LOGGER.info("定时任务 TASK_TIME TaskTime:{}，Pager:{}",userInfo,pager); if(userInfo == null) { diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java index b85f967..6da8497 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java @@ -245,12 +245,15 @@ public class SysUserService implements ISysUserService { @ApiOperation(value = "删除账号", notes = "删除账号信息，逻辑删除，账号关系业务物理删除") public void deleteSysUserById(Long id) { LOGGER.debug("平台用户 SYS_USER DELETE By id :{}", id); - sysUserRDao.updateByProperties("id", id, "isValid", CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); + SysUser user = sysUserRDao.getById(id); + user.setIsValid(CommonEnumUtil.IS_VAILD.INVAILD.getValue()); + sysUserRDao.save(user); // 删除用户关系(物理删除) refUserRoleRDao.deleteByProperty("userId", id); // 删除用户角色关系 refUserDepartmentRDao.deleteByProperty("userId", id); //删除用户部门关系 refUserPositionRDao.deleteByProperty("userId", id); //删除用户部门关系 + sysUserInfoService.refreshUserInfoUserNum(user.getUserInfoId()); } @Override @@ -425,7 +428,7 @@ public class SysUserService implements ISysUserService { * @return */ @Override - @ApiOperation(value = "封装用户信息", notes = "封装用户信息") + @ApiOperation(value = "封装用户信息",notes = "封装登录完成后的用户信息(角色、权限、部门、组织、岗位)") public SessionUser packSessionUser(SessionUser sessionUser, SysUser user, Integer userType, String languageCode) { LOGGER.debug("平台用户 SYS_USER user id :{}", user.getId()); SysUserInfo userInfo = sysUserInfoRDao.getById(user.getUserInfoId()); From 887e176ba7d505f0f89d2c0b8593499bf744cb43 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Thu, 13 Dec 2018 19:13:21 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=BE=93=E5=87=BA?= =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E7=BB=9F=E8=AE=A1=E8=B4=A6=E5=8F=B7?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java | 4 +++- modules/i3plus-core-apiservice/src/main/resources/log4j2.xml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java index 07b5970..0d643a7 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java @@ -209,7 +209,9 @@ public class SysUserInfoService implements ISysUserInfoService { LOGGER.info("用户信息 SysUserInfo userInfoId:{}",userInfoId); SysUserInfo userInfo = sysUserInfoRDao.getById(userInfoId); if(userInfo != null){ - int count = sysUserRepository.findByPropertyCount("userInfoId", userInfo.getId()); + int count = sysUserRepository.findByPropertyCount( + new String[]{"userInfoId","isValid"}, + new Object[]{userInfo.getId(),CommonEnumUtil.IS_VAILD.VAILD.getValue()}); userInfo.setUserNum(count); sysUserInfoRDao.save(userInfo); diff --git a/modules/i3plus-core-apiservice/src/main/resources/log4j2.xml b/modules/i3plus-core-apiservice/src/main/resources/log4j2.xml index cf4275c..b8ed7f7 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/log4j2.xml +++ b/modules/i3plus-core-apiservice/src/main/resources/log4j2.xml @@ -5,7 +5,7 @@ [%p] %d{yyyy-MM-dd HH:mm:ss-SSS} %l 信息:%m%n [%p] %d{HH:mm:ss-SSS} %c(%M:%L) 信息:%m%n - [SYS-%p] 系统:%m (%d{HH:mm:ss-SSS} %F -> %M:%L)%n + [SYS-%p] %d{HH:mm:ss-SSS} 系统:%m ( %F -> %M:%L)%n From 219f1dde42443ead46e91af652aadfad7f389380 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Thu, 13 Dec 2018 19:46:31 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- i3plus-core.iml | 12 - modules/i3plus-core-api/i3plus-core-api.iml | 17 -- .../i3plus-core-apiservice.iml | 294 --------------------- .../serviceimpl/busi/SysMessageService.java | 18 -- .../serviceimpl/busi/SysUserInfoService.java | 14 + .../apiservice/serviceimpl/busi/TestRedis.java | 35 --- 6 files changed, 14 insertions(+), 376 deletions(-) delete mode 100644 i3plus-core.iml delete mode 100644 modules/i3plus-core-api/i3plus-core-api.iml delete mode 100644 modules/i3plus-core-apiservice/i3plus-core-apiservice.iml delete mode 100644 modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestRedis.java diff --git a/i3plus-core.iml b/i3plus-core.iml deleted file mode 100644 index a0d4a1e..0000000 --- a/i3plus-core.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file 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 5fc3092..0000000 --- a/modules/i3plus-core-api/i3plus-core-api.iml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file 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 6628966..0000000 --- a/modules/i3plus-core-apiservice/i3plus-core-apiservice.iml +++ /dev/null @@ -1,294 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageService.java index bd8bd7c..e5bc83e 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageService.java @@ -180,22 +180,4 @@ public class SysMessageService implements ISysMessageService { @Resource(name="redisRes") private ImppRedis redisRes; - - @Override - public void insertRedis() { - - // 放入缓存 - HashMap resource = new HashMap(); - resource.put("test","test110"); -// redisRes.multi(); - redisRes.putHashMap("junit3",resource,1000 * 60); - System.out.println(redisRes.getHashMap("junit3")); -// System.out.println(redisRes.commit()); -// System.out.println(redisRes.getHashMap("junit3")); - } - - @Override - public void getRedis() { - System.out.println(redisRes.getHashMap("junit3")); - } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java index f39319d..035f489 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java @@ -35,6 +35,7 @@ public class SysUserInfoService implements ISysUserInfoService { public static final Logger LOGGER = LoggerFactory.getLogger(SysUserInfoService.class); + @Autowired private SysUserInfoRepository sysUserInfoRDao; @@ -195,6 +196,19 @@ public class SysUserInfoService implements ISysUserInfoService { } @Override + @ApiOperation(value = "刷新用户账号信息",notes = "根据UserInfoId 刷新用户账号信息") + public void refreshUserInfoUserNum(Long userInfoId) { + LOGGER.info("用户信息 SysUserInfo userInfoId:{}",userInfoId); + SysUserInfo userInfo = sysUserInfoRDao.getById(userInfoId); + if(userInfo != null){ + int count = sysUserRepository.findByPropertyCount("userInfoId", userInfo.getId()); + userInfo.setUserNum(count); + sysUserInfoRDao.save(userInfo); + + } + } + + @Override public void deleteSysUserInfoById(Long id) { LOGGER.info("用户信息 SysUserInfo id:{}",id); sysUserInfoRDao.deleteById(id); diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestRedis.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestRedis.java deleted file mode 100644 index 2efaf9d..0000000 --- a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestRedis.java +++ /dev/null @@ -1,35 +0,0 @@ -package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; - -import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService; -import cn.estsh.impp.framework.boot.util.ImppRedis; -import org.junit.Test; -import org.springframework.beans.factory.annotation.Autowired; - -import javax.annotation.Resource; -import java.beans.Transient; -import java.util.HashMap; - -/** - * @Description : - * @Reference : - * @Author : yunhao - * @CreateDate : 2018-12-12 22:06 - * @Modify: - **/ -public class TestRedis extends TestBase { - - @Autowired - private ISysMessageService sysMessageService; - - @Test - public void testReids(){ -// // 放入缓存 -// HashMap resource = new HashMap(); -// resource.put("test","test110"); -// redisRes.putHashMap("junit3",resource,1000 * 60); -// System.out.println(redisRes.getHashMap("junit3")); -// System.out.println(redisRes.commit()); -// System.out.println(redisRes.getHashMap("junit3")); - sysMessageService.insertRedis(); - } -} From 0bb901bdfc5367ac08bf463d1b2e0f04e30a357c Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Thu, 13 Dec 2018 20:04:19 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81=20?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/core/api/iservice/busi/ISysUserService.java | 3 +++ .../core/apiservice/serviceimpl/busi/SysUserService.java | 5 ++++- .../src/main/resources/application.properties | 16 +++++++++++++++- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java index 5d0c147..bdf6996 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java @@ -199,6 +199,9 @@ public interface ISysUserService { @ApiOperation(value = "账号检查",notes = "检查账号信息唯一(登录名、邮箱、手机号)") void checkSysUserOnly(SysUser user); + @ApiOperation(value = "查询账户数量") + long getSysUserCount(); + /** * 登录封装账号信息 * @param sessionUser diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java index 41e791d..39e738f 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; +import cn.estsh.i3plus.core.api.iservice.busi.ISysUserInfoService; import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService; import cn.estsh.i3plus.core.apiservice.dao.IUserPermissionDao; import cn.estsh.i3plus.platform.common.convert.ConvertBean; @@ -76,6 +77,9 @@ public class SysUserService implements ISysUserService { @Autowired private SysPositionRepository sysPositionRDao; + @Autowired + private ISysUserInfoService sysUserInfoService; + @Override @ApiOperation(value = "用户登录", notes = "用户登录功能实现") public SessionUser queryUserLogin(String loginName, String password, String languageCode) throws AuthenticationException { @@ -89,7 +93,6 @@ public class SysUserService implements ISysUserService { throw new CredentialsException("用户不存在"); } - packSessionUser(sessionUser, user, user.getUserType(), languageCode); AuthUtil.setSessionUser(sessionUser); refreshUserLoginInformation(user.getId()); diff --git a/modules/i3plus-core-apiservice/src/main/resources/application.properties b/modules/i3plus-core-apiservice/src/main/resources/application.properties index 58de670..370fe1d 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application.properties @@ -29,4 +29,18 @@ server.tomcat.uri-encoding=UTF-8 spring.mvc.view.prefix=/upload_demo spring.mvc.view.suffix=.jsp #静态文件访问配置 -spring.resources.static-locations=/static/**,/** \ No newline at end of file +spring.resources.static-locations=/static/**,/** + +########扫包路径######## +#app基础包路径 +impp.app.base-packages=cn.estsh.i3plus.core +#app对象路径 +impp.app.pojo-packages=cn.estsh.i3plus.pojo.platform +#dao接口包 +impp.app.pojo-dao=${impp.app.base-packages}.apiservice.dao +#mongo-dao接口包 +impp.app.pojo-mongo-dao=${impp.app.base-packages}.apiservice.daomongo +#对象持久化包路径，可以多个包，逗号分隔 +impp.app.pojo-repository=${impp.app.pojo-packages}.repository +#mongodb资源仓 +impp.app.pojo-mongo-repository=${impp.app.pojo-packages}.repositorymongo \ No newline at end of file