diff --git a/modules/i3plus-core-api/pom.xml b/modules/i3plus-core-api/pom.xml index 0d3172b..cbfbca2 100644 --- a/modules/i3plus-core-api/pom.xml +++ b/modules/i3plus-core-api/pom.xml @@ -19,6 +19,10 @@ 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 9426ca6..3602c5c 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,5 +1,6 @@ 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; @@ -14,7 +15,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-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 83111a4..9b47605 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 @@ -77,4 +77,11 @@ public interface ISysDepartmentService { */ @ApiOperation(value = "查询部门信息",notes = "查询部门信息(分页、组合)") 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 025bb95..09d834e 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 @@ -78,4 +78,11 @@ public interface ISysOrganizeService { */ @ApiOperation(value = "查询组织信息",notes = "根据ID查询组织信息") SysOrganize getSysOrganizeById(Long id); + + /** + * 查询组织个数 + * @return + */ + @ApiOperation(value = "查询组织个数") + long getSysOrganizeCount(); } diff --git a/modules/i3plus-core-apiservice/pom.xml b/modules/i3plus-core-apiservice/pom.xml index d757f80..839babf 100644 --- a/modules/i3plus-core-apiservice/pom.xml +++ b/modules/i3plus-core-apiservice/pom.xml @@ -103,6 +103,10 @@ ehcache-core + i3plus.pojo + i3plus-pojo-mes + + org.slf4j slf4j-api 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 fcf1d38..2ba0cf6 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,7 +23,6 @@ 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; @@ -94,13 +93,12 @@ public class ShiroAuthConfiguration { return realms; } - @Bean(name="modularRealmAuthenticator") + @Bean 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 deleted file mode 100644 index dd3e21f..0000000 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/ScanPackageConfiguration.java +++ /dev/null @@ -1,42 +0,0 @@ -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/DemoAuthController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoAuthController.java index e275354..30c3295 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoAuthController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoAuthController.java @@ -46,9 +46,9 @@ public class DemoAuthController extends CoreBaseController { LOGGER.info("用户登陆：{},{},{}",loginName,loginPwd,languageCode); try { SessionUser sUser = systemLoginService.queryUserLogin(loginName,loginPwd,languageCode); - LOGGER.info("sid:{}, 会员登陆：{}",AuthUtil.getSession().getId(),sUser); + LOGGER.info("会员登陆：{}",sUser); AuthUtil.setSessionObject("languageCode",languageCode); - return new ResultBean(true,AuthUtil.getSession().getId()); + return new ResultBean(true,""); } catch (ImppBusiException e) { return new ResultBean(false,e.getErrorDetail() + ",so:" + e.getErrorSolution()); } @@ -75,7 +75,7 @@ public class DemoAuthController extends CoreBaseController { * @return */ @GetMapping(value="/get-user-info") - @ApiOperation(value="获取用户信息",notes="获取用户信息") + @ApiOperation(value="登出",notes="登出") public ResultBean getUserInfo(HttpServletRequest request){ LOGGER.info("获取用户信息...lang:{}",AuthUtil.getSessionAttribute("languageCode")); try { 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 22c90ed..66c918e 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,10 +4,11 @@ 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; @@ -18,9 +19,7 @@ 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.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.io.IOException; @@ -64,7 +63,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,"已放入缓存"); @@ -73,11 +72,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); + return new ResultBean(true,mf); } @GetMapping(value="/send-mq") @@ -92,7 +91,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/AuthController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java index 445c068..4c88219 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java @@ -75,7 +75,7 @@ public class AuthController extends CoreBaseController { LOGGER.info("会员登陆：{}",user); AuthUtil.setSessionObject("languageCode",languageCode); - result = new ResultBean(true, AuthUtil.getSession().getId().toString(), AuthUtil.getSessionUser()); + result = new ResultBean(true, "", AuthUtil.getSessionUser()); result.setUrl("/"); } catch (IncorrectCredentialsException e) { // 密码错误 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 dbcf777..4c62aaa 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.PutMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * @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/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/SysDictionaryController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java index c4d7c13..29b90dc 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java @@ -98,12 +98,20 @@ public class SysDictionaryController extends CoreBaseController{ @DeleteMapping("/delete/{id}") @ApiOperation(value = "根据id删除字典",notes = "根据id删除字典") - public ResultBean updateSysDictionary(@PathVariable("id") String id) { + public ResultBean updateSysDictionary(@PathVariable("id") String idStr) { try { // 条件验证 - ValidatorBean.checkNotNull(id,"id不能为空"); + ValidatorBean.checkNotNull(idStr,"id不能为空"); + if(sysDictionaryService.getSysDictionaryById(Long.parseLong(idStr)) == null){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode()) + .setErrorDetail("字典不存在") + .setErrorSolution("请重新输入字典id") + .build(); + } - sysDictionaryService.deleteSysDictionaryById(Long.parseLong(id)); + sysDictionaryService.deleteSysDictionaryById(Long.parseLong(idStr)); return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); 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/controller/busi/SysToolTypeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolTypeController.java index 859f9e0..0336db1 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolTypeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolTypeController.java @@ -92,11 +92,19 @@ public class SysToolTypeController extends CoreBaseController{ @DeleteMapping("/delete/{id}") @ApiOperation(value = "根据id删除硬件类型",notes = "根据id删除硬件类型") - public ResultBean deleteSysToolType(@PathVariable String id){ + public ResultBean deleteSysToolType(@PathVariable String idStr){ try { - ValidatorBean.checkNotNull(id,"id不能为空"); + ValidatorBean.checkNotNull(idStr,"id不能为空"); + if(toolTypeService.getSysToolTypeById(Long.parseLong(idStr)) == null){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode()) + .setErrorDetail("硬件类型不存在") + .setErrorSolution("请重新输入硬件类型id") + .build(); + } - toolTypeService.deleteSysToolTypeById(Long.parseLong(id)); + toolTypeService.deleteSysToolTypeById(Long.parseLong(idStr)); return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); 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 f41118d..e3268b9 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 @@ -103,7 +103,6 @@ public class SysUserController extends CoreBaseController{ // 更新用户关系 sysUserService.refreshSysRefUserRole(user,StringTool.getArrayLong(roleIds),getSessionUser().getUserName()); - sysUserInfoService.refreshUserInfoUserNum(userInfo.getId()); return ResultBean.success("操作成功") .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) 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 40cf596..f3409ee 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,39 +1,45 @@ -//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();*/ -//} +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();*/ +} 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/schedulejob/DemoJob.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/DemoJob.java index 18f3bf9..17445ae 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/DemoJob.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/DemoJob.java @@ -1,11 +1,22 @@ package cn.estsh.i3plus.core.apiservice.schedulejob; +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.ISysTaskTimeService; +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.impp.framework.base.schedule.BaseImppScheduleJob; import cn.estsh.impp.framework.boot.init.ApplicationProperties; +import com.netflix.discovery.converters.Auto; import io.swagger.annotations.ApiOperation; import org.quartz.JobExecutionContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; + +import java.text.SimpleDateFormat; /** * @Description : 定时任务 @@ -22,9 +33,29 @@ public class DemoJob extends BaseImppScheduleJob { super(DemoJob.class,"定时任务demo"); } + @Autowired + private ISysTaskTimeService taskTimeService; + @Autowired + private ISysMessageService sysMessageService; + @Autowired + private ISysConfigService sysConfigService; + @Override public void executeImppJob(JobExecutionContext context, ApplicationProperties applicationProperties) { System.out.println("定时任务被执行"); LOGGER.info("projectName：{},port:{}",applicationProperties.getApplicationName(),applicationProperties.getServerPort()); + + SysMessage sysMessage = new SysMessage(); + sysMessage.setMessageTitle("定时邮件发送"); + sysMessage.setMessageContent("定时邮件内容"+TimeTool.getNowTime(true)); + sysMessage.setMessageType(ImppEnumUtil.MESSAGE_TYPE.MAIL.getValue()); + sysMessage.setMessageContentType(ImppEnumUtil.MESSAGE_TYPE_CONTENT.HTML.getValue()); + sysMessage.setMessageReceiversId(PlatformConstWords.CONTACT_MAIL); + sysMessage.setMessageReceiversNameRdd(PlatformConstWords.CONTACT_MAIL); + sysMessageService.doSendSysMessage(sysMessage); + + taskTimeService.doSysTaskTimeLastDateByNameAndGroupName(TimeTool.getNowTime(true), + context.getJobDetail().getKey().getName(), + context.getJobDetail().getKey().getGroup()); } } 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 0cfe00c..33a2d5b 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,8 +1,12 @@ 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; /** @@ -16,15 +20,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/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 cff5499..d49247a 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 @@ -211,4 +211,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..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 @@ -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; /** @@ -174,4 +177,7 @@ public class SysMessageService implements ISysMessageService { public void deleteSysRefUserMessageStatusByIds(Long[] ids) { sysRefUserMessageRDao.deleteByIds(ids); } + + @Resource(name="redisRes") + private ImppRedis redisRes; } 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 3003211..cf490e1 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 @@ -21,7 +21,7 @@ import org.springframework.stereotype.Service; import java.util.List; /** - * @Description : 组织业务接口实现 + * @Description : 组织业务接口实现 * @Reference : * @Author : wei.peng * @Date : 2018-10-22 16:58:42.957 @@ -176,4 +176,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/SysTaskTimeService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskTimeService.java index 81e3580..ba42e9f 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskTimeService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskTimeService.java @@ -198,7 +198,7 @@ public class SysTaskTimeService implements ISysTaskTimeService{ .withDescription(taskTimeExpression.getExpressionDescription()) .withSchedule(schedBuilder) .startAt(sdf.parse(taskTimeExpression.getExpressionStartDatetime())); - if(taskTimeExpression.getExpressionEndDatetime() != null){ + if(taskTimeExpression.getExpressionEndDatetime() != null && taskTimeExpression.getExpressionEndDatetime().length() != 0){ trigger = trigger.endAt(sdf.parse(taskTimeExpression.getExpressionEndDatetime())); } 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 0d643a7..b2afe2d 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; 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 6da8497..41e791d 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,6 +1,5 @@ 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; @@ -77,9 +76,6 @@ 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 { @@ -267,7 +263,6 @@ public class SysUserService implements ISysUserService { if(null != list && list.size() > 0){ for (SysUser sysUser : list) { sysUser.setIsValid(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); - sysUserInfoService.refreshUserInfoUserNum(sysUser.getUserInfoId()); } sysUserRDao.saveAll(list); @@ -418,6 +413,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/main/resources/application.properties b/modules/i3plus-core-apiservice/src/main/resources/application.properties index 370fe1d..58de670 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application.properties @@ -29,18 +29,4 @@ server.tomcat.uri-encoding=UTF-8 spring.mvc.view.prefix=/upload_demo spring.mvc.view.suffix=.jsp #静态文件访问配置 -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 +spring.resources.static-locations=/static/**,/** \ No newline at end of file diff --git a/pom.xml b/pom.xml index 0ffa7c5..0a79893 100644 --- a/pom.xml +++ b/pom.xml @@ -93,10 +93,21 @@ i3plus.pojo + i3plus-pojo-mes + ${project.version} + + + i3plus.pojo i3plus-pojo-base ${project.version} + + i3plus.pojo + i3plus-pojo-mes + ${project.version} + + i3plus.icloud