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

Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev

Browse Source
yun-zuoyi
alwaysfrin 6 years ago
parent 984ec34d2f ec90f78120
commit 409ea33ea0
8 changed files with 145 additions and 53 deletions
Show Stats Download Patch File Download Diff File

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

@ -107,4 +107,12 @@ public interface ISysTaskPlanService {
*/
@ApiOperation(value = "修改任务计划信息",notes = "修改任务计划信息，不会更新quartz数据库")
void updateSysTaskPlan(SysTaskPlan sysTaskPlan);
/**
* 批量删除任务计划信息
* @param ids
*/
@ApiOperation(value = "批量删除任务计划信息",notes = "批量删除任务计划信息")
void deleteSysTaskPlanByIds(Long[] ids);
}

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

@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskCycleService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskPlanService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskService;
import cn.estsh.i3plus.platform.common.tool.StringTool;
import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
@ -221,4 +222,20 @@ public class SysTaskPlanController extends CoreBaseController{
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@DeleteMapping("/batch-delete")
@ApiOperation(value = "根据id批量删除任务计划",notes = "根据id批量删除任务计划")
public ResultBean deleteSysTaskPlanByIds(String[] idsStr) {
try {
// 数据校验
ValidatorBean.checkNotNull(idsStr, "任务计划id 不能为空");
sysTaskPlanService.deleteSysTaskPlanByIds(StringTool.getArrayLong(idsStr));
return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
return ResultBean.fail(busExcep);
}catch(Exception e){
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
}

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

@ -404,9 +404,20 @@ public class CoreTreeService implements ICoreTreeService {
@Override
@ApiOperation(value = "父节点检查",notes = "检查菜单的父节点是否是当前节点的子节点")
public void doValidatorSysMenuParentId(SysMenu menu) {
if(menu != null){
if(menu.getParentId().longValue() == menu.getId().longValue()){
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("上级组织不能为当前系统功能")
.setErrorSolution("请重新操作")
.build();
}
findSysMenuChildrenTreePack(menu,0);
validatorSysMenuParentId(menu.getChildList(),menu.getParentId());
}
}
@Override
@ApiOperation(value = "获取组织部门树",notes = "根据父节点获取组织部门树集合")
@ -585,7 +596,7 @@ public class CoreTreeService implements ICoreTreeService {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("上级部门不能为子部门")
.setErrorDetail("上级部门不能为子目录")
.setErrorSolution("请重新操作")
.build();
}

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

@ -404,7 +404,7 @@ public class PersonnelServiceService implements IPersonnelService {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("["+positionList.get(0).getName()+"]存在相关岗位信息无法删除！")
.setErrorDetail("存在岗位信息["+positionList.get(0).getName()+"]无法删除！")
.setErrorSolution("请先删除子集信息在操作")
.build();
}
@ -422,7 +422,7 @@ public class PersonnelServiceService implements IPersonnelService {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("["+userInfoList.get(0).getName()+"]存在用户信息无法删除！")
.setErrorDetail("存在用户信息["+userInfoList.get(0).getName()+"]无法删除！")
.setErrorSolution("请先删除用户引用信息再操作")
.build();
}
@ -439,7 +439,7 @@ public class PersonnelServiceService implements IPersonnelService {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("["+departmentList.get(0).getName()+"]存在相关部门信息无法删除！")
.setErrorDetail("存在相关部门信息["+departmentList.get(0).getName()+"]无法删除！")
.setErrorSolution("请先删除子集信息在操作")
.build();
}
@ -457,7 +457,7 @@ public class PersonnelServiceService implements IPersonnelService {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("["+userInfoList.get(0).getName()+"]存在用户信息无法删除！")
.setErrorDetail("存在用户信息["+userInfoList.get(0).getName()+"]无法删除！")
.setErrorSolution("请先删除用户引用信息再操作")
.build();
}
@ -467,7 +467,7 @@ public class PersonnelServiceService implements IPersonnelService {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("["+userList.get(0).getUserLoginName()+"]存在账号信息无法删除！")
.setErrorDetail("存在账号信息["+userList.get(0).getUserLoginName()+"]无法删除！")
.setErrorSolution("请先删除账号引用信息再操作")
.build();
}
@ -484,7 +484,7 @@ public class PersonnelServiceService implements IPersonnelService {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("["+organizeList.get(0).getName()+"]存在相关组织信息无法删除！")
.setErrorDetail("存在相关组织信息["+organizeList.get(0).getName()+"]无法删除！")
.setErrorSolution("请先删除子集信息在操作")
.build();
}
@ -504,7 +504,7 @@ public class PersonnelServiceService implements IPersonnelService {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("["+departmentList.get(0).getName()+"]存在部门信息无法删除！")
.setErrorDetail("存在部门信息["+departmentList.get(0).getName()+"]无法删除！")
.setErrorSolution("请先删除部门引用信息再操作")
.build();
}
@ -514,7 +514,7 @@ public class PersonnelServiceService implements IPersonnelService {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("["+userInfoList.get(0).getName()+"]存在用户信息无法删除！")
.setErrorDetail("存在用户信息["+userInfoList.get(0).getName()+"]无法删除！")
.setErrorSolution("请先删除用户引用信息再操作")
.build();
}
@ -524,7 +524,7 @@ public class PersonnelServiceService implements IPersonnelService {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("["+userList.get(0).getUserLoginName()+"]存在账号信息无法删除！")
.setErrorDetail("存在账号信息["+userList.get(0).getUserLoginName()+"]无法删除！")
.setErrorSolution("请先删除账号引用信息再操作")
.build();
}

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

@ -116,7 +116,7 @@ public class SysOrganizeService implements ISysOrganizeService {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("["+list.get(0).getName()+"]存在相关组织信息无法删除！")
.setErrorDetail("["+list.get(0).getParentNameRdd()+"]存在相关组织信息无法删除！")
.setErrorSolution("请先删除子集信息在操作")
.build();
}else {

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

@ -23,6 +23,7 @@ import org.springframework.stereotype.Service;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
@ -68,12 +69,14 @@ public class SysTaskPlanService implements ISysTaskPlanService {
.build();
}
sysTaskPlan = sysTaskPlanRDao.insert(sysTaskPlan);
SysRefTaskCyclePlan refTaskCyclePlan = new SysRefTaskCyclePlan();
refTaskCyclePlan.setTaskCycleId(sysTaskCycle.getId());
refTaskCyclePlan.setTaskPlanId(sysTaskPlan.getId());
refTaskCyclePlan.setTaskPlanName(sysTaskPlan.getName());
refTaskCyclePlan.setTaskPlanGroupName(sysTaskPlan.getGroupName());
sysTaskPlan = sysTaskPlanRDao.insert(sysTaskPlan);
// 添加表达式与触发器关系表
sysRefTaskCyclePlanRDao.insert(refTaskCyclePlan);
@ -330,4 +333,54 @@ public class SysTaskPlanService implements ISysTaskPlanService {
public void updateSysTaskPlan(SysTaskPlan sysTaskPlan) {
sysTaskPlanRDao.update(sysTaskPlan);
}
@Override
@ApiOperation(value = "批量删除任务计划信息", notes = "批量删除任务计划信息")
public void deleteSysTaskPlanByIds(Long[] ids) {
try {
List<SysTaskPlan> sysTaskPlan = sysTaskPlanRDao.findByHqlWhere(CoreHqlPack.packHqlIds("id", ids));
List<TriggerKey> triggerKeyList = new ArrayList<>();
//数据校验
if (sysTaskPlan == null || sysTaskPlan.size() == 0) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode())
.setErrorDetail("任务计划不存在")
.setErrorSolution("请重新选择任务计划")
.build();
} else {
for (int i = 0; i < sysTaskPlan.size(); i++) {
triggerKeyList.add(TriggerKey.triggerKey(sysTaskPlan.get(i).getName(), sysTaskPlan.get(i).getGroupName()));
}
}
sysTaskPlanRDao.deleteByIds(ids);
// 删除关系表数据
sysRefTaskCyclePlanRDao.deleteByPropertyIn("taskPlanId", ids);
// 检查定时人计划是否存在，并暂停
for (TriggerKey trigger : triggerKeyList) {
if (scheduler.checkExists(trigger)) {
scheduler.pauseTrigger(trigger);
} else {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode())
.setErrorDetail("定时任务不存在")
.setErrorSolution("请重新选择")
.build();
}
}
// 取消调度任务
scheduler.unscheduleJobs(triggerKeyList);
} catch (SchedulerException e) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.TASK_EXCEPTION.getCode())
.build();
}
}
}

3
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/MailUtil.java
Unescape Escape View File

@ -200,6 +200,9 @@ public class MailUtil {
msg.setSubject( MimeUtility.encodeText(this.title, MimeUtility.mimeCharset("gb2312"), null));
msg.setSubject(this.title);
// 消息主体内容 处理
this.content = this.content == null ? "" : this.content;
msg.setContent(this.content, this.content_type);
msg.saveChanges();

4
modules/i3plus-core-apiservice/src/main/resources/application-dev.properties
Unescape Escape View File

@ -3,13 +3,13 @@ server.port=8100
#本机ip
impp.server.ip=192.168.1.56
#console控制台服务（zipkin追踪全路径）
impp.console.ip=http://csd.estsh.com
impp.console.ip=http://192.168.1.56:8010
################ 功能配置1 ################
#若无法连接注册中心，是否需要一直检测加入
impp.cluster.fetch=true
#服务注册中心
impp.cluster.regist.center=http://regd.estsh.com/eureka/
impp.cluster.regist.center=http://192.168.1.56:8000/eureka/
#多注册中心
#impp.cluster.regist.center=http://192.168.1.20:8000/eureka/,http://192.168.1.20:8001/eureka/

Write Preview
Loading…
Cancel
Save