From e26e8ac430d58082f7d7ced74096743f9817ceb3 Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Mon, 12 Nov 2018 16:31:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E6=96=B9=E6=B3=95=202=EF=BC=8C=E5=88=87=E9=9D=A2?= =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E8=A1=A5=E5=85=A8=E6=96=B0=E5=A2=9E=E5=92=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9A=84=E7=94=A8=E6=88=B7=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/base/SimpleController.java | 38 ---------------------- .../controller/busi/FactoryStoreController.java | 4 --- 2 files changed, 42 deletions(-) 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){ From 43770f8bccbcd7097a5f74fe91d614c752ea5fab Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Mon, 12 Nov 2018 23:31:31 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1=EF=BC=8C=E5=AF=B9=E8=B1=A1hashcode?= =?UTF-8?q?=E5=92=8Cequals=E7=BB=A7=E6=89=BF=E7=88=B6=E5=AF=B9=E8=B1=A1=20?= =?UTF-8?q?2=EF=BC=8C=E4=B8=BB=E9=94=AE=E7=94=9F=E6=88=90=E7=AD=96?= =?UTF-8?q?=E7=95=A5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/core/api/iservice/busi/ILogOperateService.java | 3 +++ .../estsh/i3plus/core/apiservice/controller/DemoMongoController.java | 3 +++ .../core/apiservice/serviceimpl/base/DataSimpleServiceImpl.java | 5 +---- .../i3plus/core/apiservice/serviceimpl/busi/LogOperateService.java | 5 +++++ 4 files changed, 12 insertions(+), 4 deletions(-) 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 2eb557b..7655330 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 @@ -55,4 +55,7 @@ public interface ILogOperateService { * @return */ List listLogOperateByOperateUserName(String operateUserName); + + //查询所有日志数量 + long countAllLogOperate(); } 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 65fe8f0..293c67c 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/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 f4c61ef..4139c9c 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 @@ -74,4 +74,9 @@ public class LogOperateService implements ILogOperateService { public List listLogOperateByOperateUserName(String operateUserName) { return logOperateRDao.findByProperty("operateUserName",operateUserName); } + + @Override + public long countAllLogOperate() { + return logOperateRDao.listCount(); + } }