Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev

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

@@ -1,14 +1,19 @@
 package cn.estsh.i3plus.core.apiservice.controller;
 
+import cn.estsh.i3plus.core.api.iservice.busi.ISysLogExceptionService;
+import cn.estsh.i3plus.core.api.iservice.busi.ISysLogSystemService;
 import cn.estsh.i3plus.icloud.core.sdk.ICoreDemoCloud;
 import cn.estsh.i3plus.icloud.wms.sdk.IWmsDemoCloud;
 import cn.estsh.i3plus.pojo.base.bean.BaseModelBean;
 import cn.estsh.i3plus.pojo.base.bean.BaseResultBean;
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
 import cn.estsh.i3plus.pojo.platform.bean.SysRole;
+import cn.estsh.i3plus.pojo.platform.platbean.SysLogException;
+import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
@@ -52,4 +57,68 @@ public class DemoExceptionController {
             return ResultBean.fail(busExcep);
         }
     }
+
+
+    @Autowired
+    private ISysLogExceptionService sysLogExceptionService;
+
+
+    @GetMapping(value = "/query")
+    @ApiOperation(value = "异常日志复杂查询，分页，排序",notes = "异常日志复杂查询，分页，排序")
+    public ResultBean querySysLogExceptionByPager(SysLogException sysLogException, Pager pager){
+        try {
+            System.out.println("1===============");
+            ListPager logExceptionList = sysLogExceptionService.querySysLogExceptionByPager(sysLogException, pager);
+            System.out.println(logExceptionList.getObjectList().size());
+            System.out.println("===============pager:" + pager);
+            return ResultBean.success("查询成功").setListPager(logExceptionList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+        }catch(ImppBusiException busExcep){
+            return ResultBean.fail(busExcep);
+        }catch(Exception e){
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+
+
+    @Autowired
+    private ISysLogSystemService syslogSystemService;
+
+    @GetMapping(value = "/query-logSystem")
+    @ApiOperation(value = "异常日志复杂查询，分页，排序",notes = "异常日志复杂查询，分页，排序")
+    public ResultBean querySysLogSystemByPager(SysLogSystem sysLog, Pager pager){
+        try {
+            System.out.println("2===============");
+            ListPager logSystemList = syslogSystemService.querySysLogSystemByPager(sysLog,pager);
+            System.out.println(logSystemList.getObjectList().size());
+            System.out.println("===============pager:" + pager);
+            return ResultBean.success("查询成功").setListPager(logSystemList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+        }catch(ImppBusiException busExcep){
+            return ResultBean.fail(busExcep);
+        }catch(Exception e){
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+
+
+    @GetMapping(value = "/query-logSystemtest2")
+    @ApiOperation(value = "异常日志复杂查询，分页，排序",notes = "异常日志复杂查询，分页，排序")
+    public ResultBean querySysLogSystemTest(){
+        try {
+            Pager pager = new Pager();
+            pager.setStartRow(0);
+            pager.setPageSize(10);
+
+            SysLogSystem logSystem = new SysLogSystem();
+
+            System.out.println("2===============");
+            ListPager logSystemList = syslogSystemService.querySysLogSystemByPager(logSystem,pager);
+            System.out.println(logSystemList.getObjectList().size());
+            System.out.println("===============pager:" + pager);
+            return ResultBean.success("查询成功").setListPager(logSystemList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+        }catch(ImppBusiException busExcep){
+            return ResultBean.fail(busExcep);
+        }catch(Exception e){
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/I3CoreQueueConfig.java

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.core.apiservice.mq;
 
 import cn.estsh.i3plus.platform.common.util.CommonConstWords;
+import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.amqp.core.*;
@@ -71,4 +72,29 @@ public class I3CoreQueueConfig {
         //LOGGER.info("【DEMO_CLOUD_WMS】");
         return new Queue(DEMO_CLOUD_WMS);
     }
+
+    @Bean
+    public Queue getQueueIMPP_MESSAGE_LETTER_QUEUE() throws Exception {
+        return new Queue(PlatformConstWords.IMPP_MESSAGE_LETTER_QUEUE);
+    }
+
+    @Bean
+    public Queue getQueueIMPP_MESSAGE_LETTER_QUEUE_BAK() throws Exception {
+        return new Queue(PlatformConstWords.IMPP_MESSAGE_LETTER_QUEUE_BAK);
+    }
+
+    @Bean
+    public Queue getQueueIMPP_MESSAGE_MAIL_QUEUE() throws Exception {
+        return new Queue(PlatformConstWords.IMPP_MESSAGE_MAIL_QUEUE);
+    }
+
+    @Bean
+    public Queue getQueueSWEB_NOTICE_QUEUE() throws Exception {
+        return new Queue(PlatformConstWords.SWEB_NOTICE_QUEUE);
+    }
+
+    @Bean
+    public Queue getQueueIMPP_SCHEDULE_QUEUE() throws Exception {
+        return new Queue(PlatformConstWords.IMPP_SCHEDULE_QUEUE);
+    }
 }

modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestMongoDb.java

@@ -0,0 +1,66 @@
+package test.cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
+
+import cn.estsh.i3plus.core.api.iservice.busi.ISysLogExceptionService;
+import cn.estsh.i3plus.core.api.iservice.busi.ISysLogSystemService;
+import cn.estsh.i3plus.core.apiservice.serviceimpl.busi.TestBase;
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.platform.platbean.SysLogException;
+import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem;
+import com.alibaba.fastjson.JSON;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import javax.transaction.Transactional;
+import java.util.List;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : alwaysfrin
+ * @CreateDate : 2019-04-09 14:38
+ * @Modify:
+ **/
+public class TestMongoDb extends TestBase {
+
+
+    @Autowired
+    private ISysLogExceptionService sysLogExceptionService;
+
+    @Autowired
+    private ISysLogSystemService syslogSystemService;
+
+    /**
+     * 测试 查询所有系统参数
+     */
+    @Test
+    @Transactional
+    public void testListSysConfig() {
+        Pager pager = new Pager();
+        pager.setStartRow(0);
+        pager.setPageSize(10);
+
+        SysLogException sysLogException = new SysLogException();
+
+        ListPager logExceptionList = sysLogExceptionService.querySysLogExceptionByPager(sysLogException, pager);
+        System.out.println(logExceptionList);
+    }
+
+
+    @Test
+    @Transactional
+    public void testListSysLogSystem() {
+        Pager pager = new Pager();
+        pager.setStartRow(0);
+        pager.setPageSize(10);
+
+        SysLogSystem logSystem = new SysLogSystem();
+        logSystem.setLogLevel(1);
+        logSystem.setLogModuleId(1);
+
+        System.out.println("2===============");
+        ListPager logSystemList = syslogSystemService.querySysLogSystemByPager(logSystem,pager);
+        System.out.println(logSystemList.getObjectList().size());
+        System.out.println("===============pager:" + pager);
+    }
+}