From 972b6bc0645dbb93aeac58975f7a8e68402d7c04 Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Fri, 9 Nov 2018 10:53:26 +0800 Subject: [PATCH 1/6] =?UTF-8?q?base=E5=9F=BA=E7=B1=BB=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/api/iservice/base/IDataSimpleService.java | 16 +++++----- .../apiservice/controller/DemoAuthController.java | 8 ++--- .../core/apiservice/dao/IFactoryStoreDao.java | 21 ------------- .../core/apiservice/dao/IMachineFactoryDao.java | 9 +++--- .../apiservice/daoimpl/FactoryStoreDaoImpl.java | 32 -------------------- .../core/apiservice/schedulejob/DemoJob.java | 9 ++---- .../serviceimpl/base/DataSimpleServiceImpl.java | 4 +-- .../apiservice/serviceimpl/busi/ArraySort.java | 34 ++++++++++++++++++++++ 8 files changed, 53 insertions(+), 80 deletions(-) delete mode 100644 modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/dao/IFactoryStoreDao.java delete mode 100644 modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/FactoryStoreDaoImpl.java create mode 100644 modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/ArraySort.java 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 0a7cab1..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 @@ -17,32 +17,32 @@ public interface IDataSimpleService { void saveMachineFactory(MachineFactory machineFactory); - @Transactional + /*@Transactional void updateMachineFactoryNameById(long id, String factoryName); @Transactional void deleteMachineFactoryById(long id); - /** + *//** * 根据工厂名称查询 * @param factoryName * @return - */ + *//* @Transactional(readOnly = true) List findMachineFactoryByFactoryName(String factoryName); - /** + *//** * 根据code查询 * @param factoryCode * @return - */ + *//* @Transactional(readOnly = true) List findMachineFactoryByFactoryCode(String factoryCode); - /** + *//** * 特殊查询 * @return - */ + *//* @Transactional(readOnly = true) - List findMachineFactorySpecial(); + List findMachineFactorySpecial();*/ } 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 fd0bd2f..f24a71d 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 @@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.controller; import cn.estsh.i3plus.core.api.iservice.base.ISystemLoginService; import cn.estsh.i3plus.platform.common.tool.EncryptTool; +import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.impp.framework.boot.auth.AuthUtil; @@ -30,15 +31,10 @@ import java.util.Map; **/ @RestController @Api(description="登陆授权demo") -public class DemoAuthController { +public class DemoAuthController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(DemoAuthController.class); @Autowired private ISystemLoginService systemLoginService; - /** - * 缓存 - */ - @Resource(name="redisCore") - private ImppRedis imppRedis; @GetMapping(value="/login") @ApiOperation(value="登陆",notes="登陆") diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/dao/IFactoryStoreDao.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/dao/IFactoryStoreDao.java deleted file mode 100644 index 170cc54..0000000 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/dao/IFactoryStoreDao.java +++ /dev/null @@ -1,21 +0,0 @@ -package cn.estsh.i3plus.core.apiservice.dao; - -import cn.estsh.i3plus.pojo.platform.bean.FactoryStore; -import org.springframework.stereotype.Repository; - -import java.util.List; - -/** - * @Description : - * @Reference : - * @Author : alwaysfrin - * @CreateDate : 2018-09-12 14:55 - * @Modify: - **/ -@Repository -public interface IFactoryStoreDao { - - // List listFactoryStore(); - - -} 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 87cd346..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 @@ -10,17 +10,18 @@ import org.springframework.stereotype.Repository; import java.util.List; /** - * @Description : 继承了crudrepository，包含了常用hql方法 + * @Description : hql申明查询demo + * 继承了crudrepository，包含了常用hql方法 * @Reference : 如果需要执行原生sql，则添加 @Query(sql,nativeQuery=true) * @Author : alwaysfrin * @CreateDate : 2018-09-05 16:41 * @Modify: **/ -@Repository +//@Repository public interface IMachineFactoryDao extends CrudRepository { //此处findBy开头，会自动根据属性名进行查询 - List findByFactoryName(String factoryName); + /*List findByFactoryName(String factoryName); @Modifying @Query("update MachineFactory mf set mf.factoryName = :factoryName where mf.id = :id") @@ -40,5 +41,5 @@ public interface IMachineFactoryDao extends CrudRepository //自定义Hql @Query("from MachineFactory mf where mf.createDatetime like '2018-01-01%'") - List findMachineFactorySpecial(); + List findMachineFactorySpecial();*/ } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/FactoryStoreDaoImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/FactoryStoreDaoImpl.java deleted file mode 100644 index f3d5a6e..0000000 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/FactoryStoreDaoImpl.java +++ /dev/null @@ -1,32 +0,0 @@ -package cn.estsh.i3plus.core.apiservice.daoimpl; - -import cn.estsh.i3plus.core.apiservice.dao.IFactoryStoreDao; -import cn.estsh.i3plus.pojo.platform.bean.FactoryStore; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.persistence.EntityManager; -import java.util.List; - -/** - * @Description : 实现类留做备用demo，实际开发中并不需要 - * @Reference : - * @Author : alwaysfrin - * @CreateDate : 2018-09-12 15:35 - * @Modify: - **/ -@Service -public class FactoryStoreDaoImpl implements IFactoryStoreDao { - - @Autowired - private EntityManager entityManager; - - /*public List listFactoryStore(){ - List list = entityManager.createQuery("from FactoryStore").getResultList(); - - for(FactoryStore fs : list){ - fs.setStoreCode(""); - } - return list; - }*/ -} 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 232fb58..6581bb5 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,16 +1,11 @@ package cn.estsh.i3plus.core.apiservice.schedulejob; -import cn.estsh.impp.framework.base.BaseImppScheduleJob; -import cn.estsh.impp.framework.boot.core.ApplicationProperties; -import cn.estsh.impp.framework.boot.quartz.job.ImppJob; +import cn.estsh.impp.framework.base.schedule.BaseImppScheduleJob; +import cn.estsh.impp.framework.boot.init.ApplicationProperties; import io.swagger.annotations.ApiOperation; -import org.quartz.Job; import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; /** * @Description : 定时任务 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 236b1dc..6c17061 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 @@ -32,7 +32,7 @@ public class DataSimpleServiceImpl implements IDataSimpleService { machineFactory.setId(new SnowflakeIdMaker().nextId()); machineFactoryDao.save(machineFactory); } - +/* @Override public void updateMachineFactoryNameById(long id, String factoryName) { machineFactoryDao.updateMachineFactoryNameById(id,factoryName); @@ -59,5 +59,5 @@ public class DataSimpleServiceImpl implements IDataSimpleService { @Override public List findMachineFactorySpecial() { return machineFactoryDao.findMachineFactorySpecial(); - } + }*/ } diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/ArraySort.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/ArraySort.java new file mode 100644 index 0000000..5d501bb --- /dev/null +++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/ArraySort.java @@ -0,0 +1,34 @@ +package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; + +/** + * @Description : + * @Reference : + * @Author : alwaysfrin + * @CreateDate : 2018-11-09 10:00 + * @Modify: + **/ +public class ArraySort implements Runnable { + + private String num; + + public ArraySort(int num){ + this.num = num + ""; + } + + public static void main(String[] args){ + int[] num = {11,3,9,5,1,4,15}; + for(int i=0;i Date: Fri, 9 Nov 2018 13:20:52 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=B7=A5=E5=85=B7=E7=B1=BB=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/core/apiservice/mq/I3CoreQueueReceiver.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/I3CoreQueueReceiver.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/I3CoreQueueReceiver.java index c2a4f97..247762c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/I3CoreQueueReceiver.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/I3CoreQueueReceiver.java @@ -1,6 +1,4 @@ package cn.estsh.i3plus.core.apiservice.mq; - -import cn.estsh.i3plus.core.apiservice.controller.DemoRestController; import cn.estsh.i3plus.pojo.platform.bean.SysMessage; import com.rabbitmq.client.Channel; import org.slf4j.Logger; 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 3/6] =?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 4/6] =?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(); + } } From ae0e8392ac4a0ec7bfd85025eaddb1c4b1950a8b Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Tue, 13 Nov 2018 09:56:00 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=97=A5=E5=BF=97=20?= =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=AE=8C=E6=88=90=20=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E6=97=A5=E5=BF=97=20=E5=85=A8=E9=83=A8=E5=AE=8C=E6=88=90=20?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=AF=AD=E8=A8=80=20=E5=85=A8=E9=83=A8?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/api/iservice/busi/ILogOperateService.java | 30 +++- .../core/api/iservice/busi/ILogSystemService.java | 27 ++-- .../iservice/busi/ISysLocaleLanguageService.java | 39 +++++ .../iservice/busi/ISysLocaleResourceService.java | 36 +++++ .../apiservice/controller/DemoMongoController.java | 4 +- .../apiservice/controller/busi/EnumController.java | 6 +- .../controller/busi/LogOperateController.java | 22 ++- .../controller/busi/LogSystemController.java | 32 +++- .../controller/busi/SysDictionaryController.java | 6 +- .../busi/SysLocaleLanguageController.java | 163 +++++++++++++++++++++ .../busi/SysLocaleResourceController.java | 151 +++++++++++++++++++ .../controller/busi/SysMessageController.java | 5 + .../apiservice/controller/busi/ToolController.java | 3 +- .../serviceimpl/busi/LogOperateService.java | 34 +++-- .../serviceimpl/busi/LogSystemService.java | 21 +++ .../serviceimpl/busi/SysDictionaryService.java | 2 +- .../serviceimpl/busi/SysLocaleLanguageService.java | 112 ++++++++++++++ .../serviceimpl/busi/SysLocaleResourceService.java | 103 +++++++++++++ .../serviceimpl/busi/SystemResourceService.java | 8 +- 19 files changed, 736 insertions(+), 68 deletions(-) create mode 100644 modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLocaleLanguageService.java create mode 100644 modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLocaleResourceService.java create mode 100644 modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleLanguageController.java create mode 100644 modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java create mode 100644 modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleLanguageService.java create mode 100644 modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java 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..df53fab 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 @@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.api.iservice.busi; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.platform.bean.LogOperate; +import io.swagger.annotations.ApiOperation; import java.util.List; @@ -20,26 +21,28 @@ public interface ILogOperateService { * @param logOperate * @return */ + @ApiOperation(value = "添加操作日志",notes = "添加操作日志") LogOperate insertLogOperate(LogOperate logOperate); /** - * 查询操作日志 - * @param logOperate - * @param pager - * @return - */ - ListPager listLogOperate(LogOperate logOperate, Pager pager); - - /** * 根据id删除日志 * @param id */ + @ApiOperation(value = "根据id删除日志",notes = "根据id删除日志") void deleteLogOperateById(long id); /** + * 查询全部操作日志 + * @return + */ + @ApiOperation(value = "查询全部操作日志",notes = "查询全部操作日志") + List listLogOperate(); + + /** * 批量删除日志 * @param ids */ + @ApiOperation(value = "批量删除日志",notes = "批量删除日志") void deleteLogOperateByIds(String[] ids); /** @@ -47,6 +50,7 @@ public interface ILogOperateService { * @param id * @return */ + @ApiOperation(value = "根据id查询操作日志",notes = "根据id查询操作日志") LogOperate getLogOperateById(long id); /** @@ -54,5 +58,15 @@ public interface ILogOperateService { * @param operateUserName * @return */ + @ApiOperation(value = "根据操作人姓名模糊查询日志",notes = "根据操作人姓名模糊查询日志") List listLogOperateByOperateUserName(String operateUserName); + + /** + * 操作日志复杂查询，分页，排序 + * @param logOperate + * @param pager + * @return + */ + @ApiOperation(value = "操作日志复杂查询，分页，排序",notes = "操作日志复杂查询，分页，排序") + ListPager queryLogOperateByPager(LogOperate logOperate, Pager pager); } diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ILogSystemService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ILogSystemService.java index 12db2ad..43e6a9f 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ILogSystemService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ILogSystemService.java @@ -1,6 +1,9 @@ package cn.estsh.i3plus.core.api.iservice.busi; +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.platform.bean.LogSystem; +import io.swagger.annotations.ApiOperation; import java.util.List; @@ -13,28 +16,18 @@ import java.util.List; **/ public interface ILogSystemService { - /** - * 添加系统日志 - * @param logSystem - */ + @ApiOperation(value = "添加系统日志",notes = "添加系统日志") void insertLogSystem(LogSystem logSystem); - /** - * 删除日志 - * @param id - */ + @ApiOperation(value = "删除日志",notes = "删除日志") void deleteLogSystemById(String id); - /** - * 查询全部日志 - * @return - */ + @ApiOperation(value = "查询全部日志",notes = "查询全部日志") List listLogSystem(); - /** - * 根据id查询系统日志 - * @param id - * @return - */ + @ApiOperation(value = "根据id查询系统日志",notes = "根据id查询系统日志") LogSystem getLogSystemById(long id); + + @ApiOperation(value = "系统日志分页复杂查询",notes = "系统日志分页复杂查询") + ListPager queryLogSystemByPager(LogSystem logSystem, Pager pager); } diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLocaleLanguageService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLocaleLanguageService.java new file mode 100644 index 0000000..b15f05e --- /dev/null +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLocaleLanguageService.java @@ -0,0 +1,39 @@ +package cn.estsh.i3plus.core.api.iservice.busi; + +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.platform.bean.SysLocaleLanguage; +import io.swagger.annotations.ApiOperation; + +import java.util.List; + +/** + * @Description : 系统语言管理 + * @Reference : + * @Author : yunhao + * @CreateDate : 2018-11-12 11:53 + * @Modify: + **/ +public interface ISysLocaleLanguageService { + + @ApiOperation(value = "添加系统语言",notes = "添加系统语言") + SysLocaleLanguage insertSysLocaleLanguage(SysLocaleLanguage sysLocaleLanguage); + + @ApiOperation(value = "修改系统语言",notes = "修改系统语言") + void updateSysLocaleLanguage(SysLocaleLanguage sysLocaleLanguage); + + @ApiOperation(value = "根据id删除系统语言",notes = "根据id删除系统语言") + void deleteSysLocaleLanguageById(String idStr); + + @ApiOperation(value = "查询全部系统语言",notes = "查询全部系统语言") + List listSysLocaleLanguage(); + + @ApiOperation(value = "系统语言复杂查询，分页，排序",notes = "系统语言复杂查询，分页，排序") + ListPager querySysLocaleLanguageByPager(SysLocaleLanguage sysLocaleLanguage, Pager pager); + + @ApiOperation(value = "根据id批量删除系统语言",notes = "根据id批量删除系统语言") + void deleteSysLocaleLanguageByIds(String[] idsStr); + + @ApiOperation(value = "设置默认语言",notes = "设置默认语言") + void updateSysLocaleLanguageDefaultById(String idStr); +} diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLocaleResourceService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLocaleResourceService.java new file mode 100644 index 0000000..7cf3500 --- /dev/null +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLocaleResourceService.java @@ -0,0 +1,36 @@ +package cn.estsh.i3plus.core.api.iservice.busi; + +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.platform.bean.SysLocaleResource; +import io.swagger.annotations.ApiOperation; + +import java.util.List; + +/** + * @Description : 系统语言资源接口 + * @Reference : + * @Author : yunhao + * @CreateDate : 2018-11-12 13:32 + * @Modify: + **/ +public interface ISysLocaleResourceService { + + @ApiOperation(value = "新增系统资源",notes = "新增系统资源") + SysLocaleResource insertSysLocaleResource(SysLocaleResource sysLocaleResource); + + @ApiOperation(value = "修改系统资源",notes = "修改系统资源") + void updateSysLocaleResource(SysLocaleResource sysLocaleResource); + + @ApiOperation(value = "根据id删除系统资源",notes = "根据id删除系统资源") + void deleteSysLocaleResourceById(String idStr); + + @ApiOperation(value = "查询全部系统资源",notes = "查询全部系统资源") + List listSysLocaleResource(); + + @ApiOperation(value = "系统资源复杂查询，分页，排序",notes = "系统资源复杂查询，分页，排序") + ListPager querySysLocaleResourceByPager(SysLocaleResource sysLocaleResource, Pager pager); + + @ApiOperation(value = "根据id批量删除",notes = "根据id批量删除") + void deleteSysLocaleResourceByIds(String[] idsStr); +} 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..549c36b 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 @@ -84,8 +84,8 @@ public class DemoMongoController { @ApiOperation(value="查询日志",notes = "查询日志") public ResultBean queryLanguage(LogOperate logOperate,Pager pager) { try { - ListPager logList = logOperateService.listLogOperate(logOperate,pager); - return ResultBean.success("操作成功").setListPager(logList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + List logList = logOperateService.listLogOperate(); + return ResultBean.success("操作成功").setResultList(logList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); return ResultBean.fail(busExcep.getErrorShow()); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/EnumController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/EnumController.java index eace040..80d72da 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/EnumController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/EnumController.java @@ -90,11 +90,11 @@ public class EnumController { Arrays.asList(CommonEnumUtil.SOFT_TYPE.values())); } - @GetMapping("/log-type") + @GetMapping("/operate-type") @ApiOperation(value = "操作日志类型", notes = "操作日志类型") - public ResultBean getLogType(){ + public ResultBean getOperateType(){ return new ResultBean(true, "操作成功", - Arrays.asList(ImppEnumUtil.LOG_LEVEL.values())); + Arrays.asList(ImppEnumUtil.OPERATE_TYPE.values())); } @GetMapping("/user-message-status") diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/LogOperateController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/LogOperateController.java index af480c6..1d5888b 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/LogOperateController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/LogOperateController.java @@ -1,8 +1,10 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ILogOperateService; +import cn.estsh.i3plus.core.apiservice.serviceimpl.busi.LogOperateService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.pojo.base.bean.ListPager; +import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.LogOperate; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; @@ -80,10 +82,8 @@ public class LogOperateController { @ApiOperation(value = "查询全部操作日志",notes = "查询全部操作日志") public ResultBean findLogOperateAll(){ try { - ListPager logOperateList = logOperateService.listLogOperate(null,null); - return ResultBean.success("查询成功") - .setListPager(logOperateList) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + List logOperateList = logOperateService.listLogOperate(); + return ResultBean.success("查询成功").setResultList(logOperateList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); return ResultBean.fail(busExcep.getErrorShow()); @@ -116,4 +116,18 @@ public class LogOperateController { } } + @GetMapping(value = "/query") + @ApiOperation(value = "操作日志复杂查询，分页，排序",notes = "操作日志复杂查询，分页，排序") + public ResultBean queryLogOperateByPager(LogOperate logOperate, Pager pager){ + try { + ListPager logSystemList = logOperateService.queryLogOperateByPager(logOperate, pager); + return ResultBean.success("查询成功").setListPager(logSystemList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); + return ResultBean.fail(busExcep.getErrorShow()); + }catch(Exception e){ + LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e); + return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + } + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/LogSystemController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/LogSystemController.java index 23a791c..c5da2b7 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/LogSystemController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/LogSystemController.java @@ -2,6 +2,8 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ILogSystemService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.LogSystem; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; @@ -92,14 +94,12 @@ public class LogSystemController { } } - @GetMapping(value = "/get-by-id") - @ApiOperation(value = "根据id查询系统日志") + @GetMapping(value = "/get") + @ApiOperation(value = "根据id查询系统日志",notes = "根据id查询系统日志") public ResultBean getLogSystemById(String id){ try { LogSystem logSystem = logSystemService.getLogSystemById(Long.parseLong(id)); - return ResultBean.success("查询成功") - .setResultObject(logSystem) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("查询成功").setResultObject(logSystem).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); return ResultBean.fail(busExcep.getErrorShow()); @@ -109,6 +109,24 @@ public class LogSystemController { } } - - + /** + * 系统日志分页复杂查询 + * @param logSystem + * @param pager + * @return + */ + @GetMapping("/query") + @ApiOperation(value = "系统日志分页复杂查询",notes = "系统日志分页复杂查询") + public ResultBean queryLogSystemByPager(LogSystem logSystem, Pager pager){ + try { + ListPager logSystemList = logSystemService.queryLogSystemByPager(logSystem, pager); + return ResultBean.success("查询成功").setListPager(logSystemList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); + return ResultBean.fail(busExcep.getErrorShow()); + }catch(Exception e){ + LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e); + return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + } + } } 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 b30b78e..6b01558 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 @@ -50,8 +50,7 @@ public class SysDictionaryController { ValidatorBean.beginValid(sysDictionary) .notNull("name",sysDictionary.getName()) .notNull("dictionaryCode",sysDictionary.getDictionaryCode()) - .notNull("dictionaryValue",sysDictionary.getDictionaryValue()) - .notNull("dictionarySort",sysDictionary.getDictionarySort()); + .notNull("dictionaryValue",sysDictionary.getDictionaryValue()); //新增初始化 ConvertBean.modelInitialize(sysDictionary,user); @@ -78,8 +77,7 @@ public class SysDictionaryController { ValidatorBean.beginValid(sysDictionary) .notNull("name",sysDictionary.getName()) .notNull("dictionaryCode",sysDictionary.getDictionaryCode()) - .notNull("dictionaryValue",sysDictionary.getDictionaryValue()) - .notNull("dictionarySort",sysDictionary.getDictionarySort()); + .notNull("dictionaryValue",sysDictionary.getDictionaryValue()); //修改初始化 ConvertBean.modelUpdate(sysDictionary,user); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleLanguageController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleLanguageController.java new file mode 100644 index 0000000..617c4a6 --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleLanguageController.java @@ -0,0 +1,163 @@ +package cn.estsh.i3plus.core.apiservice.controller.busi; + +import cn.estsh.i3plus.core.api.iservice.busi.ISysLocaleLanguageService; +import cn.estsh.i3plus.platform.common.convert.ConvertBean; +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.SysLocaleLanguage; +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.exception.ImppExceptionEnum; +import cn.estsh.impp.framework.boot.util.ResultBean; +import cn.estsh.impp.framework.boot.util.ValidatorBean; +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.*; + +import java.util.List; + +/** + * @Description : 系统语言服务 + * @Reference : + * @Author : yunhao + * @CreateDate : 2018-11-12 15:15 + * @Modify: + **/ +@RestController +@RequestMapping("/sys-locale-language") +@Api(description = "系统语言服务") +public class SysLocaleLanguageController extends CoreBaseController { + public static final Logger LOGGER = LoggerFactory.getLogger(SysFileController.class); + + @Autowired + private ISysLocaleLanguageService sysLocaleLanguageService; + + @PostMapping(value = "/insert") + @ApiOperation(value = "添加系统语言",notes = "添加系统语言") + public ResultBean insertSysLocaleLanguage(SysLocaleLanguage sysLocaleLanguage){ + try { + //条件验证 + ValidatorBean.beginValid(sysLocaleLanguage) + .notNull("languageName", sysLocaleLanguage.getLanguageName()) + .notNull("languageCode", sysLocaleLanguage.getLanguageCode()); + + //新增初始化 +// ConvertBean.modelInitialize(sysLocaleLanguage, sessionUser); + sysLocaleLanguage.setIsDefault(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); + + sysLocaleLanguageService.insertSysLocaleLanguage(sysLocaleLanguage); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep.getErrorShow()); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @PutMapping(value = "/update") + @ApiOperation(value = "修改系统语言",notes = "修改系统语言") + public ResultBean updateSysLocaleLanguage(SysLocaleLanguage sysLocaleLanguage){ + try { + //条件验证 + ValidatorBean.beginValid(sysLocaleLanguage) + .checkNotZero("id",sysLocaleLanguage.getId()) + .notNull("languageName", sysLocaleLanguage.getLanguageName()) + .notNull("languageCode", sysLocaleLanguage.getLanguageCode()); + + //修改初始化 +// ConvertBean.modelUpdate(sysLocaleLanguage, sessionUser); + + sysLocaleLanguageService.insertSysLocaleLanguage(sysLocaleLanguage); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep.getErrorShow()); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @DeleteMapping(value = "/delete/{id}") + @ApiOperation(value = "根据id删除系统语言",notes = "根据id删除系统语言") + public ResultBean deleteSysLocaleLanguageById(@PathVariable("id") String idStr){ + try { + //条件验证 + ValidatorBean.checkNotNull(idStr,"id不能为空"); + + sysLocaleLanguageService.deleteSysLocaleLanguageById(idStr); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep.getErrorShow()); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @GetMapping(value = "/list") + @ApiOperation(value = "查询全部系统语言",notes = "查询全部系统语言") + public ResultBean listSysLocaleLanguage(){ + try { + List sysLocaleLanguageList = sysLocaleLanguageService.listSysLocaleLanguage(); + return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(sysLocaleLanguageList); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep.getErrorShow()); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @GetMapping(value = "/query") + @ApiOperation(value = "系统语言复杂查询，分页，排序",notes = "系统语言复杂查询，分页，排序") + public ResultBean querySysLocaleLanguageByPager(SysLocaleLanguage sysLocaleLanguage, Pager pager){ + try { + ListPager sysLocaleLanguageListPager = sysLocaleLanguageService.querySysLocaleLanguageByPager(sysLocaleLanguage,pager); + return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setListPager(sysLocaleLanguageListPager); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep.getErrorShow()); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @PutMapping("/default/{id}") + @ApiOperation(value = "设置默认语言",notes = "设置默认语言") + public ResultBean updateSysLocaleLanguageDefaultById(@PathVariable("id") String idStr){ + try { + //条件验证 + ValidatorBean.checkNotNull(idStr,"id不能为空"); + + sysLocaleLanguageService.updateSysLocaleLanguageDefaultById(idStr); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep.getErrorShow()); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @DeleteMapping("/batch-delete") + @ApiOperation(value = "根据id批量删除") + public ResultBean deleteSysLocaleLanguageByIds(String[] idsStr){ + try { + if(idsStr.length == 0){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("请选择需要删除的资源。") + .build(); + } + + sysLocaleLanguageService.deleteSysLocaleLanguageByIds(idsStr); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep.getErrorShow()); + }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/SysLocaleResourceController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java new file mode 100644 index 0000000..4767b18 --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java @@ -0,0 +1,151 @@ +package cn.estsh.i3plus.core.apiservice.controller.busi; + +import cn.estsh.i3plus.core.api.iservice.busi.ISysLocaleResourceService; +import cn.estsh.i3plus.platform.common.convert.ConvertBean; +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.SysLocaleResource; +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.exception.ImppExceptionEnum; +import cn.estsh.impp.framework.boot.util.ResultBean; +import cn.estsh.impp.framework.boot.util.ValidatorBean; +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.*; + +import java.util.List; + +/** + * @Description :系统语言资源服务 + * @Reference : + * @Author : yunhao + * @CreateDate : 2018-11-12 16:34 + * @Modify: + **/ +@RestController +@RequestMapping("/sys-locale-resource") +@Api(description = "系统语言资源服务") +public class SysLocaleResourceController extends CoreBaseController { + public static final Logger LOGGER = LoggerFactory.getLogger(SysFileController.class); + + @Autowired + private ISysLocaleResourceService sysLocaleResourceService; + + @PostMapping(value = "/insert") + @ApiOperation(value = "新增语言资源",notes = "新增语言资源") + public ResultBean insertSysLocaleResource(SysLocaleResource sysLocaleResource){ + try { + //条件验证 + ValidatorBean.beginValid(sysLocaleResource) + .notNull("resourceKey",sysLocaleResource.getResourceKey()) + .notNull("languageCode",sysLocaleResource.getLanguageCode()) + .checkNotZero("resourceType",sysLocaleResource.getResourceType()) + .notNull("resourceValue",sysLocaleResource.getResourceValue()); + + //新增初始化 + ConvertBean.modelInitialize(sysLocaleResource, sessionUser); + sysLocaleResource.setIsSystem(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); + + sysLocaleResourceService.insertSysLocaleResource(sysLocaleResource); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep.getErrorShow()); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @PutMapping(value = "/update") + @ApiOperation(value = "修改语言资源",notes = "修改语言资源") + public ResultBean updateSysLocaleResource(SysLocaleResource sysLocaleResource){ + try { + //条件验证 + ValidatorBean.beginValid(sysLocaleResource) + .checkNotZero("id",sysLocaleResource.getId()) + .notNull("resourceKey",sysLocaleResource.getResourceKey()) + .notNull("languageCode",sysLocaleResource.getLanguageCode()) + .checkNotZero("resourceType",sysLocaleResource.getResourceType()) + .notNull("resourceValue",sysLocaleResource.getResourceValue()); + + //修改初始化 + ConvertBean.modelUpdate(sysLocaleResource, sessionUser); + + sysLocaleResourceService.insertSysLocaleResource(sysLocaleResource); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep.getErrorShow()); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @DeleteMapping(value = "/delete/{id}") + @ApiOperation(value = "根据id删除系统语言资源",notes = "根据id删除系统语言资源") + public ResultBean deleteSysLocaleResourceById(@PathVariable("id") String idStr){ + try { + //条件验证 + ValidatorBean.checkNotNull(idStr,"id不能为空"); + + sysLocaleResourceService.deleteSysLocaleResourceById(idStr); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep.getErrorShow()); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @GetMapping(value = "/list") + @ApiOperation(value = "查询全部语言资源",notes = "查询全部语言资源") + public ResultBean listSysLocaleResource(){ + try { + List sysLocaleLanguageList = sysLocaleResourceService.listSysLocaleResource(); + return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(sysLocaleLanguageList); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep.getErrorShow()); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @GetMapping(value = "/query") + @ApiOperation(value = "语言资源复杂查询，分页，排序",notes = "语言资源复杂查询，分页，排序") + public ResultBean querySysLocaleResourceByPager(SysLocaleResource sysLocaleResource, Pager pager){ + try { + ListPager sysLocaleLanguageListPager = sysLocaleResourceService.querySysLocaleResourceByPager(sysLocaleResource,pager); + return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setListPager(sysLocaleLanguageListPager); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep.getErrorShow()); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @DeleteMapping(value = "/batch-delete") + @ApiOperation(value = "批量删除系统语言资源",notes = "批量删除系统语言资源") + public ResultBean deleteSysLocaleResourceByIds(String[] idsStr){ + try { + if(idsStr.length == 0){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("请选择需要删除的资源。") + .build(); + } + + sysLocaleResourceService.deleteSysLocaleResourceByIds(idsStr); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep.getErrorShow()); + }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/SysMessageController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java index a58ed30..a9caf41 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 @@ -188,6 +188,8 @@ public class SysMessageController { @ApiOperation(value = "批量删除消息",notes = "批量删除消息") public ResultBean deleteSysMessageByIds(String[] ids){ try{ + // 条件判断 + ids = ConvertBean.modelSafeArrayNumber(ids,true); if(ids.length == 0){ throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) @@ -210,6 +212,9 @@ public class SysMessageController { @ApiOperation(value = "批量切换消息状态",notes = "批量切换消息状态") public ResultBean updateSysMessageStatusByIds(String[] ids,Integer status){ try{ + // 条件判断 + ValidatorBean.checkNotZero(status,"状态不能为空"); + ids = ConvertBean.modelSafeArrayNumber(ids,true); if(ids.length == 0){ throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ToolController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ToolController.java index aac880d..ecd33c5 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ToolController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ToolController.java @@ -91,10 +91,9 @@ public class ToolController { // 修改初始化 ConvertBean.modelUpdate(tool,user); - // TODO 状态 status toolService.updateTool(tool); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); return ResultBean.fail(busExcep.getErrorShow()); 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..c562652 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 @@ -7,6 +7,7 @@ import cn.estsh.i3plus.pojo.base.common.PagerHelper; import cn.estsh.i3plus.pojo.base.tool.BsonPackTool; import cn.estsh.i3plus.pojo.platform.bean.LogOperate; import cn.estsh.i3plus.pojo.platform.repositorymongo.LogOperateRepository; +import cn.estsh.i3plus.pojo.platform.sqlpack.CoreBsonPack; import com.mongodb.client.model.Filters; import org.bson.conversions.Bson; import org.slf4j.Logger; @@ -37,25 +38,13 @@ public class LogOperateService implements ILogOperateService { } @Override - public ListPager listLogOperate(LogOperate logOperate, Pager pager) { - if(logOperate == null) { - return new ListPager(logOperateRDao.findAll(),pager); - }else{ - Bson bson = null; - BsonPackTool.getStringLikerPack(logOperate.getCreateUser(),"createUser",bson); - BsonPackTool.timeBuilder(logOperate.getCreateDateTimeStart(),logOperate.getCreateDateTimeEnd(),"reateDateTime",bson,false); - BsonPackTool.getNumEqualPack(logOperate.getOperateModuleId(),"operateModuleId",bson); - BsonPackTool.getNumEqualPack(logOperate.getOperateTypeId(),"operateTypeId",bson); - - pager = PagerHelper.getPager(pager,(int)logOperateRDao.findByBsonCount(bson)); - //分页，排序 - return new ListPager(logOperateRDao.findByBsonPager(bson,pager,logOperate.getOrderByParam(),logOperate.getAscOrDesc()),pager); - } + public void deleteLogOperateById(long id) { + logOperateRDao.deleteById(id); } @Override - public void deleteLogOperateById(long id) { - logOperateRDao.deleteById(id); + public List listLogOperate() { + return logOperateRDao.listPager(null); } @Override @@ -74,4 +63,17 @@ public class LogOperateService implements ILogOperateService { public List listLogOperateByOperateUserName(String operateUserName) { return logOperateRDao.findByProperty("operateUserName",operateUserName); } + + @Override + public ListPager queryLogOperateByPager(LogOperate logOperate, Pager pager) { + if(logOperate == null) { + pager = PagerHelper.getPager(pager, (int) logOperateRDao.count()); + return new ListPager(logOperateRDao.findAll(),pager); + }else{ + Bson bson = CoreBsonPack.packBsonByLogOperate(logOperate); + pager = PagerHelper.getPager(pager,(int)logOperateRDao.findByBsonCount(bson)); + //分页，排序 + return new ListPager(logOperateRDao.findByBsonPager(bson,pager,logOperate.getOrderByParam(),logOperate.getAscOrDesc()),pager); + } + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LogSystemService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LogSystemService.java index a2f5091..3c1aa7a 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LogSystemService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LogSystemService.java @@ -1,13 +1,20 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.busi.ILogSystemService; +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.platform.bean.LogSystem; import cn.estsh.i3plus.pojo.platform.repositorymongo.LogSystemRepository; +import cn.estsh.i3plus.pojo.platform.sqlpack.CoreBsonPack; +import io.swagger.annotations.ApiOperation; +import org.bson.conversions.Bson; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; /** @@ -47,4 +54,18 @@ public class LogSystemService implements ILogSystemService { LOGGER.info("系统日志 LOG_SYSTEM id:{}",id); return logSystemRDao.getById(id); } + + @Override + public ListPager queryLogSystemByPager(LogSystem logSystem, Pager pager) { + LOGGER.info("系统日志 LOG_SYSTEM logSystem:{}，Pager:{}",logSystem,pager); + if (logSystem == null) { + pager = PagerHelper.getPager(pager,(int) logSystemRDao.listCount()); + return new ListPager(logSystemRDao.listPager(pager),pager); + } else { + Bson bson = CoreBsonPack.packBsonByLogSystem(logSystem); + pager = PagerHelper.getPager(pager, (int) logSystemRDao.findByBsonCount(bson)); + return new ListPager(logSystemRDao.findByBsonPager(bson,pager,logSystem.getOrderByParam() + ,logSystem.getAscOrDesc()),pager); + } + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java index a8ae70b..8ef9222 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java @@ -75,7 +75,7 @@ public class SysDictionaryService implements ISysDictionaryService { if (repeatCount > 0){ throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) - .setErrorCode(ImppExceptionEnum.IO_EXCEPTION.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) .setErrorDetail("字典代码已存在") .setErrorSolution("请重新输入字典代码") .build(); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleLanguageService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleLanguageService.java new file mode 100644 index 0000000..e847664 --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleLanguageService.java @@ -0,0 +1,112 @@ +package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; + +import cn.estsh.i3plus.core.api.iservice.busi.ISysLocaleLanguageService; +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.SysLocaleLanguage; +import cn.estsh.i3plus.pojo.platform.repository.SysLocaleLanguageRepository; +import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; +import cn.estsh.impp.framework.base.service.IBaseService; +import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; +import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @Description :系统语言 + * @Reference : + * @Author : yunhao + * @CreateDate : 2018-11-12 13:48 + * @Modify: + **/ +@Service +public class SysLocaleLanguageService implements ISysLocaleLanguageService { + public static final Logger LOGGER = LoggerFactory.getLogger(SysLocaleLanguageService.class); + + @Autowired + private SysLocaleLanguageRepository sysLocaleLanguageRDao; + + @Override + public SysLocaleLanguage insertSysLocaleLanguage(SysLocaleLanguage sysLocaleLanguage) { + LOGGER.info("系统语言 SYS_LOCALE_LANGUAGE SysLocaleLanguage:{}",sysLocaleLanguage); + int count = sysLocaleLanguageRDao.findByPropertyCount("languageCode",sysLocaleLanguage.getLanguageCode()); + if (count > 0){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) + .setErrorDetail("语言代码已存在") + .setErrorSolution("请重新输入语言代码") + .build(); + } + + return sysLocaleLanguageRDao.insert(sysLocaleLanguage); + } + + @Override + public void updateSysLocaleLanguage(SysLocaleLanguage sysLocaleLanguage) { + LOGGER.info("系统语言 SYS_LOCALE_LANGUAGE SysLocaleLanguage:{}",sysLocaleLanguage); + String hqlPack = CoreHqlPack.packHqlSysLocaleLanguageCode(sysLocaleLanguage); + int count = sysLocaleLanguageRDao.findByHqlWhereCount(hqlPack); + if (count > 0){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) + .setErrorDetail("语言代码已存在") + .setErrorSolution("请重新输入语言代码") + .build(); + } + + sysLocaleLanguageRDao.update(sysLocaleLanguage); + } + + @Override + public void deleteSysLocaleLanguageById(String idStr) { + LOGGER.info("系统语言 SYS_LOCALE_LANGUAGE id:{}",idStr); + sysLocaleLanguageRDao.deleteById(Long.parseLong(idStr)); + } + + @Override + public List listSysLocaleLanguage() { + LOGGER.info("系统语言 SYS_LOCALE_LANGUAGE list"); + return sysLocaleLanguageRDao.list(); + } + + @Override + public ListPager querySysLocaleLanguageByPager(SysLocaleLanguage sysLocaleLanguage, Pager pager) { + LOGGER.info("系统语言 SYS_LOCALE_LANGUAGE sysLocaleLanguage:{},Pager:{}",sysLocaleLanguage,pager); + if(sysLocaleLanguage == null) { + pager = PagerHelper.getPager(pager, sysLocaleLanguageRDao.listCount()); + return new ListPager(sysLocaleLanguageRDao.listPager(pager),pager); + }else { + String hqlPack = CoreHqlPack.packHqlSysLocaleLanguage(sysLocaleLanguage); + pager = PagerHelper.getPager(pager, sysLocaleLanguageRDao.findByHqlWhereCount(hqlPack)); + return new ListPager(sysLocaleLanguageRDao.findByHqlWherePage(hqlPack + sysLocaleLanguage.orderBy(),pager),pager); + } + } + + @Override + public void deleteSysLocaleLanguageByIds(String[] idsStr) { + LOGGER.info("系统语言 SYS_LOCALE_LANGUAGE ids:{}",idsStr); + Long[] array = new Long[idsStr.length]; + for (int i = 0; i < idsStr.length; i++) { + array[i] = Long.parseLong(idsStr[i]); + } + + sysLocaleLanguageRDao.deleteByIds(array); + } + + @Override + public void updateSysLocaleLanguageDefaultById(String idStr) { + LOGGER.info("系统语言 SYS_LOCALE_LANGUAGE ids:{}",idStr); + sysLocaleLanguageRDao.updateByHqlWhere("and 1=1","isDefault",CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); + + sysLocaleLanguageRDao.updateByProperties("id",Long.parseLong(idStr), + "isDefault",CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); + } +} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java new file mode 100644 index 0000000..e7934a1 --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java @@ -0,0 +1,103 @@ +package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; + +import cn.estsh.i3plus.core.api.iservice.busi.ISysLocaleResourceService; +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.SysLocaleResource; +import cn.estsh.i3plus.pojo.platform.repository.SysLocaleResourceRepository; +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 org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @Description : 系统资源 + * @Reference : + * @Author : yunhao + * @CreateDate : 2018-11-12 14:46 + * @Modify: + **/ +@Service +public class SysLocaleResourceService implements ISysLocaleResourceService { + public static final Logger LOGGER = LoggerFactory.getLogger(SysLocaleLanguageService.class); + + @Autowired + private SysLocaleResourceRepository sysLocaleResourceRDao; + + @Override + public SysLocaleResource insertSysLocaleResource(SysLocaleResource sysLocaleResource) { + LOGGER.info("系统资源 SYS_LOCALE_RESOURCE SysLocaleResource：{}",sysLocaleResource); + int count = sysLocaleResourceRDao.findByPropertyCount(new String[]{"language_code","resource_key"}, + new String[]{sysLocaleResource.getLanguageCode(),sysLocaleResource.getResourceKey()}); + if (count > 0){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) + .setErrorDetail("语言资源已存在") + .setErrorSolution("请重新输入语言代码与资源键") + .build(); + } + + return sysLocaleResourceRDao.insert(sysLocaleResource); + } + + @Override + public void updateSysLocaleResource(SysLocaleResource sysLocaleResource) { + LOGGER.info("系统资源 SYS_LOCALE_RESOURCE SysLocaleResource：{}",sysLocaleResource); + String hqlPack = CoreHqlPack.packHqlSysLocaleResourceKey(sysLocaleResource); + int count = sysLocaleResourceRDao.findByHqlWhereCount(hqlPack); + if (count > 0){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) + .setErrorDetail("语言资源已存在") + .setErrorSolution("请重新输入语言代码与资源键") + .build(); + } + + sysLocaleResourceRDao.update(sysLocaleResource); + } + + @Override + public void deleteSysLocaleResourceById(String idStr) { + LOGGER.info("系统资源 SYS_LOCALE_RESOURCE id：{}",idStr); + sysLocaleResourceRDao.deleteById(Long.parseLong(idStr)); + } + + @Override + public List listSysLocaleResource() { + LOGGER.info("系统资源 SYS_LOCALE_RESOURCE list"); + return sysLocaleResourceRDao.list(); + } + + @Override + public ListPager querySysLocaleResourceByPager(SysLocaleResource sysLocaleResource, Pager pager) { + LOGGER.info("系统资源 SYS_LOCALE_RESOURCE SysLocaleResource：{}，Pager：{}",sysLocaleResource,pager); + if(sysLocaleResourceRDao == null) { + pager = PagerHelper.getPager(pager, sysLocaleResourceRDao.listCount()); + return new ListPager(sysLocaleResourceRDao.listPager(pager),pager); + }else { + String hqlPack = CoreHqlPack.packHqlSysLocaleResource(sysLocaleResource); + pager = PagerHelper.getPager(pager, sysLocaleResourceRDao.findByHqlWhereCount(hqlPack)); + return new ListPager(sysLocaleResourceRDao.findByHqlWherePage(hqlPack + sysLocaleResource.orderBy(),pager),pager); + } + } + + @Override + public void deleteSysLocaleResourceByIds(String[] idsStr) { + LOGGER.info("系统资源 SYS_LOCALE_RESOURCE ids：{}",idsStr); + Long[] ids = new Long[idsStr.length]; + for (int i = 0; i < idsStr.length; i++) { + ids[i] = Long.parseLong(idsStr[i]); + } + + sysLocaleResourceRDao.deleteByIds(ids); + } +} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SystemResourceService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SystemResourceService.java index bb890bf..3df7da0 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SystemResourceService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SystemResourceService.java @@ -147,8 +147,8 @@ public class SystemResourceService implements ISystemResourceService { return sysLocaleResourceRDao.list(); }else { return sysLocaleResourceRDao.findByProperty( - new String[]{"resourceType", "languageCode", "resourceKey", "resourceValue", "isSystem", "isDefault"}, - new Object[]{res.getResourceType(), res.getLanguageCode(), res.getResourceKey(), res.getResourceValue(), res.getIsSystem(), res.getIsDefault()}); + new String[]{"resourceType", "languageCode", "resourceKey", "resourceValue", "isSystem"}, + new Object[]{res.getResourceType(), res.getLanguageCode(), res.getResourceKey(), res.getResourceValue(), res.getIsSystem()}); } } @@ -161,8 +161,8 @@ public class SystemResourceService implements ISystemResourceService { if(CollectionUtils.isEmpty(resList)){ //不存在，则使用默认的 resList = sysLocaleResourceRDao.findByProperty( - new String[]{"resourceType", "resourceKey", "isDefault"}, - new Object[]{resourceType,resKey, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()}); + new String[]{"resourceType", "resourceKey"}, + new Object[]{resourceType,resKey}); } if(resList.size() > 0) { return resList.iterator().next(); From 984d2dd7b34048e5800715395821ef799bb6886a Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Tue, 13 Nov 2018 10:08:33 +0800 Subject: [PATCH 6/6] 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 | 2 +- .../core/apiservice/serviceimpl/busi/DataMoreServiceImpl.java | 7 ------- pom.xml | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 8884595..838e520 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,4 @@ gen target .jar .class -.mda \ No newline at end of file +.md \ No newline at end of file diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/DataMoreServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/DataMoreServiceImpl.java index 21ae540..8d7527d 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/DataMoreServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/DataMoreServiceImpl.java @@ -1,17 +1,10 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.busi.IDataMoreService; -import cn.estsh.i3plus.core.apiservice.dao.IFactoryStoreDao; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.annotation.ReadOnlyProperty; import org.springframework.stereotype.Service; -import javax.transaction.Transactional; -import java.util.ArrayList; -import java.util.List; - /** * @Description : * @Reference : diff --git a/pom.xml b/pom.xml index 7d72f04..015ddda 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ UTF-8 1.8 Finchley.RELEASE - DEBUG + INFO E:/i3plus-platform-logs/${project.name} E:/i3plus-platform-logs/${project.name}-error E:/i3plus-platform-logs/${project.name}-controller