添加processor的java文件内容替换

src/main/java/com/yihu/hos/datacollect/service/DatacollectManager.java

@@ -221,14 +221,16 @@ public class DatacollectManager implements IDatacollectManager {
    @Override
    @Transactional
    public ActionResult addJob(RsJobConfig obj, String cron, String jobDataset) throws Exception {
        Integer flowId = flowManage.genCamelFile(obj.getFlowTempId(),cron);
        datacollectDao.saveEntity(obj);//保存任务
        Integer flowId = flowManage.genCamelFile(obj.getId(),obj.getFlowTempId(),cron);
        if (flowId!=null){
            obj.setFlowId(flowId);
            datacollectDao.saveEntity(obj);
            datacollectDao.updateEntity(obj);
            saveJobDataset(obj.getId(), jobDataset);
            return new ActionResult(true, "新增任务成功！");
        }else {
            datacollectDao.deleteEntity(obj);
            return new ActionResult(false, "新增任务失败-关联流程环节失败！");
        }

src/main/java/com/yihu/hos/interceptor/JdbcTemplateAdvice.java

@@ -32,7 +32,6 @@ public class JdbcTemplateAdvice {
        }
        //用改变后的参数执行目标方法
        Object returnValue = point.proceed(args);
        System.out.println("@Around：被织入的目标对象为：" + point.getTarget());
        return returnValue;
    }

src/main/java/com/yihu/hos/system/service/FlowManager.java

@@ -374,10 +374,10 @@ public class FlowManager implements IFlowManage {
     * @param newCron
     * @throws Exception
     */
    public Integer genCamelFile(Integer flowTempId, String newCron) throws Exception {
    public Integer genCamelFile(String jobId,Integer flowTempId, String newCron) throws Exception {
        Long timestamp = System.currentTimeMillis();
        //发送生成processor文件的消息
        Integer newFlowId = sendAddProcessor(flowTempId, timestamp);
        Integer newFlowId = sendAddProcessor(jobId,flowTempId, timestamp);
        if (newFlowId != null){
            //发送生成route文件的消息
            newFlowId = sendAddRoute(flowTempId, newFlowId, newCron);
@@ -466,7 +466,7 @@ public class FlowManager implements IFlowManage {
        return null;
    }
    public Integer sendAddProcessor(Integer flowId, Long timestamp) throws Exception {
    public Integer sendAddProcessor(String jobId,Integer flowId, Long timestamp) throws Exception {
        List<SystemServiceFlowTemp> flowTempRouters = flowTempDao.getFlowTemps(flowId, Constants.FLOW_TYPE_ROUTE);
        List<SystemServiceFlowTemp> flowTempProces = flowTempDao.getFlowTemps(flowId, Constants.FLOW_TYPE_PROCESSOR);
        SystemServiceFlow oldFlow = getFlowById(flowId);
@@ -507,7 +507,7 @@ public class FlowManager implements IFlowManage {
                processClass.setType(Constants.FLOW_TYPE_PROCESSOR);
                processClass.setIsUpdate("1");
                //生成新的java文件
                String newFileName = genProcessorJavaFile(newFlow.getCode(),deName,processClass.getClassName());
                String newFileName = genProcessorJavaFile(jobId,newFlow.getCode(),deName,processClass.getClassName());
                if (newFileName!=null){
                    //发送消息
                    serviceFlowEventService.processorClassAdded(newFlow.getCode(),proPath.toString(), processClass.getClassName(), deName);
@@ -567,17 +567,19 @@ public class FlowManager implements IFlowManage {
    /**
     * 生成processor的java文件
     * @param jobId         任务Id
     * @param routeId       流程Code
     * @param tempFilePath      模板文件名
     * @param className     模板类名
     * @return
     */
    public static String genProcessorJavaFile(String routeId ,String tempFilePath, String className) {
    public static String genProcessorJavaFile(String jobId,String routeId ,String tempFilePath, String className) {
        try {
            String newFileName = className+routeId+".java";
            String newFilePath = "/temp/"+className;
            String text = GridFSUtil.readFile("upload",tempFilePath);
            text = text.replace("jobId=jobId","jobId="+jobId);
            boolean succ = FileUtil.writeFile(newFilePath,text,"UTF-8");
            //TODO 上传到GridFS
            if (succ){

src/main/java/com/yihu/hos/system/service/intf/IFlowManage.java

@@ -4,10 +4,8 @@ import com.yihu.hos.system.model.SystemServiceFlow;
import com.yihu.hos.system.model.SystemServiceFlowClass;
import com.yihu.hos.system.model.SystemServiceFlowTemp;
import com.yihu.hos.web.framework.model.Result;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.commons.CommonsMultipartFile;
import java.io.File;
import java.io.OutputStream;
import java.util.List;
import java.util.Map;
@@ -64,7 +62,7 @@ public interface IFlowManage {
     * @return
     * @throws Exception
     */
    Integer genCamelFile(Integer flowTempId, String newCron) throws Exception;
    Integer genCamelFile(String jobId,Integer flowTempId, String newCron) throws Exception;
    /**
     * 修改流程文件

src/main/resources/spring/applicationContext.xml

@@ -67,7 +67,7 @@
        <property name="hibernateProperties">
            <value>
                hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
                hibernate.show_sql=true
                hibernate.show_sql=false
                hibernate.format_sql=true
            </value>
        </property>