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

# Conflicts:
#	modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ILogOperateService.java
#	modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LogOperateService.java

.gitignore

@@ -10,4 +10,4 @@ gen
 target
 .jar
 .class
-.md
+.mda

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

@@ -61,6 +61,9 @@ public interface ILogOperateService {
     @ApiOperation(value = "根据操作人姓名模糊查询日志",notes = "根据操作人姓名模糊查询日志")
     List<LogOperate> listLogOperateByOperateUserName(String operateUserName);
 
+    //查询所有日志数量
+    long countAllLogOperate();
+
     /**
      * 操作日志复杂查询，分页，排序
      * @param logOperate

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

@@ -101,6 +101,9 @@ public class DemoMongoController {
         try {
             List<LogOperate> logList = logOperateService.listLogOperateByOperateUserName(OperateUserName);
 
+            long count = logOperateService.countAllLogOperate();
+            LOGGER.info("=log size= " + count);
+
             return ResultBean.success("操作成功").setResultList(logList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
             LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);

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

@@ -39,43 +39,5 @@ public class SimpleController {
         return new ResultBean(true,"工厂已保存");
     }
 
-    @GetMapping(value = "/find-by-factory-name")
-    @ApiOperation(value="查询工厂",notes="通过工厂名称查询工厂")
-    public ResultBean findMachineFactoryByFactoryName(String factoryName){
-        List<MachineFactory> factoryList = dataSimpleService.findMachineFactoryByFactoryName(factoryName);
 
-        return new ResultBean(true,factoryList);
-    }
-
-    @GetMapping(value = "/find-by-factory-code")
-    @ApiOperation(value="查询工厂",notes="通过工厂代码查询工厂")
-    public ResultBean findMachineFactoryByFactoryCode(String factoryCode){
-        List<MachineFactory> factoryList = dataSimpleService.findMachineFactoryByFactoryCode(factoryCode);
-
-        return new ResultBean(true,factoryList);
-    }
-
-    @GetMapping(value = "/find-by-factory-special")
-    @ApiOperation(value="特殊查询",notes="通过工厂代码查询工厂")
-    public ResultBean findMachineFactorySpecial(){
-        List<MachineFactory> factoryList = dataSimpleService.findMachineFactorySpecial();
-
-        return new ResultBean(true,factoryList);
-    }
-
-    @PutMapping(value="/update")
-    @ApiOperation(value="service服务",notes="返回内容添加service")
-    public ResultBean updateFactory(long id, String name){
-        dataSimpleService.updateMachineFactoryNameById(id,name);
-
-        return new ResultBean(true,"工厂已修改");
-    }
-
-    @DeleteMapping(value="/delete")
-    @ApiOperation(value="service服务",notes="返回内容添加service")
-    public ResultBean deleteMachineFactoryById(long id){
-        dataSimpleService.deleteMachineFactoryById(id);
-
-        return new ResultBean(true,"工厂已删除");
-    }
 }

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

@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.core.apiservice.controller.busi;
 
 import cn.estsh.i3plus.core.api.iservice.busi.IDataMoreService;
-import cn.estsh.i3plus.core.apiservice.dao.IFactoryStoreDao;
 import cn.estsh.i3plus.pojo.platform.bean.FactoryStore;
 import cn.estsh.impp.framework.boot.util.ResultBean;
 import io.swagger.annotations.Api;
@@ -26,9 +25,6 @@ import java.util.List;
 public class FactoryStoreController {
     private Logger LOGGER = LoggerFactory.getLogger(this.getClass());
 
-    @Autowired
-    private IFactoryStoreDao dataMoreService;
-
     @PostMapping(value="/insert/{name}/{code}")
     @ApiOperation(value="service服务",notes="返回内容添加service")
     public ResultBean insertFactory(@PathVariable("name")String name, @PathVariable("code")String code){

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/DataSimpleServiceImpl.java

@@ -2,16 +2,13 @@ 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.platform.common.idtool.SnowflakeIdMaker;
+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;
 
-import javax.sql.DataSource;
-import java.util.List;
-
 /**
  * @Description :
  * @Reference :

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

@@ -65,6 +65,11 @@ public class LogOperateService implements ILogOperateService {
     }
 
     @Override
+    public long countAllLogOperate() {
+        return logOperateRDao.listCount();
+    }
+
+    @Override
     public ListPager<LogOperate> queryLogOperateByPager(LogOperate logOperate, Pager pager) {
         if(logOperate == null) {
             pager = PagerHelper.getPager(pager, (int) logOperateRDao.count());

modules/i3plus-core-apiservice/src/main/resources/application-dev.properties

@@ -1,5 +1,5 @@
 #项目端口
-server.port=8080
+server.port=8081
 
 #用户登陆路径
 filter.shiro.user.loginuri = /login
@@ -7,7 +7,7 @@ filter.shiro.user.loginuri = /login
 filter.shiro.admin.loginuri = /salogin
 #运维人员登陆路径
 filter.shiro.saadmin.loginuri = /salogin
-
+++
 #用户授权过滤路径
 filter.shiro.user.filteruri = /operate/*
 #用户授权过滤路径
@@ -15,6 +15,7 @@ filter.shiro.admin.filteruri = /adoperate/*
 #用户授权过滤路径
 filter.shiro.saadmin.filteruri = /saoperate/*
 
+
 #是否允许前端跨域提交impp.web.cross.hosts
 impp.web.cross = false
 #允许前端跨域提交ip地址，多个以逗号分隔

pom.xml

@@ -28,7 +28,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
         <spring-cloud.version>Finchley.RELEASE</spring-cloud.version>
-        <log4j2.level>INFO</log4j2.level>
+        <log4j2.level>DEBUG</log4j2.level>
         <log4j2.root.path>E:/i3plus-platform-logs/${project.name}</log4j2.root.path>
         <log4j2.error.path>E:/i3plus-platform-logs/${project.name}-error</log4j2.error.path>
         <log4j2.package.path>E:/i3plus-platform-logs/${project.name}-controller</log4j2.package.path>