wei.peng 7 years ago
commit b69ce2e2e6

@ -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<MachineFactory> findMachineFactoryByFactoryName(String factoryName);
/**
*//**
* code
* @param factoryCode
* @return
*/
*//*
@Transactional(readOnly = true)
List<MachineFactory> findMachineFactoryByFactoryCode(String factoryCode);
/**
*//**
*
* @return
*/
*//*
@Transactional(readOnly = true)
List<MachineFactory> findMachineFactorySpecial();
List<MachineFactory> findMachineFactorySpecial();*/
}

@ -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<LogOperate> 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,18 @@ public interface ILogOperateService {
* @param operateUserName
* @return
*/
@ApiOperation(value = "根据操作人姓名模糊查询日志",notes = "根据操作人姓名模糊查询日志")
List<LogOperate> listLogOperateByOperateUserName(String operateUserName);
//查询所有日志数量
long countAllLogOperate();
/**
*
* @param logOperate
* @param pager
* @return
*/
@ApiOperation(value = "操作日志复杂查询,分页,排序",notes = "操作日志复杂查询,分页,排序")
ListPager<LogOperate> queryLogOperateByPager(LogOperate logOperate, Pager pager);
}

@ -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<LogSystem> listLogSystem();
/**
* id
* @param id
* @return
*/
@ApiOperation(value = "根据id查询系统日志",notes = "根据id查询系统日志")
LogSystem getLogSystemById(long id);
@ApiOperation(value = "系统日志分页复杂查询",notes = "系统日志分页复杂查询")
ListPager queryLogSystemByPager(LogSystem logSystem, Pager pager);
}

@ -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);
}

@ -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);
}

@ -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="登陆")

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

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

@ -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")

@ -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){

@ -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<LogOperate> 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());
}
}
}

@ -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());
}
}
}

@ -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);

@ -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);
}
}
}

@ -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);
}
}
}

@ -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())

@ -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());

@ -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<FactoryStore> listFactoryStore();
}

@ -10,17 +10,18 @@ import org.springframework.stereotype.Repository;
import java.util.List;
/**
* @Description : crudrepositoryhql
* @Description : hqldemo
* crudrepositoryhql
* @Reference : sql @Query(sql,nativeQuery=true)
* @Author : alwaysfrin
* @CreateDate : 2018-09-05 16:41
* @Modify:
**/
@Repository
//@Repository
public interface IMachineFactoryDao extends CrudRepository<MachineFactory,Long> {
//此处findBy开头会自动根据属性名进行查询
List<MachineFactory> findByFactoryName(String factoryName);
/*List<MachineFactory> 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<MachineFactory,Long>
//自定义Hql
@Query("from MachineFactory mf where mf.createDatetime like '2018-01-01%'")
List<MachineFactory> findMachineFactorySpecial();
List<MachineFactory> findMachineFactorySpecial();*/
}

@ -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<FactoryStore> listFactoryStore(){
List<FactoryStore> list = entityManager.createQuery("from FactoryStore").getResultList();
for(FactoryStore fs : list){
fs.setStoreCode("");
}
return list;
}*/
}

@ -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;

@ -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 :

@ -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 :
@ -32,7 +29,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 +56,5 @@ public class DataSimpleServiceImpl implements IDataSimpleService {
@Override
public List<MachineFactory> findMachineFactorySpecial() {
return machineFactoryDao.findMachineFactorySpecial();
}
}*/
}

@ -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 :

@ -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<LogOperate> 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,22 @@ public class LogOperateService implements ILogOperateService {
public List<LogOperate> listLogOperateByOperateUserName(String operateUserName) {
return logOperateRDao.findByProperty("operateUserName",operateUserName);
}
@Override
public long countAllLogOperate() {
return logOperateRDao.listCount();
}
@Override
public ListPager<LogOperate> queryLogOperateByPager(LogOperate logOperate, Pager pager) {
if(logOperate == null) {
pager = PagerHelper.getPager(pager, (int) logOperateRDao.count());
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);
}
}
}

@ -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);
}
}
}

@ -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();

@ -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());
}
}

@ -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);
}
}

@ -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();

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

@ -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<num.length;i++){
new Thread(new ArraySort(num[i])).start();
}
}
@Override
public void run() {
try {
Thread.sleep(Integer.parseInt(num));
System.out.println(num);
} catch (InterruptedException e) {
e.printStackTrace();
}
}
}
Loading…
Cancel
Save