Merge remote-tracking branch 'origin/master'

yun-zuoyi
alwaysfrin 7 years ago
commit 7b880d6eda

@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.shirotoken.AdminToken;
import cn.estsh.i3plus.pojo.base.shirotoken.SaAdminToken; import cn.estsh.i3plus.pojo.base.shirotoken.SaAdminToken;
import cn.estsh.i3plus.pojo.base.shirotoken.UserToken; import cn.estsh.i3plus.pojo.base.shirotoken.UserToken;
import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
import cn.estsh.i3plus.pojo.platform.bean.SysUser;
import java.util.List; import java.util.List;
@ -25,4 +26,6 @@ public interface ISystemLoginService {
SessionUser queryCheckAdminLogin(AdminToken authenticationToken); SessionUser queryCheckAdminLogin(AdminToken authenticationToken);
SessionUser queryCheckSaAdminLogin(SaAdminToken authenticationToken); SessionUser queryCheckSaAdminLogin(SaAdminToken authenticationToken);
Integer doLoginPasswordError(SysUser user);
} }

@ -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.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.platform.bean.SysDictionary; import cn.estsh.i3plus.pojo.platform.bean.SysDictionary;
import io.swagger.annotations.ApiOperation;
import java.util.List; import java.util.List;
@ -19,24 +20,28 @@ public interface ISysDictionaryService {
* *
* @param sysDictionary * @param sysDictionary
*/ */
@ApiOperation(value = "添加字典")
void insertSysDictionary(SysDictionary sysDictionary); void insertSysDictionary(SysDictionary sysDictionary);
/** /**
* id * id
* @param id * @param id
*/ */
@ApiOperation(value = "根据id删除字典")
void deleteSysDictionaryById(Long id); void deleteSysDictionaryById(Long id);
/** /**
* *
* @param sysDictionary * @param sysDictionary
*/ */
@ApiOperation(value = "修改字典")
void updateSysDictionary(SysDictionary sysDictionary); void updateSysDictionary(SysDictionary sysDictionary);
/** /**
* *
* @return * @return
*/ */
@ApiOperation(value = "查询所有字典信息")
List<SysDictionary> listSysDictionary(); List<SysDictionary> listSysDictionary();
/** /**
@ -44,6 +49,7 @@ public interface ISysDictionaryService {
* @param id * @param id
* @return * @return
*/ */
@ApiOperation(value = "根据id查询字典信息")
SysDictionary getSysDictionaryById(Long id); SysDictionary getSysDictionaryById(Long id);
/** /**
@ -51,23 +57,27 @@ public interface ISysDictionaryService {
* @param parentCode * @param parentCode
* @return * @return
*/ */
@ApiOperation(value = "根据父级代码查询字典项信息")
List<SysDictionary> findSysDictionaryByParentCode(String parentCode); List<SysDictionary> findSysDictionaryByParentCode(String parentCode);
/** /**
* *
* *
*/ */
@ApiOperation(value = "字典复杂查询,分页,排序",notes = "默认查询非顶级字典")
ListPager querySysDictionaryByPager(SysDictionary sysDictionary, Pager pager); ListPager querySysDictionaryByPager(SysDictionary sysDictionary, Pager pager);
/** /**
* *
*/ */
@ApiOperation(value = "查询顶级字典")
List<SysDictionary> findSysDictionaryByTop(); List<SysDictionary> findSysDictionaryByTop();
/** /**
* *
* @param ids * @param ids
*/ */
@ApiOperation(value = "批量删除字典")
void deleteSysDictionaryByIds(Long[] ids); void deleteSysDictionaryByIds(Long[] ids);
/** /**
@ -75,13 +85,15 @@ public interface ISysDictionaryService {
* @param fileName * @param fileName
* @return * @return
*/ */
@ApiOperation(value = "检出文件名称是否符合系统规范")
boolean checkFileName(String fileName); boolean checkFileName(String fileName);
/** /**
* CODE * CODE
* @param parentCode * @param parentCode
* @param code * @param code
* @return * @return
*/ */
@ApiOperation(value = "根据父节点 以及当前节点CODE 获取字典信息")
SysDictionary getSysDictionaryByParentCodeAndCode(String parentCode,String code); SysDictionary getSysDictionaryByParentCodeAndCode(String parentCode,String code);
} }

@ -2,10 +2,8 @@ package cn.estsh.i3plus.core.api.iservice.busi;
import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
import cn.estsh.i3plus.pojo.platform.bean.SysFile;
import cn.estsh.i3plus.pojo.platform.bean.SysRole;
import cn.estsh.i3plus.pojo.platform.bean.SysTaskTimeExpression; import cn.estsh.i3plus.pojo.platform.bean.SysTaskTimeExpression;
import io.swagger.annotations.ApiOperation;
import java.util.List; import java.util.List;
@ -22,12 +20,14 @@ public interface ISysTaskTimeExpressionService {
* *
* @param taskTimeExpression * @param taskTimeExpression
*/ */
@ApiOperation(value = "修改数据")
void updateSysTaskTimeExpression(SysTaskTimeExpression taskTimeExpression); void updateSysTaskTimeExpression(SysTaskTimeExpression taskTimeExpression);
/** /**
* Key * id
* @param id * @param id
*/ */
@ApiOperation(value = "根据id删除数据")
void deleteSysTaskTimeExpressionById(Long id); void deleteSysTaskTimeExpressionById(Long id);
/** /**
@ -35,12 +35,14 @@ public interface ISysTaskTimeExpressionService {
* @param taskTimeExpression * @param taskTimeExpression
* @return * @return
*/ */
@ApiOperation(value = "新增数据")
SysTaskTimeExpression insertSysTaskTimeExpression(SysTaskTimeExpression taskTimeExpression); SysTaskTimeExpression insertSysTaskTimeExpression(SysTaskTimeExpression taskTimeExpression);
/** /**
* *
* @return * @return
*/ */
@ApiOperation(value = "查询所有数据")
List<SysTaskTimeExpression> listSysTaskTimeExpression(); List<SysTaskTimeExpression> listSysTaskTimeExpression();
/** /**
@ -48,6 +50,7 @@ public interface ISysTaskTimeExpressionService {
* @param id * @param id
* @return * @return
*/ */
@ApiOperation(value = "根据ID 查询任务表达式")
SysTaskTimeExpression getSysTaskTimeExpressionById(Long id); SysTaskTimeExpression getSysTaskTimeExpressionById(Long id);
/** /**
@ -56,11 +59,13 @@ public interface ISysTaskTimeExpressionService {
* @param pager * @param pager
* @return * @return
*/ */
@ApiOperation(value = "任务表达式查询,分页,排序")
ListPager querySysTaskTimeExpressionByPager(SysTaskTimeExpression taskTimeExpression, Pager pager); ListPager querySysTaskTimeExpressionByPager(SysTaskTimeExpression taskTimeExpression, Pager pager);
/** /**
* *
* @param ids * @param ids
*/ */
@ApiOperation(value = "任务表达式批量删除")
void deleteSysTaskTimeExpressionByIds(Long[] ids); void deleteSysTaskTimeExpressionByIds(Long[] ids);
} }

@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
import cn.estsh.i3plus.pojo.platform.bean.SysTaskTime; import cn.estsh.i3plus.pojo.platform.bean.SysTaskTime;
import cn.estsh.i3plus.pojo.platform.bean.SysTaskTimeExpression; import cn.estsh.i3plus.pojo.platform.bean.SysTaskTimeExpression;
import io.swagger.annotations.ApiOperation;
import java.util.List; import java.util.List;
@ -18,16 +19,18 @@ import java.util.List;
public interface ISysTaskTimeService { public interface ISysTaskTimeService {
/** /**
* *
* @param taskTime * @param taskTime
* @return * @return
*/ */
@ApiOperation(value = "新增定时任务")
SysTaskTime insertSysTaskTime(SysTaskTime taskTime, SysTaskTimeExpression taskTimeExpression); SysTaskTime insertSysTaskTime(SysTaskTime taskTime, SysTaskTimeExpression taskTimeExpression);
/** /**
* *
* @param taskTime * @param taskTime
*/ */
@ApiOperation(value = "修改定时任务")
void updateSysTaskTime(SysTaskTime taskTime, SysTaskTimeExpression taskTimeExpression); void updateSysTaskTime(SysTaskTime taskTime, SysTaskTimeExpression taskTimeExpression);
/** /**
@ -36,18 +39,21 @@ public interface ISysTaskTimeService {
* @param status * @param status
* @param user * @param user
*/ */
@ApiOperation(value = "修改任务状态")
void updateSysTaskTimeStatus(Long id, int status, SessionUser user); void updateSysTaskTimeStatus(Long id, int status, SessionUser user);
/** /**
* Key * id
* @param id * @param id
*/ */
@ApiOperation(value = "根据根据id删除数据")
void deleteSysTaskTimeById(Long id); void deleteSysTaskTimeById(Long id);
/** /**
* *
* @return * @return
*/ */
@ApiOperation(value = "查询所有数据")
List<SysTaskTime> listSysTaskTime(); List<SysTaskTime> listSysTaskTime();
/** /**
@ -55,6 +61,7 @@ public interface ISysTaskTimeService {
* @param id * @param id
* @return * @return
*/ */
@ApiOperation(value = "根据id 数据")
SysTaskTime getSysTaskTimeById(Long id); SysTaskTime getSysTaskTimeById(Long id);
/** /**
@ -63,12 +70,14 @@ public interface ISysTaskTimeService {
* @param pager * @param pager
* @return * @return
*/ */
@ApiOperation(value = "定时任务复制查询,分页,排序")
ListPager querySysTaskTimeByPager(SysTaskTime taskTime, Pager pager); ListPager querySysTaskTimeByPager(SysTaskTime taskTime, Pager pager);
/** /**
* id * id
* @param ids * @param ids
*/ */
@ApiOperation(value = "根据id批量删除定时任务")
void deleteSysTaskTimeByIds(Long[] ids); void deleteSysTaskTimeByIds(Long[] ids);
/** /**
@ -76,6 +85,7 @@ public interface ISysTaskTimeService {
* @param ids * @param ids
* *
*/ */
@ApiOperation(value = "批量修改定时任务状态")
void updateSysTaskTimeStatusByIds(Long[] ids, Integer status); void updateSysTaskTimeStatusByIds(Long[] ids, Integer status);
/** /**
@ -84,11 +94,13 @@ public interface ISysTaskTimeService {
* @param name * @param name
* @param groupName * @param groupName
*/ */
@ApiOperation(value = "修改最后时间")
void doSysTaskTimeLastDateByNameAndGroupName(String lastDate,String name,String groupName); void doSysTaskTimeLastDateByNameAndGroupName(String lastDate,String name,String groupName);
/** /**
* *
* @param id * @param id
*/ */
@ApiOperation(value = "立即执行")
void executeSysTaskTimeById(Long id); void executeSysTaskTimeById(Long id);
} }

@ -1,127 +1,127 @@
package cn.estsh.i3plus.core.apiservice.controller; //package cn.estsh.i3plus.core.apiservice.controller;
//
import cn.estsh.i3plus.icloud.core.sdk.ICoreDemoCloud; //import cn.estsh.i3plus.icloud.core.sdk.ICoreDemoCloud;
import cn.estsh.i3plus.icloud.wms.sdk.IWmsDemoCloud; //import cn.estsh.i3plus.icloud.wms.sdk.IWmsDemoCloud;
import cn.estsh.i3plus.pojo.base.bean.BaseBean; //import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.bean.BaseModelBean; //import cn.estsh.i3plus.pojo.base.bean.BaseModelBean;
import cn.estsh.i3plus.pojo.base.bean.BaseResultBean; //import cn.estsh.i3plus.pojo.base.bean.BaseResultBean;
import cn.estsh.i3plus.pojo.base.common.Pager; //import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; //import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.SysRole; //import cn.estsh.i3plus.pojo.platform.bean.SysRole;
import cn.estsh.i3plus.pojo.platform.bean.SysUser; //import cn.estsh.i3plus.pojo.platform.bean.SysUser;
import cn.estsh.impp.framework.boot.util.ResultBean; //import cn.estsh.impp.framework.boot.util.ResultBean;
import io.swagger.annotations.Api; //import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; //import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; //import org.slf4j.Logger;
import org.slf4j.LoggerFactory; //import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; //import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; //import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*; //import org.springframework.web.bind.annotation.*;
//
import java.util.Map; //import java.util.Map;
//
@RestController //@RestController
@RequestMapping("/impp/cloud") //@RequestMapping("/impp/cloud")
@Api(description="分布式服务测试") //@Api(description="分布式服务测试")
public class DemoCloudController { //public class DemoCloudController {
//
private static final Logger LOGGER = LoggerFactory.getLogger(DemoCloudController.class); // private static final Logger LOGGER = LoggerFactory.getLogger(DemoCloudController.class);
//
@Value("${server.port}") // @Value("${server.port}")
private String serverPort; // private String serverPort;
//
@Value("${eureka.instance.ip-address}") // @Value("${eureka.instance.ip-address}")
private String ipAddress; // private String ipAddress;
//
@Autowired // @Autowired
ICoreDemoCloud iCoreDemoCloud; // ICoreDemoCloud iCoreDemoCloud;
//
@Autowired // @Autowired
IWmsDemoCloud iWmsDemoCloud; // IWmsDemoCloud iWmsDemoCloud;
//
@GetMapping(value="/test") // @GetMapping(value="/test")
@ApiOperation(value="core测试",notes = "core测试") // @ApiOperation(value="core测试",notes = "core测试")
public ResultBean testCore(String test) { // public ResultBean testCore(String test) {
LOGGER.info("{}{}【impp-core接受数据】{}",ipAddress,serverPort,test); // LOGGER.info("{}{}【impp-core接受数据】{}",ipAddress,serverPort,test);
return ResultBean.success("返回:" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); // return ResultBean.success("返回:" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} // }
//
@GetMapping(value="/test-wms") // @GetMapping(value="/test-wms")
@ApiOperation(value="wms测试",notes = "wms测试") // @ApiOperation(value="wms测试",notes = "wms测试")
public ResultBean testWms(String test) { // public ResultBean testWms(String test) {
LOGGER.info("【{}{}impp-core接受数据 -> wms】{}",ipAddress,serverPort,test); // LOGGER.info("【{}{}impp-core接受数据 -> wms】{}",ipAddress,serverPort,test);
//
BaseResultBean result = iWmsDemoCloud.testWms(test); // BaseResultBean result = iWmsDemoCloud.testWms(test);
if(result.isSuccess()){ // if(result.isSuccess()){
return ResultBean.success("wms返回" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); // return ResultBean.success("wms返回" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}else{ // }else{
LOGGER.error("无法调用wms服务{}",result.getErrorMsg()); // LOGGER.error("无法调用wms服务{}",result.getErrorMsg());
return ResultBean.fail("调用wms服务出错" + result.getErrorMsg()); // return ResultBean.fail("调用wms服务出错" + result.getErrorMsg());
} // }
} // }
//
@GetMapping(value="/test-get") // @GetMapping(value="/test-get")
@ApiOperation(value="测试get",notes = "测试get") // @ApiOperation(value="测试get",notes = "测试get")
public ResultBean testFeignGet(String test) { // public ResultBean testFeignGet(String test) {
LOGGER.info("【impp-core-get接受数据】{}" ,test); // LOGGER.info("【impp-core-get接受数据】{}" ,test);
return ResultBean.success("返回:" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); // return ResultBean.success("返回:" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} // }
//
@PostMapping(value="/test-post") // @PostMapping(value="/test-post")
@ApiOperation(value="测试post",notes = "测试post") // @ApiOperation(value="测试post",notes = "测试post")
public ResultBean testFeignPost(String test) { // public ResultBean testFeignPost(String test) {
LOGGER.info("【impp-core-post接受数据】{}" ,test); // LOGGER.info("【impp-core-post接受数据】{}" ,test);
return ResultBean.success("返回:" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); // return ResultBean.success("返回:" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} // }
//
@PutMapping(value="/test-put") // @PutMapping(value="/test-put")
@ApiOperation(value="put接受数据",notes = "put接受数据") // @ApiOperation(value="put接受数据",notes = "put接受数据")
public ResultBean testPut(String test,String name) { // public ResultBean testPut(String test,String name) {
LOGGER.info("【impp-core-put接受数据】param1:{},param2:{}", test,name); // LOGGER.info("【impp-core-put接受数据】param1:{},param2:{}", test,name);
return ResultBean.success("返回:" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); // return ResultBean.success("返回:" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} // }
//
@DeleteMapping(value="/test-delete") // @DeleteMapping(value="/test-delete")
@ApiOperation(value="delete接受数据",notes = "delete接受数据") // @ApiOperation(value="delete接受数据",notes = "delete接受数据")
public ResultBean testDelete( // public ResultBean testDelete(
@RequestBody Pager pager, // @RequestBody Pager pager,
@RequestParam("test") String test) { // @RequestParam("test") String test) {
LOGGER.info("【impp-core-delete接受数据】pager:{},test:{}",pager,test); // LOGGER.info("【impp-core-delete接受数据】pager:{},test:{}",pager,test);
return ResultBean.success("返回:" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); // return ResultBean.success("返回:" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} // }
//
@PutMapping(value="/test-cloud-put") // @PutMapping(value="/test-cloud-put")
@ApiOperation(value="测试cloudput",notes = "测试cloudput") // @ApiOperation(value="测试cloudput",notes = "测试cloudput")
public ResultBean putTestCloud(String test,String name) { // public ResultBean putTestCloud(String test,String name) {
LOGGER.info("【impp-core-put接受数据】test:{},name:{}",test,name); // LOGGER.info("【impp-core-put接受数据】test:{},name:{}",test,name);
return ResultBean.success("返回:" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); // return ResultBean.success("返回:" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} // }
//
@PostMapping(value="/test-object") // @PostMapping(value="/test-object")
@ApiOperation(value="测试单对象") // @ApiOperation(value="测试单对象")
public ResultBean testObject(@RequestBody Pager pager) { // public ResultBean testObject(@RequestBody Pager pager) {
LOGGER.info("【impp-core-object接受数据】{}" ,pager); // LOGGER.info("【impp-core-object接受数据】{}" ,pager);
return ResultBean.success("返回:" + pager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); // return ResultBean.success("返回:" + pager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} // }
//
@PostMapping(value="/test-map") // @PostMapping(value="/test-map")
@ApiOperation(value="测试get",notes = "测试get") // @ApiOperation(value="测试get",notes = "测试get")
public ResultBean testFeignMap(@RequestBody Map<String,String> map) { // public ResultBean testFeignMap(@RequestBody Map<String,String> map) {
LOGGER.info("【impp-core-map接受数据】{}" ,map); // LOGGER.info("【impp-core-map接受数据】{}" ,map);
return ResultBean.success("返回:" + map).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); // return ResultBean.success("返回:" + map).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} // }
//
@PostMapping(value="/test-arr") // @PostMapping(value="/test-arr")
@ApiOperation(value="测试arr",notes = "测试arr") // @ApiOperation(value="测试arr",notes = "测试arr")
public ResultBean testFeignArr(@RequestBody String[] arr) { // public ResultBean testFeignArr(@RequestBody String[] arr) {
LOGGER.info("【impp-core-arr接受数据】{}" ,arr); // LOGGER.info("【impp-core-arr接受数据】{}" ,arr);
return ResultBean.success("返回:" + arr).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); // return ResultBean.success("返回:" + arr).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} // }
//
@PostMapping(value="/test-more-object") // @PostMapping(value="/test-more-object")
@ApiOperation(value="测试多对象模型",notes = "测试多对象模型") // @ApiOperation(value="测试多对象模型",notes = "测试多对象模型")
public ResultBean testFeignMoreObj(@RequestBody BaseModelBean<SysRole> roleBean) { // public ResultBean testFeignMoreObj(@RequestBody BaseModelBean<SysRole> roleBean) {
LOGGER.info("【impp-core-more-obj接受多对象模型】objBean:{},pager:{}" ,roleBean.getObj(),roleBean.getPager()); // LOGGER.info("【impp-core-more-obj接受多对象模型】objBean:{},pager:{}" ,roleBean.getObj(),roleBean.getPager());
return ResultBean.success("返回:" + roleBean).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); // return ResultBean.success("返回:" + roleBean).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} // }
} //}

@ -71,8 +71,15 @@ public class AuthController extends CoreBaseController {
result.setUrl("/"); result.setUrl("/");
return result; return result;
}catch (AuthenticationException e) { }catch (AuthenticationException e) {
ResultBean result = ResultBean.fail(e.getMessage()).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); ResultBean result = ResultBean.fail();
result.setErrorMsg(e.getMessage()); Throwable cause = e.getCause();
if(cause instanceof ImppBusiException ){
ImppBusiException exception = (ImppBusiException) cause;
result.setErrorMsg(exception.getMessage() + exception.getErrorSolution());
}else {
result = ResultBean.fail(e.getMessage()).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
result.setErrorMsg(e.getMessage());
}
return result; return result;
}catch (ImppBusiException e) { }catch (ImppBusiException e) {
return ResultBean.fail(e); return ResultBean.fail(e);

@ -2,14 +2,13 @@ package cn.estsh.i3plus.core.apiservice.controller.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskTimeExpressionService; import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskTimeExpressionService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskTimeService; import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskTimeService;
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
import cn.estsh.i3plus.platform.common.tool.StringTool; import cn.estsh.i3plus.platform.common.tool.StringTool;
import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.*; import cn.estsh.i3plus.pojo.platform.bean.SysTaskTime;
import cn.estsh.i3plus.pojo.platform.bean.SysTaskTimeExpression;
import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.base.controller.CoreBaseController;
import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppBusiException;
@ -75,12 +74,10 @@ public class SysTaskTimeController extends CoreBaseController{
taskTimeService.executeSysTaskTimeById(taskTime.getId()); taskTimeService.executeSysTaskTimeById(taskTime.getId());
} }
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(taskTime); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(taskTime);
} catch (ImppBusiException busExcep) { }catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
} catch (Exception e) { }catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "{}", e.getMessage(), e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
} }
} }
@ -113,12 +110,10 @@ public class SysTaskTimeController extends CoreBaseController{
taskTimeService.executeSysTaskTimeById(taskTime.getId()); taskTimeService.executeSysTaskTimeById(taskTime.getId());
} }
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(taskTime); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(taskTime);
} catch (ImppBusiException busExcep) { }catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
} catch (Exception e) { }catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "{}", e.getMessage(), e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
} }
} }
@ -131,12 +126,10 @@ public class SysTaskTimeController extends CoreBaseController{
taskTimeService.deleteSysTaskTimeById(Long.parseLong(id)); taskTimeService.deleteSysTaskTimeById(Long.parseLong(id));
return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) { }catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
} catch (Exception e) { }catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "{}", e.getMessage(), e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
} }
} }
@ -148,12 +141,10 @@ public class SysTaskTimeController extends CoreBaseController{
return ResultBean.success("操作成功") return ResultBean.success("操作成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultList(list); .setResultList(list);
} catch (ImppBusiException busExcep) { }catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
} catch (Exception e) { }catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "{}", e.getMessage(), e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
} }
} }
@ -169,31 +160,27 @@ public class SysTaskTimeController extends CoreBaseController{
return ResultBean.success("操作成功") return ResultBean.success("操作成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultObject(taskTime); .setResultObject(taskTime);
} catch (ImppBusiException busExcep) { }catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
} catch (Exception e) { }catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "{}", e.getMessage(), e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
} }
} }
@PutMapping(value = "/status") @PutMapping(value = "/status/{id}/{status}")
@ApiOperation(value = "修改定时任务状态", notes = "根据ID修改定时任务状态") @ApiOperation(value = "修改定时任务状态", notes = "根据ID修改定时任务状态")
public ResultBean updateQuartzStatus(String id,int status) { public ResultBean updateQuartzStatus(@PathVariable("id") String idStr,@PathVariable("status") Integer status) {
try { try {
// 数据校验 // 数据校验
ValidatorBean.checkNotNull(id, "功能id 不能为空"); ValidatorBean.checkNotNull(idStr, "id 不能为空");
ValidatorBean.checkNotZero(status, "功能状态不能为空"); ValidatorBean.checkNotZero(status, "状态不能为空");
taskTimeService.updateSysTaskTimeStatus(Long.parseLong(id),status,AuthUtil.getSessionUser()); taskTimeService.updateSysTaskTimeStatus(Long.parseLong(idStr),status,AuthUtil.getSessionUser());
return new ResultBean(true); return new ResultBean(true);
} catch(ImppBusiException busExcep){ }catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
}catch(Exception e){ }catch(Exception e){
LOGGER.error(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getDescription() + "{}",e.getMessage(),e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
} }
} }
@ -204,11 +191,9 @@ public class SysTaskTimeController extends CoreBaseController{
ListPager taskTimeListPager = taskTimeService.querySysTaskTimeByPager(taskTime,pager); ListPager taskTimeListPager = taskTimeService.querySysTaskTimeByPager(taskTime,pager);
return ResultBean.success("查询成功").setListPager(taskTimeListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); return ResultBean.success("查询成功").setListPager(taskTimeListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){ }catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
}catch(Exception e){ }catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "{}",e.getMessage(),e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
} }
} }
@ -227,11 +212,9 @@ public class SysTaskTimeController extends CoreBaseController{
taskTimeService.deleteSysTaskTimeByIds(StringTool.getArrayLong(ids)); taskTimeService.deleteSysTaskTimeByIds(StringTool.getArrayLong(ids));
return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){ }catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
}catch(Exception e){ }catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "{}",e.getMessage(),e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
} }
} }
@ -251,12 +234,10 @@ public class SysTaskTimeController extends CoreBaseController{
taskTimeService.updateSysTaskTimeStatusByIds(StringTool.getArrayLong(ids),status); taskTimeService.updateSysTaskTimeStatusByIds(StringTool.getArrayLong(ids),status);
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch(ImppBusiException busExcep){ }catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
}catch(Exception e){ }catch(Exception e){
LOGGER.error(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getDescription() + "{}",e.getMessage(),e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
} }
} }
@ -269,12 +250,10 @@ public class SysTaskTimeController extends CoreBaseController{
taskTimeService.executeSysTaskTimeById(Long.parseLong(id)); taskTimeService.executeSysTaskTimeById(Long.parseLong(id));
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) { }catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
} catch (Exception e) { }catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "{}", e.getMessage(), e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
} }
} }
} }

@ -50,14 +50,11 @@ public class SysTaskTimeExpressionController extends CoreBaseController{
.notNull("expressionStartDatetime",timeExpression.getExpressionStartDatetime()); .notNull("expressionStartDatetime",timeExpression.getExpressionStartDatetime());
taskTimeExpressionService.insertSysTaskTimeExpression(timeExpression); taskTimeExpressionService.insertSysTaskTimeExpression(timeExpression);
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) { }catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
} catch (Exception e) { }catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "{}", e.getMessage(), e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
} }
} }
@ -74,12 +71,10 @@ public class SysTaskTimeExpressionController extends CoreBaseController{
taskTimeExpressionService.updateSysTaskTimeExpression(timeExpression); taskTimeExpressionService.updateSysTaskTimeExpression(timeExpression);
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) { }catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
} catch (Exception e) { }catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "{}", e.getMessage(), e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
} }
} }
@ -92,12 +87,10 @@ public class SysTaskTimeExpressionController extends CoreBaseController{
taskTimeExpressionService.deleteSysTaskTimeExpressionById(Long.parseLong(id)); taskTimeExpressionService.deleteSysTaskTimeExpressionById(Long.parseLong(id));
return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) { }catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
} catch (Exception e) { }catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "{}", e.getMessage(), e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
} }
} }
@ -106,15 +99,11 @@ public class SysTaskTimeExpressionController extends CoreBaseController{
public ResultBean findSysTaskTimeExpressionAll() { public ResultBean findSysTaskTimeExpressionAll() {
try { try {
List<SysTaskTimeExpression> list = taskTimeExpressionService.listSysTaskTimeExpression(); List<SysTaskTimeExpression> list = taskTimeExpressionService.listSysTaskTimeExpression();
return ResultBean.success("操作成功") return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(list);
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) }catch(ImppBusiException busExcep){
.setResultList(list);
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
} catch (Exception e) { }catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "{}", e.getMessage(), e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
} }
} }
@ -127,15 +116,11 @@ public class SysTaskTimeExpressionController extends CoreBaseController{
SysTaskTimeExpression taskTimeExpression = taskTimeExpressionService.getSysTaskTimeExpressionById(Long.parseLong(id)); SysTaskTimeExpression taskTimeExpression = taskTimeExpressionService.getSysTaskTimeExpressionById(Long.parseLong(id));
return ResultBean.success("操作成功") return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(taskTimeExpression);
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) }catch(ImppBusiException busExcep){
.setResultObject(taskTimeExpression);
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
} catch (Exception e) { }catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "{}", e.getMessage(), e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
} }
} }
@ -146,19 +131,17 @@ public class SysTaskTimeExpressionController extends CoreBaseController{
ListPager taskTimeExpressionListPager = taskTimeExpressionService.querySysTaskTimeExpressionByPager(taskTimeExpression,pager); ListPager taskTimeExpressionListPager = taskTimeExpressionService.querySysTaskTimeExpressionByPager(taskTimeExpression,pager);
return ResultBean.success("查询成功").setListPager(taskTimeExpressionListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); return ResultBean.success("查询成功").setListPager(taskTimeExpressionListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){ }catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
}catch(Exception e){ }catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "{}",e.getMessage(),e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
} }
} }
@DeleteMapping("/batch-delete") @DeleteMapping("/batch-delete")
@ApiOperation(value = "根据id批量删除时间表达式",notes = "根据id批量删除时间表达式") @ApiOperation(value = "根据id批量删除时间表达式",notes = "根据id批量删除时间表达式")
public ResultBean deleteSysTaskTimeExpressionByIds(String[] ids){ public ResultBean deleteSysTaskTimeExpressionByIds(String[] idsStr){
try{ try{
if(ids.length == 0){ if(idsStr.length == 0){
throw ImppExceptionBuilder.newInstance() throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
@ -166,14 +149,12 @@ public class SysTaskTimeExpressionController extends CoreBaseController{
.build(); .build();
} }
taskTimeExpressionService.deleteSysTaskTimeExpressionByIds(StringTool.getArrayLong(ids)); taskTimeExpressionService.deleteSysTaskTimeExpressionByIds(StringTool.getArrayLong(idsStr));
return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){ }catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
}catch(Exception e){ }catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "{}",e.getMessage(),e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
} }
} }
} }

@ -47,9 +47,6 @@ public class SysUserController extends CoreBaseController{
public static final Logger LOGGER = LoggerFactory.getLogger(SysUserController.class); public static final Logger LOGGER = LoggerFactory.getLogger(SysUserController.class);
@Resource(name="redisCore")
private ImppRedis redisCore;
@Autowired @Autowired
private ISysUserService sysUserService; private ISysUserService sysUserService;
@ -93,7 +90,7 @@ public class SysUserController extends CoreBaseController{
//新增初始化 //新增初始化
sysUser.setUserName(userInfo.getName()); sysUser.setUserName(userInfo.getName());
sysUser.setUserStatus(CommonEnumUtil.USER_STATUS.NORMAL.getValue()); sysUser.setUserStatus(CommonEnumUtil.USER_STATUS.ENABLE.getValue());
sysUser.setDepartmentId(userInfo.getDepartmentId()); sysUser.setDepartmentId(userInfo.getDepartmentId());
sysUser.setDepartmentNameRdd(userInfo.getDepartmentNameRdd()); sysUser.setDepartmentNameRdd(userInfo.getDepartmentNameRdd());
sysUser.setIsValid(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); sysUser.setIsValid(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
@ -449,17 +446,17 @@ public class SysUserController extends CoreBaseController{
sysUserService.updateSysUser(user); sysUserService.updateSysUser(user);
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}else { }else {
return ResultBean.success("操作失败") return ResultBean.fail("操作失败")
.setCode(ResourceEnumUtil.MESSAGE.FAIL.getCode()) .setCode(ResourceEnumUtil.MESSAGE.FAIL.getCode())
.setErrorMsg("请勿修改邮箱信息"); .setErrorMsg("请勿修改邮箱信息");
} }
}else { }else {
return ResultBean.success("操作失败") return ResultBean.fail("操作失败")
.setCode(ResourceEnumUtil.MESSAGE.FAIL.getCode()) .setCode(ResourceEnumUtil.MESSAGE.FAIL.getCode())
.setErrorMsg("验证码错误请重新输入"); .setErrorMsg("验证码错误请重新输入");
} }
}else { }else {
return ResultBean.success("操作失败") return ResultBean.fail("操作失败")
.setCode(ResourceEnumUtil.MESSAGE.FAIL.getCode()) .setCode(ResourceEnumUtil.MESSAGE.FAIL.getCode())
.setErrorMsg("验证码已过期"); .setErrorMsg("验证码已过期");
} }

@ -72,7 +72,7 @@ public class SysUserInfoController extends CoreBaseController{
.checkNotZero("positionId",userInfo.getPositionId()); .checkNotZero("positionId",userInfo.getPositionId());
ConvertBean.modelInitialize(userInfo,user); ConvertBean.modelInitialize(userInfo,user);
userInfo.setUserInfoStatus(CommonEnumUtil.USER_STATUS.NORMAL.getValue()); userInfo.setUserInfoStatus(CommonEnumUtil.USER_STATUS.ENABLE.getValue());
SysUserInfo pos = sysUserInfoService.insertSysUserInfo(userInfo); SysUserInfo pos = sysUserInfoService.insertSysUserInfo(userInfo);
sysUserInfoService.refreshRefUserDepartment(pos.getId(), sysUserInfoService.refreshRefUserDepartment(pos.getId(),

@ -14,7 +14,6 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.amqp.core.Message; import org.springframework.amqp.core.Message;
import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ -82,7 +81,7 @@ public class LetterQueueReceiver {
); );
} }
msg.setMessageSenderNameRdd(StringUtils.join(receiverName, ",")); msg.setMessageReceiversNameRdd(StringUtils.join(receiverName, ","));
sysMessageService.updateSysMessage(msg); sysMessageService.updateSysMessage(msg);

@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.base;
import cn.estsh.i3plus.core.api.iservice.base.ISystemLoginService; import cn.estsh.i3plus.core.api.iservice.base.ISystemLoginService;
import cn.estsh.i3plus.platform.common.tool.EncryptTool; import cn.estsh.i3plus.platform.common.tool.EncryptTool;
import cn.estsh.i3plus.platform.common.util.CommonConstWords;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.shirotoken.AdminToken; import cn.estsh.i3plus.pojo.base.shirotoken.AdminToken;
import cn.estsh.i3plus.pojo.base.shirotoken.SaAdminToken; import cn.estsh.i3plus.pojo.base.shirotoken.SaAdminToken;
@ -12,12 +13,17 @@ import cn.estsh.i3plus.pojo.platform.repository.SysUserRepository;
import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
import cn.estsh.impp.framework.boot.util.ImppRedis;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authc.AuthenticationException;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
/** /**
* @Description : * @Description :
@ -33,6 +39,12 @@ public class SystemLoginService implements ISystemLoginService {
@Autowired @Autowired
private SysUserRepository sysUserRDao; private SysUserRepository sysUserRDao;
/**
*
*/
@Resource(name="redisCore")
protected ImppRedis redisCore;
@Override @Override
public SessionUser queryUserLogin(String loginName, String loginPwd, String languageCode) { public SessionUser queryUserLogin(String loginName, String loginPwd, String languageCode) {
//生成令牌 //生成令牌
@ -79,6 +91,26 @@ public class SystemLoginService implements ISystemLoginService {
return packSessionUser(user,CommonEnumUtil.USER_TYPE.SA.getCode(),saAdminToken.getLanguageCode()); return packSessionUser(user,CommonEnumUtil.USER_TYPE.SA.getCode(),saAdminToken.getLanguageCode());
} }
@Override
// @Transactional(propagation = Propagation.NOT_SUPPORTED)
public Integer doLoginPasswordError(SysUser user) {
String redisKey = CommonConstWords.USER_LOGIN_ERROR + "_" + user.getId();
// Object redisValue = redisCore.getObject(redisKey);
Object redisValue = AuthUtil.getSessionAttribute(redisKey);
Integer num = redisValue == null ? 1 : Integer.parseInt(redisValue.toString()) + 1;
if(num >= CommonConstWords.USER_LOGIN_ERROR_MAX_NUM){
// user.setUserStatus(CommonEnumUtil.USER_STATUS.LOCKING.getValue());
redisCore.putObject(redisKey,num,0); // 账号锁定后移除锁
sysUserRDao.update(user);
}
redisCore.putObject(redisKey,num,24 * 60 * 60);
AuthUtil.setSessionObject(redisKey,num);
return num;
}
/** /**
* *
* @param loginName * @param loginName
@ -90,15 +122,29 @@ public class SystemLoginService implements ISystemLoginService {
if(user == null){ //用户不存在 if(user == null){ //用户不存在
throw new AuthenticationException("用户不存在"); throw new AuthenticationException("用户不存在");
}else { }else {
try { // 密码加密 if(user.getUserStatus() != CommonEnumUtil.USER_STATUS.ENABLE.getValue()){
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.LOGIN_USER_NAME_EXCEPTION.getCode())
.setErrorDetail("账号状态:"+CommonEnumUtil.USER_STATUS.valueOf(user.getUserStatus()))
.setErrorSolution("请联系管理员")
.build();
}
try {
// 密码加密
pwd = EncryptTool.hexMD5(pwd); pwd = EncryptTool.hexMD5(pwd);
} catch (Exception e) { } catch (Exception e) {
LOGGER.error("登录密码加密出错。"); LOGGER.error("登录密码加密出错。");
throw new AuthenticationException("登陆密码错误"); throw new AuthenticationException("登陆密码错误");
// doLoginPasswordError( user);
// throw new AuthenticationException("密码输入错误。如果输错次数超过"+CommonConstWords.USER_LOGIN_ERROR_MAX_NUM+"次,用户将被锁定。");
} }
if (!StringUtils.equals(user.getUserLoginPassword(), pwd)) { //密码不符 if (!StringUtils.equals(user.getUserLoginPassword(), pwd)) { //密码不符
throw new AuthenticationException("登陆密码错误"); throw new AuthenticationException("登陆密码错误");
// doLoginPasswordError( user);
// throw new AuthenticationException("密码输入错误。如果输错次数超过"+CommonConstWords.USER_LOGIN_ERROR_MAX_NUM+"次,用户将被锁定。");
} }
return user; return user;
} }
} }
@ -120,4 +166,6 @@ public class SystemLoginService implements ISystemLoginService {
return sessionUser; return sessionUser;
} }
} }

@ -151,9 +151,10 @@ public class SysDepartmentService implements ISysDepartmentService {
LOGGER.info("部门信息 DEPARTMENT department:{}",department); LOGGER.info("部门信息 DEPARTMENT department:{}",department);
departmentRDao.update(department); departmentRDao.update(department);
// 修改冗余信息 // 修改冗余信息
// 修改冗余信息
departmentRDao.updateByProperties("parentId",department.getId(), departmentRDao.updateByProperties("parentId",department.getId(),
"parentNameRdd",department.getName()); new String[]{"parentNameRdd", "organizeId", "organizeNameRdd"},
new Object[]{department.getName(), department.getOrganizeId(), department.getOrganizeNameRdd()});
} }
@Override @Override

@ -14,6 +14,7 @@ import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
import cn.estsh.impp.framework.boot.util.ValidatorBean; import cn.estsh.impp.framework.boot.util.ValidatorBean;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -36,9 +37,11 @@ public class SysDictionaryService implements ISysDictionaryService {
private SysDictionaryRepository sysDictionaryRDao; private SysDictionaryRepository sysDictionaryRDao;
@Override @Override
@ApiOperation(value = "添加字典")
public void insertSysDictionary(SysDictionary sysDictionary) { public void insertSysDictionary(SysDictionary sysDictionary) {
long repeatCount = sysDictionaryRDao.findByPropertyCount("dictionaryCode",sysDictionary.getDictionaryCode()); long repeatCodeCount = sysDictionaryRDao.findByPropertyCount("dictionaryCode",sysDictionary.getDictionaryCode());
if (repeatCount > 0){ long repeatValueCount = sysDictionaryRDao.findByPropertyCount("dictionaryValue",sysDictionary.getDictionaryValue());
if (repeatCodeCount > 0 || repeatValueCount > 0){
throw ImppExceptionBuilder.newInstance() throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.IO_EXCEPTION.getCode()) .setErrorCode(ImppExceptionEnum.IO_EXCEPTION.getCode())
@ -64,17 +67,21 @@ public class SysDictionaryService implements ISysDictionaryService {
} }
@Override @Override
@ApiOperation(value = "根据id删除字典")
public void deleteSysDictionaryById(Long id) { public void deleteSysDictionaryById(Long id) {
LOGGER.info("字典 SYS_DICTIONARY id:{}",id); LOGGER.info("字典 SYS_DICTIONARY id:{}",id);
sysDictionaryRDao.deleteById(id); sysDictionaryRDao.deleteById(id);
} }
@Override @Override
@ApiOperation(value = "修改字典")
public void updateSysDictionary(SysDictionary sysDictionary) { public void updateSysDictionary(SysDictionary sysDictionary) {
// 校验唯一 // 校验唯一
String hqlPack = CoreHqlPack.packHqlSysDictionaryCode(sysDictionary); String hqlPack = CoreHqlPack.packHqlSysDictionaryCode(sysDictionary);
long repeatCount = sysDictionaryRDao.findByHqlWhereCount(hqlPack); long repeatCodeCount = sysDictionaryRDao.findByHqlWhereCount(hqlPack);
if (repeatCount > 0){ hqlPack = CoreHqlPack.packHqlSysDictionaryValue(sysDictionary);
long repeatValueCount = sysDictionaryRDao.findByHqlWhereCount(hqlPack);
if (repeatCodeCount > 0 || repeatValueCount > 0){
throw ImppExceptionBuilder.newInstance() throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode())
@ -98,24 +105,28 @@ public class SysDictionaryService implements ISysDictionaryService {
} }
@Override @Override
@ApiOperation(value = "查询所有字典信息")
public List<SysDictionary> listSysDictionary() { public List<SysDictionary> listSysDictionary() {
LOGGER.info("字典 SYS_DICTIONARY list"); LOGGER.info("字典 SYS_DICTIONARY list");
return sysDictionaryRDao.list(); return sysDictionaryRDao.list();
} }
@Override @Override
@ApiOperation(value = "根据id查询字典信息")
public SysDictionary getSysDictionaryById(Long id) { public SysDictionary getSysDictionaryById(Long id) {
LOGGER.info("字典 SYS_DICTIONARY id:{}",id); LOGGER.info("字典 SYS_DICTIONARY id:{}",id);
return sysDictionaryRDao.getById(id); return sysDictionaryRDao.getById(id);
} }
@Override @Override
@ApiOperation(value = "根据父级代码查询字典项信息")
public List<SysDictionary> findSysDictionaryByParentCode(String parentCode) { public List<SysDictionary> findSysDictionaryByParentCode(String parentCode) {
LOGGER.info("字典 SYS_DICTIONARY parentCode:{}",parentCode); LOGGER.info("字典 SYS_DICTIONARY parentCode:{}",parentCode);
return sysDictionaryRDao.findByProperty("parentCodeRdd",parentCode); return sysDictionaryRDao.findByProperty("parentCodeRdd",parentCode);
} }
@Override @Override
@ApiOperation(value = "字典复杂查询,分页,排序",notes = "默认查询非顶级字典")
public ListPager querySysDictionaryByPager(SysDictionary sysDictionary, Pager pager) { public ListPager querySysDictionaryByPager(SysDictionary sysDictionary, Pager pager) {
sysDictionary = sysDictionary == null ? new SysDictionary():sysDictionary; sysDictionary = sysDictionary == null ? new SysDictionary():sysDictionary;
@ -125,18 +136,21 @@ public class SysDictionaryService implements ISysDictionaryService {
} }
@Override @Override
@ApiOperation(value = "查询顶级字典")
public List<SysDictionary> findSysDictionaryByTop() { public List<SysDictionary> findSysDictionaryByTop() {
LOGGER.info("字典 SYS_DICTIONARY parentId:{}", CommonEnumUtil.PARENT.DEFAULT.getValue()); LOGGER.info("字典 SYS_DICTIONARY parentId:{}", CommonEnumUtil.PARENT.DEFAULT.getValue());
return sysDictionaryRDao.findByProperty("parentId",(long)CommonEnumUtil.PARENT.DEFAULT.getValue()); return sysDictionaryRDao.findByProperty("parentId",(long)CommonEnumUtil.PARENT.DEFAULT.getValue());
} }
@Override @Override
@ApiOperation(value = "批量删除字典")
public void deleteSysDictionaryByIds(Long[] ids) { public void deleteSysDictionaryByIds(Long[] ids) {
LOGGER.info("字典 SYS_DICTIONARY ids:{}", ids.toString()); LOGGER.info("字典 SYS_DICTIONARY ids:{}", ids.toString());
sysDictionaryRDao.deleteByIds(ids); sysDictionaryRDao.deleteByIds(ids);
} }
@Override @Override
@ApiOperation(value = "检出文件名称是否符合系统规范")
public boolean checkFileName(String fileName) { public boolean checkFileName(String fileName) {
List<SysDictionary> list = findSysDictionaryByParentCode(CommonConstWords.DICTIONARY_FILE_TYPE); List<SysDictionary> list = findSysDictionaryByParentCode(CommonConstWords.DICTIONARY_FILE_TYPE);
@ -153,6 +167,7 @@ public class SysDictionaryService implements ISysDictionaryService {
} }
@Override @Override
@ApiOperation(value = "根据父节点 以及当前节点CODE 获取字典信息")
public SysDictionary getSysDictionaryByParentCodeAndCode(String parentCode, String code) { public SysDictionary getSysDictionaryByParentCodeAndCode(String parentCode, String code) {
List<SysDictionary> list = sysDictionaryRDao.findByProperty(new String[]{"parentCodeRdd","dictionaryCode"}, List<SysDictionary> list = sysDictionaryRDao.findByProperty(new String[]{"parentCodeRdd","dictionaryCode"},
new Object[]{parentCode,code}); new Object[]{parentCode,code});

@ -68,7 +68,7 @@ public class SysRoleService implements ISysRoleService {
StringBuffer where = new StringBuffer(); StringBuffer where = new StringBuffer();
HqlPack.getInPack(StringUtils.join( ids,","), "id", where); HqlPack.getInPack(StringUtils.join( ids,","), "id", where);
sysRoleRDao.updateByHqlWhere(where.toString(), "roleStatusId", status); sysRoleRDao.updateByHqlWhere(where.toString(), "roleStatus", status);
} }
@Override @Override

@ -11,6 +11,7 @@ import cn.estsh.i3plus.pojo.platform.repository.SysTaskTimeRepository;
import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -37,36 +38,42 @@ public class SysTaskTimeExpressionService implements ISysTaskTimeExpressionServi
private SysTaskTimeRepository taskTimeRDao; private SysTaskTimeRepository taskTimeRDao;
@Override @Override
@ApiOperation(value = "修改数据")
public void updateSysTaskTimeExpression(SysTaskTimeExpression taskTimeExpression) { public void updateSysTaskTimeExpression(SysTaskTimeExpression taskTimeExpression) {
LOGGER.info("定时任务时间表达式 TASK_TIME_EXPRESSION :{}", taskTimeExpression); LOGGER.info("定时任务时间表达式 TASK_TIME_EXPRESSION :{}", taskTimeExpression);
taskTimeExpressionRDao.update(taskTimeExpression); taskTimeExpressionRDao.update(taskTimeExpression);
} }
@Override @Override
@ApiOperation(value = "根据id删除数据")
public void deleteSysTaskTimeExpressionById(Long id) { public void deleteSysTaskTimeExpressionById(Long id) {
LOGGER.info("定时任务时间表达式 TASK_TIME_EXPRESSION :{}", id); LOGGER.info("定时任务时间表达式 TASK_TIME_EXPRESSION :{}", id);
taskTimeExpressionRDao.deleteById(id); taskTimeExpressionRDao.deleteById(id);
} }
@Override @Override
@ApiOperation(value = "新增数据")
public SysTaskTimeExpression insertSysTaskTimeExpression(SysTaskTimeExpression taskTimeExpression) { public SysTaskTimeExpression insertSysTaskTimeExpression(SysTaskTimeExpression taskTimeExpression) {
LOGGER.info("定时任务时间表达式 TASK_TIME_EXPRESSION :{}", taskTimeExpression); LOGGER.info("定时任务时间表达式 TASK_TIME_EXPRESSION :{}", taskTimeExpression);
return taskTimeExpressionRDao.insert(taskTimeExpression); return taskTimeExpressionRDao.insert(taskTimeExpression);
} }
@Override @Override
@ApiOperation(value = "查询所有数据")
public List<SysTaskTimeExpression> listSysTaskTimeExpression() { public List<SysTaskTimeExpression> listSysTaskTimeExpression() {
LOGGER.info("定时任务时间表达式 TASK_TIME_EXPRESSION list"); LOGGER.info("定时任务时间表达式 TASK_TIME_EXPRESSION list");
return taskTimeExpressionRDao.list(); return taskTimeExpressionRDao.list();
} }
@Override @Override
@ApiOperation(value = "根据ID 查询任务表达式")
public SysTaskTimeExpression getSysTaskTimeExpressionById(Long id) { public SysTaskTimeExpression getSysTaskTimeExpressionById(Long id) {
LOGGER.info("定时任务时间表达式 TASK_TIME_EXPRESSION :{}" ,id); LOGGER.info("定时任务时间表达式 TASK_TIME_EXPRESSION :{}" ,id);
return taskTimeExpressionRDao.getById(id); return taskTimeExpressionRDao.getById(id);
} }
@Override @Override
@ApiOperation(value = "任务表达式查询,分页,排序")
public ListPager querySysTaskTimeExpressionByPager(SysTaskTimeExpression taskTimeExpression, Pager pager) { public ListPager querySysTaskTimeExpressionByPager(SysTaskTimeExpression taskTimeExpression, Pager pager) {
LOGGER.info("文件表达式 TASK_TIME_EXPRESSION taskTimeExpression:{}Pager:{}",taskTimeExpression,pager); LOGGER.info("文件表达式 TASK_TIME_EXPRESSION taskTimeExpression:{}Pager:{}",taskTimeExpression,pager);
if(taskTimeExpression == null) { if(taskTimeExpression == null) {
@ -80,9 +87,10 @@ public class SysTaskTimeExpressionService implements ISysTaskTimeExpressionServi
} }
@Override @Override
@ApiOperation(value = "任务表达式批量删除")
public void deleteSysTaskTimeExpressionByIds(Long[] ids) { public void deleteSysTaskTimeExpressionByIds(Long[] ids) {
LOGGER.info("文件表达式 SYS_MENU ids:{}", ids); LOGGER.info("文件表达式 SYS_MENU ids:{}", ids);
long count = taskTimeRDao.findByHqlWhereCount(CoreHqlPack.packHqlIds("timeId",ids)); long count = taskTimeRDao.findByHqlWhereCount(CoreHqlPack.packHqlIds("timeExpressionId",ids));
if(count >= 1){ if(count >= 1){
throw ImppExceptionBuilder.newInstance() throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())

@ -16,6 +16,7 @@ import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
import cn.estsh.impp.framework.boot.util.ValidatorBean; import cn.estsh.impp.framework.boot.util.ValidatorBean;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.quartz.*; import org.quartz.*;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -36,7 +37,7 @@ import java.util.List;
* @Modify : * @Modify :
**/ **/
@Service @Service
public class SysTaskTimeService implements ISysTaskTimeService { public class SysTaskTimeService implements ISysTaskTimeService{
public static final Logger LOGGER = LoggerFactory.getLogger(SysTaskTimeService.class); public static final Logger LOGGER = LoggerFactory.getLogger(SysTaskTimeService.class);
@ -50,16 +51,16 @@ public class SysTaskTimeService implements ISysTaskTimeService {
private Scheduler scheduler; private Scheduler scheduler;
@Override @Override
@ApiOperation(value = "修改定时任务")
public void updateSysTaskTime(SysTaskTime taskTime, SysTaskTimeExpression taskTimeExpression) { public void updateSysTaskTime(SysTaskTime taskTime, SysTaskTimeExpression taskTimeExpression) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
SysTaskTime oldSysTaskTime = taskTimeRDao.getById(taskTime.getId()); SysTaskTime oldSysTaskTime = taskTimeRDao.getById(taskTime.getId());
// 更新关系表 // 更新关系表
refExpressionTriggerRDao.updateByProperties( refExpressionTriggerRDao.updateByProperties(new String[]{"triggerName","triggerGroupName"},
"expressionId",oldSysTaskTime.getTimeExpressionId(), new String[]{oldSysTaskTime.getName(),taskTime.getGroupName()},
new String[]{"name","groupName"}, "expressionId",oldSysTaskTime.getTimeExpressionId()
new String[]{oldSysTaskTime.getName(),taskTime.getGroupName()}
); );
taskTimeRDao.update(taskTime); taskTimeRDao.update(taskTime);
@ -106,6 +107,7 @@ public class SysTaskTimeService implements ISysTaskTimeService {
} }
@Override @Override
@ApiOperation(value = "修改任务状态")
public void updateSysTaskTimeStatus(Long id, int status, SessionUser user) { public void updateSysTaskTimeStatus(Long id, int status, SessionUser user) {
LOGGER.info("定时任务 SYS_MENU id:{} status:{} user:{}", id,status,user); LOGGER.info("定时任务 SYS_MENU id:{} status:{} user:{}", id,status,user);
SysTaskTime taskTime = taskTimeRDao.getById(id); SysTaskTime taskTime = taskTimeRDao.getById(id);
@ -130,6 +132,7 @@ public class SysTaskTimeService implements ISysTaskTimeService {
} }
@Override @Override
@ApiOperation(value = "根据根据id删除数据")
public void deleteSysTaskTimeById(Long id) { public void deleteSysTaskTimeById(Long id) {
try { try {
SysTaskTime taskTime = taskTimeRDao.getById(id); SysTaskTime taskTime = taskTimeRDao.getById(id);
@ -160,6 +163,7 @@ public class SysTaskTimeService implements ISysTaskTimeService {
} }
@Override @Override
@ApiOperation(value = "新增定时任务")
public SysTaskTime insertSysTaskTime(SysTaskTime taskTime, SysTaskTimeExpression taskTimeExpression) { public SysTaskTime insertSysTaskTime(SysTaskTime taskTime, SysTaskTimeExpression taskTimeExpression) {
try { try {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@ -226,18 +230,21 @@ public class SysTaskTimeService implements ISysTaskTimeService {
} }
@Override @Override
@ApiOperation(value = "查询所有数据")
public List<SysTaskTime> listSysTaskTime() { public List<SysTaskTime> listSysTaskTime() {
LOGGER.info("定时任务 TASK_TIME find All"); LOGGER.info("定时任务 TASK_TIME find All");
return taskTimeRDao.findAll(); return taskTimeRDao.findAll();
} }
@Override @Override
@ApiOperation(value = "根据id 数据")
public SysTaskTime getSysTaskTimeById(Long id) { public SysTaskTime getSysTaskTimeById(Long id) {
LOGGER.info("定时任务 TASK_TIME find id:{}", id); LOGGER.info("定时任务 TASK_TIME find id:{}", id);
return taskTimeRDao.getOne(id); return taskTimeRDao.getOne(id);
} }
@Override @Override
@ApiOperation(value = "定时任务复制查询,分页,排序")
public ListPager querySysTaskTimeByPager(SysTaskTime taskTime, Pager pager) { public ListPager querySysTaskTimeByPager(SysTaskTime taskTime, Pager pager) {
LOGGER.info("定时任务 TASK_TIME SysTaskTime:{}Pager:{}",taskTime,pager); LOGGER.info("定时任务 TASK_TIME SysTaskTime:{}Pager:{}",taskTime,pager);
if(taskTime == null) { if(taskTime == null) {
@ -251,12 +258,14 @@ public class SysTaskTimeService implements ISysTaskTimeService {
} }
@Override @Override
@ApiOperation(value = "根据id批量删除定时任务")
public void deleteSysTaskTimeByIds(Long[] ids) { public void deleteSysTaskTimeByIds(Long[] ids) {
LOGGER.info("定时任务 TASK_TIME ids:{}", ids.toString()); LOGGER.info("定时任务 TASK_TIME ids:{}", ids.toString());
taskTimeRDao.deleteByIds(ids); taskTimeRDao.deleteByIds(ids);
} }
@Override @Override
@ApiOperation(value = "批量修改定时任务状态")
public void updateSysTaskTimeStatusByIds(Long[] ids, Integer status) { public void updateSysTaskTimeStatusByIds(Long[] ids, Integer status) {
LOGGER.info("定时任务 TASK_TIME ids{}status{}",ids,status); LOGGER.info("定时任务 TASK_TIME ids{}status{}",ids,status);
StringBuffer where = new StringBuffer(); StringBuffer where = new StringBuffer();
@ -266,6 +275,7 @@ public class SysTaskTimeService implements ISysTaskTimeService {
} }
@Override @Override
@ApiOperation(value = "修改最后时间")
public void doSysTaskTimeLastDateByNameAndGroupName(String lastDate, String name, String groupName) { public void doSysTaskTimeLastDateByNameAndGroupName(String lastDate, String name, String groupName) {
taskTimeRDao.updateByProperties( taskTimeRDao.updateByProperties(
new String[]{"name","groupName"},new String[]{name,groupName}, new String[]{"name","groupName"},new String[]{name,groupName},
@ -273,6 +283,7 @@ public class SysTaskTimeService implements ISysTaskTimeService {
} }
@Override @Override
@ApiOperation(value = "立即执行")
public void executeSysTaskTimeById(Long id) { public void executeSysTaskTimeById(Long id) {
SysTaskTime taskTime = taskTimeRDao.getById(id); SysTaskTime taskTime = taskTimeRDao.getById(id);
JobKey jobKey = JobKey.jobKey(taskTime.getName(),taskTime.getGroupName()); JobKey jobKey = JobKey.jobKey(taskTime.getName(),taskTime.getGroupName());

@ -90,6 +90,7 @@ public class SysUserService implements ISysUserService {
.build(); .build();
} }
packSessionUser(sessionUser, user, user.getUserType(), languageCode); packSessionUser(sessionUser, user, user.getUserType(), languageCode);
AuthUtil.setSessionUser(sessionUser); AuthUtil.setSessionUser(sessionUser);
refreshUserLoginInformation(user.getId()); refreshUserLoginInformation(user.getId());
@ -332,7 +333,7 @@ public class SysUserService implements ISysUserService {
int count; int count;
if(id > 0){ if(id > 0){
StringBuffer sw = new StringBuffer(); StringBuffer sw = new StringBuffer();
HqlPack.getStringEqualPackOr(userLoginName,"userLoginName",sw); HqlPack.getStringEqualPack(userLoginName,"userLoginName",sw);
HqlPack.getNumNOEqualPack(id,"id",sw); HqlPack.getNumNOEqualPack(id,"id",sw);
count = sysUserRDao.findByHqlWhereCount(sw.toString()); count = sysUserRDao.findByHqlWhereCount(sw.toString());
@ -348,7 +349,7 @@ public class SysUserService implements ISysUserService {
int count; int count;
if(id > 0){ if(id > 0){
StringBuffer sw = new StringBuffer(); StringBuffer sw = new StringBuffer();
HqlPack.getStringEqualPackOr(email,"userEmail",sw); HqlPack.getStringEqualPack(email,"userEmail",sw);
HqlPack.getNumNOEqualPack(id,"id",sw); HqlPack.getNumNOEqualPack(id,"id",sw);
count = sysUserRDao.findByHqlWhereCount(sw.toString()); count = sysUserRDao.findByHqlWhereCount(sw.toString());
@ -364,7 +365,7 @@ public class SysUserService implements ISysUserService {
int count; int count;
if(id > 0){ if(id > 0){
StringBuffer sw = new StringBuffer(); StringBuffer sw = new StringBuffer();
HqlPack.getStringEqualPackOr(phone,"userPhone",sw); HqlPack.getStringEqualPack(phone,"userPhone",sw);
HqlPack.getNumNOEqualPack(id,"id",sw); HqlPack.getNumNOEqualPack(id,"id",sw);
count = sysUserRDao.findByHqlWhereCount(sw.toString()); count = sysUserRDao.findByHqlWhereCount(sw.toString());
@ -379,7 +380,7 @@ public class SysUserService implements ISysUserService {
public void checkSysUserOnly(SysUser user) { public void checkSysUserOnly(SysUser user) {
if(user != null){ if(user != null){
// 登录名唯一教研 // 登录名唯一教研
if(checkSysUserLoginName(user.getUserLoginName(),user.getId())){ if(!checkSysUserLoginName(user.getUserLoginName(), user.getId() == null ? 0 : user.getId())){
throw ImppExceptionBuilder.newInstance() throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode())
@ -389,7 +390,7 @@ public class SysUserService implements ISysUserService {
} }
// 登录名唯一教研 // 登录名唯一教研
if(checkSysUserEmail(user.getUserEmail(),user.getId())){ if(!checkSysUserEmail(user.getUserEmail(),user.getId() == null ? 0 : user.getId())){
throw ImppExceptionBuilder.newInstance() throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode())
@ -399,7 +400,7 @@ public class SysUserService implements ISysUserService {
} }
// 登录名唯一教研 // 登录名唯一教研
if(checkSysUserPhone(user.getUserPhone(),user.getId())){ if(!checkSysUserPhone(user.getUserPhone(),user.getId() == null ? 0 : user.getId())){
throw ImppExceptionBuilder.newInstance() throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode())

Loading…
Cancel
Save