I3_YF_SEAT
/
impp-core
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

国家化封装

Browse Source
yun-zuoyi
alwaysfrin 7 years ago
parent d9ea77507f
commit 7368b04ccd
14 changed files with 149 additions and 105 deletions
Show Stats Download Patch File Download Diff File

2
modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/IDataSimpleService.java
Unescape Escape View File

@ -1,6 +1,6 @@
package cn.estsh.i3plus.core.api.iservice.base;
import cn.estsh.i3plus.pojo.factory.bean.MachineFactory;
import cn.estsh.i3plus.pojo.mes.MachineFactory;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;

10
modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISystemResourceService.java
Unescape Escape View File

@ -1,9 +1,9 @@
package cn.estsh.i3plus.core.api.iservice.busi;
import cn.estsh.i3plus.pojo.model.common.Pager;
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 cn.estsh.i3plus.pojo.platform.bean.SysLocaleResource;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@ -24,15 +24,15 @@ public interface ISystemResourceService {
List<SysLocaleLanguage> listSysLocaleLanguage(SysLocaleLanguage lang);
List<SysLocaleLanguage> listSysLocaleLanguageByPager(SysLocaleLanguage lang,Pager pager);
ListPager<SysLocaleLanguage> listSysLocaleLanguageByPager(SysLocaleLanguage lang, Pager pager);
SysLocaleResource saveSysLocaleResource(SysLocaleResource res);
SysLocaleResource insertSysLocaleResource(SysLocaleResource res);
SysLocaleResource updateSysLocaleResource(SysLocaleResource res);
void deleteSysLocaleResourceById(long id);
List<SysLocaleResource> listSysLocaleResourceByPager(SysLocaleResource res,Pager pager);
ListPager<SysLocaleResource> listSysLocaleResourceByPager(SysLocaleResource res,Pager pager);
List<SysLocaleResource> listSysLocaleResource(SysLocaleResource res);

4
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoAuthController.java
Unescape Escape View File

@ -2,7 +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.i3plus.pojo.model.busi.ResultBean;
import cn.estsh.impp.framework.boot.util.ResultBean;
import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
import cn.estsh.impp.framework.boot.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
@ -33,7 +33,7 @@ public class DemoAuthController {
/**
* 缓存
*/
@Resource(name="redisUtil")
@Resource(name="redisCore")
private ImppRedis imppRedis;
@GetMapping(value="/login")

25
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoRestController.java
Unescape Escape View File

@ -2,15 +2,10 @@ package cn.estsh.i3plus.core.apiservice.controller;
import cn.estsh.i3plus.core.apiservice.mq.I3CoreQueue;
import cn.estsh.i3plus.platform.common.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.factory.bean.MachineFactory;
import cn.estsh.i3plus.pojo.model.busi.ResultBean;
import cn.estsh.impp.framework.base.BaseImppException;
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.util.ResultBean;
import cn.estsh.i3plus.pojo.mes.MachineFactory;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
import cn.estsh.impp.framework.boot.fastdfs.FastDFSClient;
import cn.estsh.impp.framework.boot.quartz.ScheduleTool;
import cn.estsh.impp.framework.boot.quartz.TaskInfo;
import cn.estsh.impp.framework.boot.util.ImppRedis;
import com.rabbitmq.client.Channel;
import io.swagger.annotations.Api;
@ -21,15 +16,11 @@ import org.springframework.amqp.core.Message;
import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.MessageSource;
import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import javax.annotation.Resource;
import java.io.IOException;
import java.util.List;
import java.util.Locale;
import java.util.concurrent.TimeoutException;
@ -49,8 +40,8 @@ public class DemoRestController {
/**
* 缓存
*/
@Resource(name="redisUtil")
private ImppRedis imppRedis;
@Resource(name="redisCore")
private ImppRedis redisCore;
/**
* rabbitMQ队列
@ -70,8 +61,8 @@ public class DemoRestController {
@ApiOperation(value="缓存",notes="放入数据")
public ResultBean putCache(){
//放入缓存
imppRedis.putObject("machineFactory",new MachineFactory("111","nnnn"));
imppRedis.putObject("wms","123123123");
redisCore.putObject("machineFactory",new MachineFactory("111","nnnn"));
redisCore.putObject("wms","123123123");
return new ResultBean(true,"已放入缓存");
}
@ -79,9 +70,9 @@ public class DemoRestController {
@GetMapping(value="/get-cache")
@ApiOperation(value="缓存",notes="获取数据")
public ResultBean getCache(){
MachineFactory mf = (MachineFactory) imppRedis.getObject("machineFactory");
MachineFactory mf = (MachineFactory) redisCore.getObject("machineFactory");
System.out.println("1===== " + mf);
System.out.println("2===== " + imppRedis.getObject("wms"));
System.out.println("2===== " + redisCore.getObject("wms"));
return new ResultBean(true,mf);
}

11
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoScheduleController.java
Unescape Escape View File

@ -1,27 +1,18 @@
package cn.estsh.i3plus.core.apiservice.controller;
import cn.estsh.i3plus.core.apiservice.mq.I3CoreQueue;
import cn.estsh.i3plus.pojo.factory.bean.MachineFactory;
import cn.estsh.i3plus.pojo.model.busi.ResultBean;
import cn.estsh.impp.framework.boot.util.ResultBean;
import cn.estsh.impp.framework.boot.quartz.ScheduleTool;
import cn.estsh.impp.framework.boot.quartz.TaskInfo;
import cn.estsh.impp.framework.boot.util.ImppRedis;
import com.rabbitmq.client.Channel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.amqp.core.Message;
import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.io.IOException;
import java.util.List;
import java.util.concurrent.TimeoutException;
/**
* @Description :

131
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoSystemController.java
Unescape Escape View File

@ -1,42 +1,37 @@
package cn.estsh.i3plus.core.apiservice.controller;
import cn.estsh.i3plus.core.api.iservice.busi.ISystemResourceService;
import cn.estsh.i3plus.core.apiservice.mq.I3CoreQueue;
import cn.estsh.i3plus.platform.common.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.factory.bean.MachineFactory;
import cn.estsh.i3plus.pojo.model.busi.ResultBean;
import cn.estsh.i3plus.platform.common.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.impp.framework.boot.util.ResultBean;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.platform.bean.SysLocaleLanguage;
import cn.estsh.i3plus.pojo.platform.bean.SysLocaleResource;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
import cn.estsh.impp.framework.boot.util.ImppRedis;
import com.rabbitmq.client.Channel;
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.amqp.core.Message;
import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.io.IOException;
import java.util.Locale;
import java.util.concurrent.TimeoutException;
/**
* @Description :
* @Description : 系统资源服务demo
* @Reference :
* @Author : alwaysfrin
* @CreateDate : 2018-09-26 10:34
* @Modify:
**/
@RestController
@RequestMapping("/demo-system")
@RequestMapping("/demo-system-service")
@Api(description="系统服务demo")
public class DemoSystemController {
private static final Logger LOGGER = LoggerFactory.getLogger(DemoSystemController.class);
@ -44,8 +39,8 @@ public class DemoSystemController {
/**
* 缓存
*/
@Resource(name="redisUtil")
private ImppRedis imppRedis;
@Resource(name="redisCore")
private ImppRedis redisCore;
/**
* rabbitMQ队列
@ -56,41 +51,101 @@ public class DemoSystemController {
@Autowired
private ISystemResourceService systemResourceService;
@PutMapping(value="/addlanguage")
@ApiOperation(value="添加语言")
public ResultBean addlanguage(SysLocaleLanguage lang) {
@PutMapping(value="/language/add")
@ApiOperation(value="添加语言",notes = "添加系统语言，可用于国际化")
public ResultBean addLanguage(SysLocaleLanguage lang) {
try {
//条件验证
ValidatorBean.beginValid(lang)
.notNull("languageName",lang.getLanguageName())
.notNull("languageCode",lang.getLanguageCode());
systemResourceService.saveSysLocaleLanguage(lang);
return new ResultBean(true,"操作成功");
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep.getErrorShow()).build();
}catch(Exception e){
return ResultBean.fail(e.getMessage()).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
}
}
@PutMapping(value="/listlang")
@ApiOperation(value="查询语言")
public ResultBean listlang(SysLocaleLanguage lang) {
return new ResultBean(true,"操作成功",systemResourceService.listSysLocaleLanguage(lang));
@PutMapping(value="/language/query")
@ApiOperation(value="查询语言",notes = "添加系统语言，可用于国际化")
public ResultBean queryLanguage(SysLocaleLanguage lang,Pager pager) {
try {
ListPager listPager = systemResourceService.listSysLocaleLanguageByPager(lang,pager);
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep.getErrorShow()).build();
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
}
}
@PutMapping(value="/resource/insert")
@ApiOperation(value="添加资源",notes = "添加系统语言，可用于国际化")
public ResultBean insertResource(SysLocaleResource res) {
try {
//条件验证
ValidatorBean.beginValid(res)
.notNull("resourceKey",res.getResourceKey())
.notNull("resourceValue",res.getResourceValue());
@PutMapping(value="/addres")
@ApiOperation(value="添加资源")
public ResultBean addres(SysLocaleResource res) {
systemResourceService.saveSysLocaleResource(res);
return new ResultBean(true,"操作成功");
systemResourceService.insertSysLocaleResource(res);
return ResultBean.success("操作成功")
.setResultObject(res)
.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());
}
}
@PutMapping(value="/listres")
@ApiOperation(value="查询资源")
public ResultBean listres(SysLocaleResource res) {
return new ResultBean(true,"操作成功",systemResourceService.listSysLocaleResource(res));
@PutMapping(value="/resource/query")
@ApiOperation(value="查询资源",notes = "分页查询系统资源")
public ResultBean queryResource(SysLocaleResource res,Pager pager) {
try{
ListPager listPager = systemResourceService.listSysLocaleResourceByPager(res,pager);
return ResultBean.success("操作成功")
.setListPager(listPager)
.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());
}
}
@GetMapping(value="/getlocaleresource")
@GetMapping(value="/locale-resource/get")
@ApiOperation(value="语言资源匹配",notes="资源配置文件及国际化")
public ResultBean getlocaleresource(int resourceType,String langCode,String resKey) {
public ResultBean getLocaleResource(int resourceType,String langCode,String resKey) {
try {
ValidatorBean.checkNotZero(resourceType,"请选择资源类型。");
ValidatorBean.checkNotNull(langCode,"请输入语言编码");
ValidatorBean.checkNotNull(resKey,"请输入资源编码");
Locale locale = LocaleContextHolder.getLocale();
System.out.println("当前语言："+locale.getLanguage() + "，国家：" + locale.getCountry());
LOGGER.info("当前语言：" + locale.getLanguage() + "，国家：" + locale.getCountry());
SysLocaleResource res = systemResourceService.getSysLocaleResourceByLanguage(resourceType,langCode,resKey);
System.out.println("获取的资源：" + res);
SysLocaleResource res = systemResourceService.getSysLocaleResourceByLanguage(resourceType, langCode, resKey);
LOGGER.info("获取的资源：" + res);
return new ResultBean(true,"操作成功",res);
return ResultBean.success("保存成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultObject(res);
}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());
}
}
}

4
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/SimpleController.java
Unescape Escape View File

@ -1,8 +1,8 @@
package cn.estsh.i3plus.core.apiservice.controller.base;
import cn.estsh.i3plus.core.api.iservice.base.IDataSimpleService;
import cn.estsh.i3plus.pojo.factory.bean.MachineFactory;
import cn.estsh.i3plus.pojo.model.busi.ResultBean;
import cn.estsh.impp.framework.boot.util.ResultBean;
import cn.estsh.i3plus.pojo.mes.MachineFactory;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;

2
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/FactoryStoreController.java
Unescape Escape View File

@ -1,7 +1,7 @@
package cn.estsh.i3plus.core.apiservice.controller.busi;
import cn.estsh.i3plus.core.api.iservice.busi.IDataMoreService;
import cn.estsh.i3plus.pojo.model.busi.ResultBean;
import cn.estsh.impp.framework.boot.util.ResultBean;
import cn.estsh.i3plus.pojo.wms.bean.FactoryStore;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

2
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/dao/IMachineFactoryDao.java
Unescape Escape View File

@ -1,6 +1,6 @@
package cn.estsh.i3plus.core.apiservice.dao;
import cn.estsh.i3plus.pojo.factory.bean.MachineFactory;
import cn.estsh.i3plus.pojo.mes.MachineFactory;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.CrudRepository;

12
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/listener/SysResourceBindleListener.java
Unescape Escape View File

@ -31,8 +31,8 @@ public class SysResourceBindleListener implements ApplicationListener<ContextRef
@Autowired
public ISystemResourceService systemResourceService;
@Resource(name="redisUtil")
private ImppRedis imppRedis;
@Resource(name="redisCore")
private ImppRedis redisCore;
@Override
public void onApplicationEvent(ContextRefreshedEvent contextRefreshedEvent) {
@ -112,10 +112,10 @@ public class SysResourceBindleListener implements ApplicationListener<ContextRef
langMsgMap.put(lang.getLanguageCode(),resMap);
}
imppRedis.putHashMap(ConstWords.PLAT_MODULE_PREX,langModoleMap);
imppRedis.putHashMap(ConstWords.PLAT_MODULE_METHOD_PREX,langMethodMap);
imppRedis.putHashMap(ConstWords.PLAT_MODULE_BUTTON_PREX,langBtnMap);
imppRedis.putHashMap(ConstWords.LANGUAGE_CONVERT_PREX,langMsgMap);
redisCore.putHashMap(ConstWords.PLAT_MODULE_PREX,langModoleMap);
redisCore.putHashMap(ConstWords.PLAT_MODULE_METHOD_PREX,langMethodMap);
redisCore.putHashMap(ConstWords.PLAT_MODULE_BUTTON_PREX,langBtnMap);
redisCore.putHashMap(ConstWords.LANGUAGE_CONVERT_PREX,langMsgMap);
LOGGER.info("【资源配置文件已全部加载】");
}

8
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/I3CoreQueue.java
Unescape Escape View File

@ -29,25 +29,25 @@ public class I3CoreQueue {
@Bean
public Queue getStrQueue() {
LOGGER.info("【DEMO_STR_QUEUE队列】");
//LOGGER.info("【DEMO_STR_QUEUE队列】");
return new Queue(DEMO_STR_QUEUE);
}
@Bean
public Queue getObjQueue() throws Exception {
LOGGER.info("【DEMO_OBJ_QUEUE队列】");
//LOGGER.info("【DEMO_OBJ_QUEUE队列】");
return new Queue(DEMO_OBJ_QUEUE);
}
@Bean
public Queue getHandleQueue() throws Exception {
LOGGER.info("【DEMO_HANDLE_QUEUE队列】");
//LOGGER.info("【DEMO_HANDLE_QUEUE队列】");
return new Queue(DEMO_HANDLE_QUEUE);
}
@Bean
public Queue getReturnQueue() throws Exception {
LOGGER.info("【DEMO_RETURN_QUEUE队列】");
//LOGGER.info("【DEMO_RETURN_QUEUE队列】");
return new Queue(DEMO_RETURN_QUEUE);
}

2
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/DataSimpleServiceImpl.java
Unescape Escape View File

@ -3,7 +3,7 @@ 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.factory.bean.MachineFactory;
import cn.estsh.i3plus.pojo.mes.MachineFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;

21
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SystemResourceService.java
Unescape Escape View File

@ -2,14 +2,14 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ISystemResourceService;
import cn.estsh.i3plus.platform.common.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.model.common.Pager;
import cn.estsh.i3plus.pojo.model.common.PagerHelper;
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.SysLocaleLanguage;
import cn.estsh.i3plus.pojo.platform.bean.SysLocaleResource;
import cn.estsh.i3plus.pojo.platform.repository.SysLocaleLanguageRepository;
import cn.estsh.i3plus.pojo.platform.repository.SysLocaleResourceRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@ -58,21 +58,21 @@ public class SystemResourceService implements ISystemResourceService {
}
@Override
public List<SysLocaleLanguage> listSysLocaleLanguageByPager(SysLocaleLanguage lang, Pager pager) {
public ListPager<SysLocaleLanguage> listSysLocaleLanguageByPager(SysLocaleLanguage lang, Pager pager) {
if(lang == null) {
pager = PagerHelper.getPager(pager, sysLocaleLanguageRDao.listCount());
return sysLocaleLanguageRDao.listPager(pager);
return new ListPager(sysLocaleLanguageRDao.listPager(pager),pager);
}else {
String[] params = new String[]{"languageCode", "languageName", "isDefault"};
Object[] values = new Object[]{lang.getLanguageCode(), lang.getLanguageName(), lang.getIsDefault()};
pager = PagerHelper.getPager(pager, sysLocaleLanguageRDao.findByPropertyCount(params,values));
return sysLocaleLanguageRDao.findByPropertyPage(params,values,"order by id asc",pager);
return new ListPager(sysLocaleLanguageRDao.findByPropertyPage(params,values,"order by id asc",pager),pager);
}
}
@Override
public SysLocaleResource saveSysLocaleResource(SysLocaleResource res) {
public SysLocaleResource insertSysLocaleResource(SysLocaleResource res) {
return sysLocaleResourceRDao.insert(res);
}
@ -87,17 +87,18 @@ public class SystemResourceService implements ISystemResourceService {
}
@Override
public List<SysLocaleResource> listSysLocaleResourceByPager(SysLocaleResource res, Pager pager) {
public ListPager<SysLocaleResource> listSysLocaleResourceByPager(SysLocaleResource res, Pager pager) {
if(res == null){
//不传入实体对象，查询所有
int count = sysLocaleResourceRDao.listCount();
pager = PagerHelper.getPager(pager,count);
return sysLocaleResourceRDao.listPager(pager);
return new ListPager(sysLocaleResourceRDao.listPager(pager),pager);
}else {
String[] params = new String[]{"resourceType", "languageCode", "resourceKey", "resourceValue", "isSystem", "isDefault"};
Object[] values = new Object[]{res.getResourceType(), res.getLanguageCode(), res.getResourceKey(), res.getResourceValue(), res.getIsSystem(), res.getIsDefault()};
pager = PagerHelper.getPager(pager,sysLocaleResourceRDao.findByPropertyCount(params,values));
return sysLocaleResourceRDao.findByPropertyPage(params,values,"order by id asc", pager);
return new ListPager(sysLocaleResourceRDao.findByPropertyPage(params,values,"order by id asc", pager),pager);
}
}

16
pom.xml
Unescape Escape View File

@ -47,11 +47,6 @@
<!-- 外部对象模型 -->
<dependency>
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-factory</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-wms</artifactId>
<version>${project.version}</version>
</dependency>
@ -66,6 +61,12 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-model</artifactId>
<version>${project.version}</version>
</dependency>
<!-- 内部依赖声明 -->
<dependency>
<groupId>i3plus.core</groupId>
@ -109,6 +110,11 @@
<artifactId>shiro-spring</artifactId>
<version>1.4.0</version>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-ehcache</artifactId>
<version>1.4.0</version>
</dependency>
<!-- json -->
<dependency>

Write Preview
Loading…
Cancel
Save