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

Merge remote-tracking branch 'remotes/origin/dev' into test

Browse Source
yun-zuoyi
汪云昊 6 years ago
parent d425d1259c 97c78467e2
commit c910eafc47
8 changed files with 119 additions and 69 deletions
Show Stats Download Patch File Download Diff File

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

@ -80,7 +80,7 @@ public interface ISysFileService {
* @param file
*/
@ApiOperation(value = "上传文件资源",notes = "上传文件资源")
SysFile uploadFile(Object file,SysFile sysFile) throws Exception;
SysFile uploadFile(Object file,SysFile sysFile, String userName) throws Exception;
/**
* 根据文件代码获取文件信息

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

@ -215,6 +215,8 @@ public class PersonnelController extends CoreBaseController {
sysUser.setDepartmentNameRdd(userDepartment.getName());
sysUser.setOrganizeId(userOrganize.getId());
sysUser.setOrganizeNameRdd(userOrganize.getName());
sysUser.setUserName(userInfo.getName());
sysUser.setUserEmpNo(userInfo.getUserEmpNo());
// 关系 刷新
refreshRef(sysUser, userInfo, model);

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

@ -162,14 +162,14 @@ public class SysDictionaryController extends CoreBaseController{
.setErrorDetail("字典不存在")
.setErrorSolution("请重新选择")
.build();
}else if(!childList.isEmpty()){
}else if(childList!= null && !childList.isEmpty()){
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode())
.setErrorDetail("无法删除，存在子级字典：" + childList.get(0).getName())
.setErrorSolution("请重新选择")
.build();
} else if(sysDictionary.getIsDefault().intValue() == CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) {
} else if(sysDictionary.getIsDefaultVal() == CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode())

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

@ -13,6 +13,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.SysDictionary;
import cn.estsh.i3plus.pojo.platform.bean.SysFile;
import cn.estsh.impp.framework.base.controller.CoreBaseController;
import cn.estsh.impp.framework.boot.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.fastdfs.FastDFSClient;
@ -66,9 +67,7 @@ public class SysFileController extends CoreBaseController{
try {
// 条件验证
ValidatorBean.beginValid(sysFile)
.notNull("id", sysFile.getId())
.notNull("fileSoftType", sysFile.getFileSoftType())
.notNull("name", sysFile.getName());
.notNull("fileSoftType", sysFile.getFileSoftType());
sysFileService.updateSysFile(sysFile);
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
@ -262,7 +261,7 @@ public class SysFileController extends CoreBaseController{
.build();
}
SysFile fileDb = sysFileService.uploadFile(file,sysFile);
SysFile fileDb = sysFileService.uploadFile(file,sysFile, AuthUtil.getSessionUser().getUserName());
return ResultBean.success("上传成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(fileDb);
}catch(ImppBusiException busExcep){
return ResultBean.fail(busExcep);

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

@ -3,6 +3,9 @@ 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.icloud.andon.sdk.IAndonScheduleJobCloud;
import cn.estsh.i3plus.icloud.mes.pcn.sdk.IMesPcnScheduleJobCloud;
import cn.estsh.i3plus.icloud.mes.sdk.IMesScheduleJobCloud;
import cn.estsh.i3plus.icloud.wms.sdk.IWmsScheduleJobCloud;
import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
import cn.estsh.i3plus.platform.common.tool.StringTool;
@ -63,6 +66,15 @@ public class SysTaskCycleController extends CoreBaseController {
@Autowired
private IWmsScheduleJobCloud wmsScheduleJobCloud;
@Autowired
private IMesScheduleJobCloud mesScheduleJobCloud;
@Autowired
private IMesPcnScheduleJobCloud mesPcnScheduleJobCloud;
@Autowired
private IAndonScheduleJobCloud andonScheduleJobCloud;
/**
* 根据来源切换定时任务服务
*
@ -72,11 +84,21 @@ public class SysTaskCycleController extends CoreBaseController {
private IQuartzJobService getJobService(int source) {
IQuartzJobService quartzJobService = scheduleTool;
if (source == CommonEnumUtil.SOFT_TYPE.CORE.getValue()) {
//平台定时任务
if (source == CommonEnumUtil.SOFT_TYPE.CORE.getValue()) {
quartzJobService = scheduleTool;
// WMS
} else if (source == CommonEnumUtil.SOFT_TYPE.WMS.getValue()) {
quartzJobService = wmsScheduleJobCloud;
// MES
} else if (source == CommonEnumUtil.SOFT_TYPE.MES.getValue()) {
quartzJobService = mesScheduleJobCloud;
// MES_PCN
} else if (source == CommonEnumUtil.SOFT_TYPE.MES_PCN.getValue()) {
quartzJobService = mesPcnScheduleJobCloud;
// ANDON
} else if(source == CommonEnumUtil.SOFT_TYPE.ANDON.getValue()){
quartzJobService = andonScheduleJobCloud;
}
return quartzJobService;
}
@ -136,8 +158,14 @@ public class SysTaskCycleController extends CoreBaseController {
SysTaskPlan sysTaskPlan;
SysTask sysTask;
for (SysRefTaskCyclePlan item : taskCyclePlans) {
// 查找关联任务计划
sysTaskPlan = sysTaskPlanService.getSysTaskPlanByNameAndGroup(item.getTaskPlanName(), item.getTaskPlanGroupName());
ValidatorBean.checkNotNull(sysTaskPlan, "任务计划不存在，" +
"组名称：【" + item.getTaskPlanGroupName() + "】,名称：【" + item.getTaskPlanName() + "】");
// 查找任务
sysTask = sysTaskService.getSysTaskById(sysTaskPlan.getTaskId());
ValidatorBean.checkNotNull(sysTask, "任务不存在：【" + sysTaskPlan.getTaskNameRdd() + "】");
sysTaskPlan.setTaskCycleNameRdd(sysTaskCycle.getName());
sysTaskPlan.setTaskCycleExpsRdd(sysTaskCycle.getTaskCycleExps());

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

@ -205,7 +205,7 @@ public class SysUserController extends CoreBaseController{
ValidatorBean.checkNotZero(status, "用户状态不能为空");
sysUserService.updateSysUserStatus(Long.parseLong(id), status, AuthUtil.getSessionUser());
return new ResultBean(true);
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep);
} catch (Exception e) {
@ -320,7 +320,7 @@ public class SysUserController extends CoreBaseController{
ValidatorBean.checkNotNull(id, "用户id 不能为空");
sysUserService.deleteSysUserById(Long.parseLong(id));
return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep);
} catch (Exception e) {
@ -347,8 +347,7 @@ public class SysUserController extends CoreBaseController{
}
sysUserService.deleteBatchSysUserById(StringTool.getArrayLong(ids),AuthUtil.getSessionUser());
return ResultBean.success("操作成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
return ResultBean.fail(busExcep);
}catch(Exception e){
@ -546,7 +545,7 @@ public class SysUserController extends CoreBaseController{
sysUser.setOrganizeId(Long.parseLong(organizeIdStr));
sysUserService.updateSysUser(sysUser);
return null;
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep);
} catch (Exception e) {

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

@ -1,6 +1,9 @@
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ISysFileService;
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
import cn.estsh.i3plus.platform.common.tool.BeanCopyTool;
import cn.estsh.i3plus.platform.common.tool.FileTool;
import cn.estsh.i3plus.platform.common.tool.StringTool;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
@ -12,10 +15,8 @@ import cn.estsh.i3plus.pojo.platform.repository.SysDictionaryRepository;
import cn.estsh.i3plus.pojo.platform.repository.SysFileRepository;
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 cn.estsh.impp.framework.boot.fastdfs.FastDFSClient;
import cn.estsh.impp.framework.boot.fastdfs.FastDFSFile;
import com.mchange.lang.IntegerUtils;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -69,6 +70,17 @@ public class SysFileServiceImpl implements ISysFileService {
@ApiOperation(value = "更新资源信息")
public void updateSysFile(SysFile sysFile) {
LOGGER.info("文件资源 SYS_FILE :{}", sysFile);
SysFile originSysFile = sysFileRDao.getById(sysFile.getId());
if(originSysFile == null){
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode())
.setErrorDetail(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getDescription())
.setErrorSolution("请重新选择")
.build();
}
// 文件代码唯一校验
if (sysFile.getFileCode() != null) {
List list = sysFileRDao.findByHqlWhere(CoreHqlPack.packHqlSysFileCode(sysFile));
if (list != null && list.size() > 0) {
@ -81,7 +93,9 @@ public class SysFileServiceImpl implements ISysFileService {
}
}
sysFileRDao.update(sysFile);
BeanCopyTool.beanCopy(sysFile, originSysFile);
sysFileRDao.update(originSysFile);
}
@Override
@ -134,8 +148,10 @@ public class SysFileServiceImpl implements ISysFileService {
@Override
@ApiOperation(value = "上传文件资源", notes = "上传文件资源")
public SysFile uploadFile(Object file,SysFile sysFile) throws Exception {
public SysFile uploadFile(Object file,SysFile sysFile, String userName) throws Exception {
sysFile = uploadFastDfs(file, sysFile);
ConvertBean.serviceModelInitialize(sysFile, userName);
return insertSysFile(sysFile);
}

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

@ -4,7 +4,6 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysConfigService;
import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.MailConfig;
import cn.estsh.i3plus.pojo.platform.bean.SysConfig;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
@ -38,8 +37,8 @@ public class MailUtil {
public static final Logger LOGGER = LoggerFactory.getLogger(MailUtil.class);
// 收件人
private Address[] to = null;
private Address[] cc = null;
private Address[] to = new Address[]{};
private Address[] cc = new Address[]{};
private int mailSwitch = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
private String from = "";
private String nick = "";
@ -58,6 +57,7 @@ public class MailUtil {
/**
* 初始化服务器邮箱参数
*
* @return 初始化
*/
public MailUtil init() {
@ -86,6 +86,7 @@ public class MailUtil {
/**
* 初始化服务器邮箱参数
*
* @param mailConfig 邮箱配置信息
* @return 初始化
*/
@ -184,13 +185,18 @@ public class MailUtil {
this.contentType = contentType;
}
/**
* 获取邮箱地址
* @param add 邮箱地址字符串
* @return
*/
private Address[] getAddress(String[] add) {
Address[] a = new Address[add.length];
for (int i = 0; i < add.length; i++) {
try {
a[i] = new InternetAddress(add[i]);
} catch (AddressException ex) {
LOGGER.error("邮箱地址错误！",ex.getMessage());
LOGGER.error("【" + add[i] + "】邮箱地址错误！", ex.getMessage());
}
}
return a;

Write Preview
Loading…
Cancel
Save