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

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrderNoRuleController.java

@@ -8,19 +8,15 @@ import cn.estsh.i3plus.core.apiservice.util.ExcelUtil;
 import cn.estsh.i3plus.core.apiservice.util.FileUtil;
 import cn.estsh.i3plus.core.apiservice.util.ZipUtil;
 import cn.estsh.i3plus.platform.common.tool.StringTool;
-import cn.estsh.i3plus.platform.common.util.CommonConstWords;
 import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
 import cn.estsh.i3plus.pojo.base.bean.BaseConstWords;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
-import cn.estsh.i3plus.pojo.base.common.PagerHelper;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.platform.bean.SysDictionary;
 import cn.estsh.i3plus.pojo.platform.bean.SysFile;
 import cn.estsh.i3plus.pojo.platform.bean.SysOrderNoRule;
-import cn.estsh.i3plus.pojo.platform.bean.SysUserInfo;
-import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate;
 import cn.estsh.impp.framework.base.controller.CoreBaseController;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
@@ -29,17 +25,13 @@ import cn.estsh.impp.framework.boot.fastdfs.FastDFSClient;
 import cn.estsh.impp.framework.boot.fastdfs.FastDFSFile;
 import cn.estsh.impp.framework.boot.util.ResultBean;
 import cn.estsh.impp.framework.boot.util.ValidatorBean;
-import com.netflix.discovery.converters.Auto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.File;
-import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -256,22 +248,21 @@ public class SysOrderNoRuleController extends CoreBaseController {
                 // 将excel导出至临时文件夹并上传
                 excelFile = new File(excelDir + File.separator + SysOrderNoRule.class.getSimpleName() + pager.getCurrentPage() + ".xls");
                 excelFile.createNewFile();
-
                 ExcelUtil.exportData(excelFile, listPager.getObjectList(), SysOrderNoRule.class, colName);
-                result.add(sysFileService.uploadFile(excelFile));
 
                 pager.setCurrentPage(pager.getCurrentPage() + 1);
             } while (pager.getCurrentPage() <= pager.getTotalPages());
 
             // 将所有excel文件打包
-            if(isZip){
             zipFile = ZipUtil.zipFile(null, excelDir);
             result.add(sysFileService.uploadFile(zipFile));
+
+            // 是否发送站内信
+            if (isZip) {
                 ExcelUtil.sendStationLetter(result, getSessionUser().getUser().getId());
-                return ResultBean.success("导出成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(result);
-            } else {
-                return ResultBean.success("导出成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(result);
             }
+
+            return ResultBean.success("导出成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(result);
         } catch (ImppBusiException busExcep) {
             return ResultBean.fail(busExcep);
         } catch (Exception e) {
@@ -353,6 +344,7 @@ public class SysOrderNoRuleController extends CoreBaseController {
 
     /**
      * 对象添加校验
+     *
      * @param sysOrderNoRule 校验对象
      * @throws NoSuchFieldException
      */

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskController.java

@@ -80,8 +80,7 @@ public class SysTaskController extends CoreBaseController {
                 throw ImppExceptionBuilder.newInstance()
                         .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
                         .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode())
-                        .setErrorDetail("任务类不存在")
+                        .setErrorDetail(resultBean.errorMsg)
-                        .setErrorSolution("请重新输入")
                         .build();
             }
 

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskPlanController.java

@@ -28,7 +28,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import java.util.List;
 
 /**
@@ -107,7 +106,9 @@ public class SysTaskPlanController extends CoreBaseController{
             sysTaskPlan.setTaskPlanStatus(CommonEnumUtil.DATA_STATUS.ENABLE.getValue());
 
             // 唯一检查
-            BaseResultBean baseResultBean = getJobService(sysTaskPlan.getTaskSoftTypeRdd()).checkJobExists(sysTaskPlan.getName(),sysTaskPlan.getGroupName());
+            LOGGER.info("定时任务唯一校验 Name:{0}，GroupName:{1}", sysTaskPlan.getName(), sysTaskPlan.getGroupName());
+            BaseResultBean baseResultBean = getJobService(sysTaskPlan.getTaskSoftTypeRdd())
+                                                    .checkJobExists(sysTaskPlan.getName(), sysTaskPlan.getGroupName());
             if(baseResultBean.isSuccess()){
                 throw ImppExceptionBuilder.newInstance()
                         .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
@@ -119,7 +120,7 @@ public class SysTaskPlanController extends CoreBaseController{
             // 添加至对应模块调度器中
             baseResultBean = getJobService(sysTaskPlan.getTaskSoftTypeRdd()).addTask(sysTask.getTaskPackage(),
                     sysTask.getTaskClass(), sysTaskPlan.getName(), sysTaskPlan.getGroupName(), sysTaskCycle.getTaskCycleExps(),
-                    sysTaskPlan.getTaskPlanDescription());
+                    sysTaskPlan.getTaskPlanParam());
             if (!baseResultBean.isSuccess()) {
                 throw ImppExceptionBuilder.newInstance()
                         .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
@@ -132,7 +133,8 @@ public class SysTaskPlanController extends CoreBaseController{
 
             // 立即执行
             if(isExecute != null && isExecute){
-                baseResultBean = getJobService(sysTaskPlan.getTaskSoftTypeRdd()).executeJob(sysTaskPlan.getName(),sysTaskPlan.getGroupName());
+                baseResultBean = getJobService(sysTaskPlan.getTaskSoftTypeRdd())
+                                        .executeJob(sysTaskPlan.getName(), sysTaskPlan.getGroupName());
                 if (!baseResultBean.isSuccess()) {
                     throw ImppExceptionBuilder.newInstance()
                             .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
@@ -149,6 +151,12 @@ public class SysTaskPlanController extends CoreBaseController{
         }
     }
 
+    /**
+     * 修改任务计划
+     * @param sysTaskPlan 任务计划对象
+     * @param isExecute 是否立即执行
+     * @return 处理结果
+     */
     @PutMapping(value = "/update")
     @ApiOperation(value = "修改任务计划", notes = "任务计划")
     public ResultBean updateSysTaskTime(SysTaskPlan sysTaskPlan, Boolean isExecute) {
@@ -177,8 +185,8 @@ public class SysTaskPlanController extends CoreBaseController{
             sysTaskPlanService.updateSysTaskPlan(sysTaskPlan);
 
             // 修改对应模块中的定时任务
-            getJobService(sysTaskPlan.getTaskSoftTypeRdd()).editTask(sysTask.getTaskPackage(),sysTask.getTaskClass(),sysTaskPlan.getName()
+            getJobService(sysTaskPlan.getTaskSoftTypeRdd()).editTask(sysTask.getTaskPackage(), sysTask.getTaskClass(), sysTaskPlan.getName(),
-                    ,sysTaskPlan.getGroupName(),sysTaskCycle.getTaskCycleExps(),sysTaskPlan.getTaskPlanDescription());
+                            sysTaskPlan.getGroupName(), sysTaskCycle.getTaskCycleExps(), sysTaskPlan.getTaskPlanParam());
 
             if(isExecute != null && isExecute){
                 getJobService(sysTaskPlan.getTaskSoftTypeRdd()).executeJob(sysTaskPlan.getName(), sysTaskPlan.getGroupName());
@@ -203,7 +211,7 @@ public class SysTaskPlanController extends CoreBaseController{
             sysTaskPlanService.deleteSysTaskPlanById(Long.parseLong(id));
             getJobService(sysTaskPlan.getTaskSoftTypeRdd()).deleteTask(sysTaskPlan.getName(),sysTaskPlan.getGroupName());
 
-            return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+            return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).build();
         }catch(ImppBusiException busExcep){
             return ResultBean.fail(busExcep);
         }catch(Exception e){
@@ -261,7 +269,7 @@ public class SysTaskPlanController extends CoreBaseController{
             }else if(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() == status.intValue()){
                 getJobService(sysTaskPlan.getTaskSoftTypeRdd()).resumeJob(sysTaskPlan.getName(), sysTaskPlan.getGroupName());
             }
-            return new ResultBean(true);
+            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
             return ResultBean.fail(busExcep);
         }catch(Exception e){
@@ -297,7 +305,6 @@ public class SysTaskPlanController extends CoreBaseController{
             }else{
                 return ResultBean.fail("操作失败").setErrorMsg(baseResultBean.errorMsg);
             }
-
         }catch(ImppBusiException busExcep){
             return ResultBean.fail(busExcep);
         }catch(Exception e){

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskPlanService.java

@@ -22,7 +22,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.text.SimpleDateFormat;
 import java.util.List;
 
 /**
@@ -75,8 +74,6 @@ public class SysTaskPlanService implements ISysTaskPlanService {
     @Override
     @ApiOperation(value = "修改任务计划", notes = "修改任务计划")
     public void updateSysTaskPlan(SysTaskPlan sysTaskPlan) {
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
         SysTaskPlan oldSysTaskPlan = sysTaskPlanRDao.getById(sysTaskPlan.getId());
 
         // 更新关系表

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/ExcelUtil.java

@@ -26,14 +26,12 @@ import org.slf4j.LoggerFactory;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-
 import javax.persistence.EntityManager;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.*;
 
@@ -82,6 +80,7 @@ public class ExcelUtil {
      * @param data        导出的数据
      * @param exportClass 导出数据类型
      * @param exportCol   需要导出的列
+     * @return 导出文件
      */
     public static File exportData(File excelFile, List data, Class exportClass, String[] exportCol) throws Exception {
         FileOutputStream fos = null;
@@ -141,8 +140,8 @@ public class ExcelUtil {
                         if (outputColumn.refClass().isEnum()) {
                             method = outputColumn.refClass().getDeclaredMethod(
                                     outputColumn.refForeignKey() + "Of" + StringTool.toUpperCaseFirstOne(outputColumn.value()),
-                                    outputColumn.refClass().getDeclaredMethod("get"
+                                    outputColumn.refClass().getDeclaredMethod("get"+
-                                            + StringTool.toUpperCaseFirstOne(outputColumn.refForeignKey())).getReturnType());
+                                            StringTool.toUpperCaseFirstOne(outputColumn.refForeignKey())).getReturnType());
                             cellValue = method.invoke(data.get(i), cellValue);
                         }else if(outputColumn.refClass().equals(SysDictionary.class) && cellValue != null){
                             cellValue = sysDictionaryService.getSysDictionaryByParentCodeAndValue(outputColumn.refForeignKey(), String.valueOf(cellValue)).getName();
@@ -180,7 +179,9 @@ public class ExcelUtil {
      * @param fileName    文件名
      * @param inputStream 输入流
      * @param importClass 导入类型
+     * @param <T> 实体
      * @return 导入数据集合
+     * @throws Exception
      */
     public static <T> List<T> importData(String fileName, InputStream inputStream, Class importClass) throws Exception {
         List dataList = new ArrayList<T>();
@@ -253,8 +254,8 @@ public class ExcelUtil {
                         if (inputColumn.refClass().isEnum()) {
                             method = inputColumn.refClass().getDeclaredMethod(
                                     inputColumn.value() + "Of" + StringTool.toUpperCaseFirstOne(inputColumn.refForeignKey()),
-                                    inputColumn.refClass().getDeclaredMethod("get"
+                                    inputColumn.refClass().getDeclaredMethod("get"+
-                                            + StringTool.toUpperCaseFirstOne(inputColumn.value())).getReturnType());
+                                            StringTool.toUpperCaseFirstOne(inputColumn.value())).getReturnType());
                             cellValue = method.invoke(null, cellValue);
                         }else if(inputColumn.refClass().equals(SysDictionary.class) && cellValue != null){
                             cellValue = sysDictionaryService.getSysDictionaryByParentCodeAndName(inputColumn.refForeignKey(), String.valueOf(cellValue)).getName();
@@ -279,8 +280,8 @@ public class ExcelUtil {
 
     /**
      * 导入模板
-     *
+     * @param exportClass 需要生成模板的类
-     * @param exportClass
+     * @return 模板文件
      */
     public static byte[] importTemplate(Class exportClass) {
         File excelFile = null;
@@ -347,8 +348,8 @@ public class ExcelUtil {
 
     /**
      * 获取实体列集合
-     * @param pojoClass
+     * @param pojoClass 实体类
-     * @return
+     * @return 列集合
      */
     public static Map getColName(Class pojoClass) {
         Map colName = new LinkedHashMap();
@@ -381,7 +382,7 @@ public class ExcelUtil {
      * @param value
      * @return
      */
-    public static Object selectByProperty(Class persistentClass, String colName, String propertyName, Object value) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+    public static Object selectByProperty(Class persistentClass, String colName, String propertyName, Object value) {
         String queryString = "select model." + colName + " from " + persistentClass.getSimpleName()
                 + " as model where model." + propertyName + "= :" + propertyName;
         return entityManager.createQuery(queryString).setParameter(propertyName, value).getSingleResult();

modules/i3plus-core-apiservice/src/main/resources/mail.properties

@@ -1,5 +0,0 @@
-mail.host = smtphm.qiye.163.com
-mail.port = 25
-mail.user = dongshang@estsh.com
-mail.password = Aa111111
-mail.nick = 东尚消息