diff --git a/.gitignore b/.gitignore index 838e520..8884595 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,4 @@ gen target .jar .class -.md \ No newline at end of file +.mda \ No newline at end of file diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ILogOperateService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ILogOperateService.java index df53fab..3c51ce4 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ILogOperateService.java +++ b/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 listLogOperateByOperateUserName(String operateUserName); + //查询所有日志数量 + long countAllLogOperate(); + /** * 操作日志复杂查询，分页，排序 * @param logOperate diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoMongoController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoMongoController.java index 549c36b..39ad474 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoMongoController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoMongoController.java @@ -101,6 +101,9 @@ public class DemoMongoController { try { List 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); 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 5d8a5f0..a24e4bd 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 @@ -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 factoryList = dataSimpleService.findMachineFactoryByFactoryName(factoryName); - return new ResultBean(true,factoryList); - } - - @GetMapping(value = "/find-by-factory-code") - @ApiOperation(value="查询工厂",notes="通过工厂代码查询工厂") - public ResultBean findMachineFactoryByFactoryCode(String factoryCode){ - List factoryList = dataSimpleService.findMachineFactoryByFactoryCode(factoryCode); - - return new ResultBean(true,factoryList); - } - - @GetMapping(value = "/find-by-factory-special") - @ApiOperation(value="特殊查询",notes="通过工厂代码查询工厂") - public ResultBean findMachineFactorySpecial(){ - List 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,"工厂已删除"); - } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/FactoryStoreController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/FactoryStoreController.java index f0dc009..0343bdb 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/FactoryStoreController.java +++ b/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){ 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 6c17061..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 @@ -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 : diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LogOperateService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LogOperateService.java index c562652..10e8c21 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LogOperateService.java +++ b/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 queryLogOperateByPager(LogOperate logOperate, Pager pager) { if(logOperate == null) { pager = PagerHelper.getPager(pager, (int) logOperateRDao.count()); diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties index de908eb..29454af 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties +++ b/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地址，多个以逗号分隔 diff --git a/pom.xml b/pom.xml index 015ddda..7d72f04 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ UTF-8 1.8 Finchley.RELEASE - INFO + DEBUG E:/i3plus-platform-logs/${project.name} E:/i3plus-platform-logs/${project.name}-error E:/i3plus-platform-logs/${project.name}-controller