配置相关代码及traceId及方法日志

src/main/java/com/jz/common/annotation/MethodCallLogPrint.java

+package com.jz.common.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @ClassName: MethodCallLogPrint
+ * @Description: TODO(方法统一打印日志注解)
+ * @author ybz
+ * @date 2021年1月21日
+ *
+ */
+@Target({ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface MethodCallLogPrint {
+
+}

src/main/java/com/jz/common/aspect/MethodCallLogPrintAspect.java

+package com.jz.common.aspect;
+
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+import com.alibaba.fastjson.JSONObject;
+
+/**方法日志打印
+ * @author ybz
+ *
+ */
+@Aspect
+@Component
+public class MethodCallLogPrintAspect {
+	
+	private static Logger logger = LoggerFactory.getLogger(MethodCallLogPrintAspect.class);
+	
+    @Pointcut("@annotation( com.jz.common.annotation.MethodCallLogPrint)")
+    public void methodCallLogPrintPointCut(){
+
+    }
+
+    @Around("methodCallLogPrintPointCut()")
+    public Object methodCallLogPrint(ProceedingJoinPoint pjp)throws Throwable{
+        
+        //从切面织入点处通过反射机制获取织入点处的方法
+        MethodSignature signature = (MethodSignature) pjp.getSignature();
+        //获取切入点所在的方法
+        Method method = signature.getMethod();
+        //获取请求的类名
+        String className = pjp.getTarget().getClass().getName();
+        //获取请求的方法名
+        String methodName = method.getName();
+        
+        logger.info("**{}**{}**START****************************************", className, methodName);
+        Long currentTime = System.currentTimeMillis();
+        logger.info("开始时间：{}", currentTime);
+
+        //请求的参数
+        String[] argNames = signature.getParameterNames(); // 参数名
+        Object[] argObjs = pjp.getArgs() ;
+        Map<String, Object> paramMap = new HashMap<String, Object>();
+        for (int index=0; index<argNames.length; index++) {
+        	String argName = argNames[index];
+        	Object argObj = argObjs[index];
+        	if (argObj instanceof HttpServletRequest) {
+				continue;
+			}
+			paramMap.put(argName, argObj);
+		}
+        
+        logger.info("请求参数：【{}】", JSONObject.toJSONString(paramMap));
+		Object obj = pjp.proceed();
+		Long currentTime2 = System.currentTimeMillis();
+		logger.info("调用结果：【{}】", JSONObject.toJSONString(obj));
+        logger.info("方法调用结束");
+        logger.info("当前时间：{}，总耗时：{}", currentTime2, currentTime2-currentTime);
+        logger.info("**END****************************************");
+        
+        return obj;
+
+    }
+    
+    
+}
\ No newline at end of file

src/main/java/com/jz/common/constant/CommConstant.java

@@ -11,17 +11,22 @@ public class CommConstant {
 	
 	/***************************************************/
 	//tree类型
-	public static String TREE_SYNCING_DATA = "1";
+	public static final String TREE_SYNCING_DATA = "1";
 	//开发任务
-	public static String TREE_DEVELOP_TASK = "2";
+	public static final String TREE_DEVELOP_TASK = "2";
 	
-	public static String TREE_DEVELOP_WORKFLOW = "2W";
+	public static final String TREE_DEVELOP_WORKFLOW = "2W";
 	
-	public static String TREE_DEVELOP_SCRIPT = "3";
+	public static final String TREE_DEVELOP_SCRIPT = "3";
 	
-	public static String TREE_MANAGE_RESOURCE = "4";
+	public static final String TREE_MANAGE_RESOURCE = "4";
+	
+	public static final String TREE_MANAGE_FUNCTION = "5";
+	
+	/***************************************************/
+	//MDC
+	public static final String TRACE_ID="traceId";
 	
-	public static String TREE_MANAGE_FUNCTION = "5";
 	/***************************************************/
 
 }

src/main/java/com/jz/common/interceptor/LogInterceptor.java

+package com.jz.common.interceptor;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.slf4j.MDC;
+import org.springframework.web.servlet.HandlerInterceptor;
+import org.springframework.web.servlet.ModelAndView;
+
+import com.jz.common.constant.CommConstant;
+import com.jz.common.utils.CodeGeneratorUtils;
+
+/**
+ * @ClassName: LogInterceptor
+ * @Description: TODO(日志MDC)
+ * @author ybz
+ * @date 2021年1月25日
+ *
+ */
+public class LogInterceptor implements HandlerInterceptor {
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+        //如果有上层调用就用上层的ID
+        String traceId = request.getHeader(CommConstant.TRACE_ID);
+        if (traceId == null) {
+            traceId = CodeGeneratorUtils.generatorTraceId();
+        }
+
+        MDC.put(CommConstant.TRACE_ID, traceId);
+        return true;
+    }
+
+    @Override
+    public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView)
+            throws Exception {
+    }
+
+    @Override
+    public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex)
+            throws Exception {
+        //调用结束后删除
+        MDC.remove(CommConstant.TRACE_ID);
+    }
+}
\ No newline at end of file

src/main/java/com/jz/common/persistence/BaseService.java

@@ -78,14 +78,19 @@ public class BaseService {
      * @return
      * @throws Exception
      */
-    public Integer getHttpRequestUserId(HttpServletRequest httpRequest)throws Exception{
-    	
-    	DmpMember dmpMember = SessionUtils.getSecurityUser();
-    	if (dmpMember==null) {
-			return null;
+    public Integer getHttpRequestUserId(HttpServletRequest httpRequest){
+    	DmpMember dmpMember = null;
+    	try {
+    		dmpMember = SessionUtils.getSecurityUser();
+        	if (dmpMember==null) {
+    			return null;
+    		}
+            
+		} catch (Exception e) {
+			logger.error("获取当前用户主键异常：【{}】", e);
 		}
-        
-        return dmpMember.getUserId();
+    	
+    	return dmpMember.getUserId();
     }
 
 }

src/main/java/com/jz/common/utils/CodeGeneratorUtils.java

 package com.jz.common.utils;
 
+import java.util.UUID;
+
 /**
  * @ClassName: CodeGeneratorUtil
  * @Description: TODO(按照规则生成编码工具类)
@@ -40,6 +42,19 @@ public class CodeGeneratorUtils {
 		return "V"+number_1+"."+number_2;
 	}
 	
+	/**  
+	* @Title: generatorTraceId  
+	* @Description: TODO(这里用一句话描述这个方法的作用)  
+	* @param @return
+	* @param @throws Exception    参数  
+	* @return String    返回类型  
+	* @throws  
+	*/ 
+	public static String generatorTraceId()throws Exception{
+		String uuid = UUID.randomUUID().toString();
+		return uuid.replace("-", "");
+	}
+	
 
 
 }

src/main/java/com/jz/dmp/config/WebAppConfig.java

+package com.jz.dmp.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import com.jz.common.interceptor.LogInterceptor;
+
+/**
+ * @ClassName: WebAppConfig
+ * @Description: TODO(web mvc相关配置)
+ * @author ybz
+ * @date 2021年1月25日
+ *
+ */
+@Configuration
+public class WebAppConfig implements WebMvcConfigurer {
+	
+	/**
+	 *拦截器注册
+	 */
+	@Override
+	public void addInterceptors(InterceptorRegistry registry) {
+		registry.addInterceptor(new LogInterceptor());
+	}
+
+}

src/main/java/com/jz/dmp/modules/controller/DmpSyncingDatasourceTypeController.java

@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/dmpSyncingDatasourceType")
-//@Api(tags = "数据源类型")
+@Api(tags = "数据源类型")
 public class DmpSyncingDatasourceTypeController {
     /**
      * 服务对象

src/main/java/com/jz/dmp/modules/controller/projconfig/DmpProjectConfigInfoController.java

+package com.jz.dmp.modules.controller.projconfig;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.jz.common.annotation.MethodCallLogPrint;
+import com.jz.common.bean.BaseBeanResponse;
+import com.jz.common.constant.StatuConstant;
+import com.jz.dmp.modules.controller.projconfig.bean.DmpProjectConfigInfoDto;
+import com.jz.dmp.modules.controller.projconfig.bean.DmpProjectConfigInfoRequest;
+import com.jz.dmp.modules.model.DmpProjectConfigInfo;
+import com.jz.dmp.modules.service.projconfig.DmpProjectConfigInfoService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 项目配置表Controller
+ * @author ybz
+ *
+ */
+@RestController
+@RequestMapping("/dmp/project/config/info")
+@Api(tags = "项目配置表")
+public class DmpProjectConfigInfoController {
+	
+	@Autowired
+	private DmpProjectConfigInfoService dmpProjectConfigInfoService;
+	
+	/**列表查询项目配置表
+	 * @param dmpProjectConfigInfoRequest
+	 * @return
+	 */
+	//@MethodCallLogPrint
+	//@RequestMapping(method = RequestMethod.POST, value = "/findList")
+	//@ApiOperation(value = "列表查询项目配置表", notes = "列表查询项目配置表")
+	public BaseBeanResponse<DmpProjectConfigInfoDto> findList(@RequestBody DmpProjectConfigInfoRequest dmpProjectConfigInfoRequest, HttpServletRequest httpRequest){
+		BaseBeanResponse<DmpProjectConfigInfoDto> baseBeanResponse = new BaseBeanResponse<DmpProjectConfigInfoDto>();
+		try {
+			baseBeanResponse = dmpProjectConfigInfoService.findList(dmpProjectConfigInfoRequest, httpRequest);
+		} catch (Exception e) {
+			baseBeanResponse.setMessage("查询失败");
+			baseBeanResponse.setCode(StatuConstant.FAILURE_CODE);
+			e.printStackTrace();
+		}
+		
+		return baseBeanResponse;
+	}
+	
+	/**获取项目配置信息
+	 * @param dmpProjectConfigInfoRequest
+	 * @return
+	 */
+	@MethodCallLogPrint
+	@RequestMapping(method = RequestMethod.GET, value = "/view")
+	@ApiOperation(value = "获取项目配置信息", notes = "获取项目配置信息")
+	@ApiImplicitParam(name = "projectId", value = "项目主键")
+	public BaseBeanResponse<DmpProjectConfigInfoDto> view(@RequestParam(name = "projectId", required = true ) Integer projectId, HttpServletRequest httpRequest){
+		BaseBeanResponse<DmpProjectConfigInfoDto> baseBeanResponse = new BaseBeanResponse<DmpProjectConfigInfoDto>();
+		try {
+			baseBeanResponse = dmpProjectConfigInfoService.findByProjectId(projectId, httpRequest);
+		} catch (Exception e) {
+			baseBeanResponse.setMessage("请求失败");
+			baseBeanResponse.setCode(StatuConstant.FAILURE_CODE);
+			e.printStackTrace();
+		}
+		
+		return baseBeanResponse;
+	}
+	
+	/**新增或修改项目配置表
+	 * @param dmpProjectConfigInfoRequest
+	 * @return
+	 */
+	@MethodCallLogPrint
+	@RequestMapping(method = RequestMethod.POST, value = "/addOrEdit")
+	@ApiOperation(value = "新增或修改项目配置表", notes = "新增或修改项目配置表")
+	public BaseBeanResponse<DmpProjectConfigInfo> addOrEdit(@RequestBody DmpProjectConfigInfo dmpProjectConfigInfo, HttpServletRequest httpRequest){
+		BaseBeanResponse<DmpProjectConfigInfo> baseBeanResponse = new BaseBeanResponse<DmpProjectConfigInfo>();
+		try {
+			baseBeanResponse = dmpProjectConfigInfoService.addOrEdit(dmpProjectConfigInfo, httpRequest);
+		} catch (Exception e) {
+			baseBeanResponse.setMessage("新增或修改失败");
+			baseBeanResponse.setCode(StatuConstant.FAILURE_CODE);
+			e.printStackTrace();
+		}
+		
+		return baseBeanResponse;
+	}
+	
+}

src/main/java/com/jz/dmp/modules/controller/projconfig/DmpPublicConfigInfoController.java

+package com.jz.dmp.modules.controller.projconfig;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.jz.common.annotation.MethodCallLogPrint;
+import com.jz.common.bean.BaseBeanResponse;
+import com.jz.common.constant.StatuConstant;
+import com.jz.dmp.modules.controller.projconfig.bean.DmpComputEngineDto;
+import com.jz.dmp.modules.controller.projconfig.bean.DmpComputEngineRequest;
+import com.jz.dmp.modules.model.DmpPublicConfigInfo;
+import com.jz.dmp.modules.service.projconfig.DmpComputEngineService;
+import com.jz.dmp.modules.service.projconfig.DmpPublicConfigInfoService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 公共配置表Controller
+ * @author ybz
+ *
+ */
+@RestController
+@RequestMapping("/dmp/public/config/info")
+@Api(tags = "公共配置表")
+public class DmpPublicConfigInfoController {
+	
+	@Autowired
+	private DmpPublicConfigInfoService dmpPublicConfigInfoService;
+	
+	@Autowired
+	private DmpComputEngineService dmpComputEngineService;
+	
+	/**列表查询计算引擎表
+	 * @param dmpComputEngineRequest
+	 * @return
+	 */
+	@MethodCallLogPrint
+	@RequestMapping(method = RequestMethod.POST, value = "/findList")
+	@ApiOperation(value = "列表查询计算引擎表", notes = "列表查询计算引擎表")
+	public BaseBeanResponse<DmpComputEngineDto> findList(@RequestBody DmpComputEngineRequest dmpComputEngineRequest, HttpServletRequest httpRequest){
+		BaseBeanResponse<DmpComputEngineDto> baseBeanResponse = new BaseBeanResponse<DmpComputEngineDto>();
+		try {
+			baseBeanResponse = dmpComputEngineService.findList(dmpComputEngineRequest, httpRequest);
+		} catch (Exception e) {
+			baseBeanResponse.setMessage("查询失败");
+			baseBeanResponse.setCode(StatuConstant.FAILURE_CODE);
+			e.printStackTrace();
+		}
+		
+		return baseBeanResponse;
+	}
+	
+	/**新增或修改公共配置表
+	 * @param dmpPublicConfigInfoRequest
+	 * @return
+	 */
+	@MethodCallLogPrint
+	@RequestMapping(method = RequestMethod.POST, value = "/addOrEdit")
+	@ApiOperation(value = "新增或修改公共配置表", notes = "新增或修改公共配置表")
+	public BaseBeanResponse<DmpPublicConfigInfo> addOrEdit(@RequestBody DmpPublicConfigInfo dmpPublicConfigInfo, HttpServletRequest httpRequest){
+		BaseBeanResponse<DmpPublicConfigInfo> baseBeanResponse = new BaseBeanResponse<DmpPublicConfigInfo>();
+		try {
+			baseBeanResponse = dmpPublicConfigInfoService.addOrEdit(dmpPublicConfigInfo, httpRequest);
+		} catch (Exception e) {
+			baseBeanResponse.setMessage("新增或修改失败");
+			baseBeanResponse.setCode(StatuConstant.FAILURE_CODE);
+			e.printStackTrace();
+		}
+		
+		return baseBeanResponse;
+	}
+	
+}

src/main/java/com/jz/dmp/modules/controller/projconfig/bean/DmpComputEngineDto.java

 package com.jz.dmp.modules.controller.projconfig.bean;
 
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jz.dmp.modules.model.DmpComputEngine;
 
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 
 /**计算引擎表Dto
  * @author ybz
  *
  */
 @ApiModel(value = "计算引擎表Dto", description = "计算引擎表Dto")
+@JsonIgnoreProperties(value = {"handler"})
 public class DmpComputEngineDto extends DmpComputEngine {
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	
+	@ApiModelProperty(value = "计算引擎参数列表")
+	private List<DmpComputEngineParamDto> paramDtos;
+
+	public List<DmpComputEngineParamDto> getParamDtos() {
+		return paramDtos;
+	}
+
+	public void setParamDtos(List<DmpComputEngineParamDto> paramDtos) {
+		this.paramDtos = paramDtos;
+	}
 
 }

src/main/java/com/jz/dmp/modules/model/DmpComputEngine.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;
+import java.util.List;
 
 /**计算引擎表
  * @author ybz
@@ -69,6 +70,9 @@ public class DmpComputEngine implements Serializable{
 	@ApiModelProperty(value = "修改时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
+	
+	@ApiModelProperty(value = "计算引擎参数")
+	private List<DmpComputEngineParam> params;
 
 	public Integer getEngineId() {
 		return engineId;
@@ -133,4 +137,13 @@ public class DmpComputEngine implements Serializable{
 	public void setUpdateTime(Date updateTime) {
 		this.updateTime = updateTime;
 	}
+
+	public List<DmpComputEngineParam> getParams() {
+		return params;
+	}
+
+	public void setParams(List<DmpComputEngineParam> params) {
+		this.params = params;
+	}
+	
 }

src/main/java/com/jz/dmp/modules/model/DmpProject.java

@@ -2,8 +2,8 @@ package com.jz.dmp.modules.model;
 
 import java.io.Serializable;
 import java.util.Date;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 
 /**
  * 项目信息(DmpProject)实体类
@@ -16,97 +16,124 @@ public class DmpProject implements Serializable {
     /**
      * ID
      */
+    @ApiModelProperty(value = "ID")
     private Integer id;
     /**
      * 管理员帐号
      */
+    @ApiModelProperty(value = "管理员帐号")
     private String ownerId;
     /**
      * 生产帐号
      */
+    @ApiModelProperty(value = "生产帐号")
     private String productionId;
     /**
      * 数据仓库帐号
      */
+    @ApiModelProperty(value = "数据仓库帐号")
     private String dataWarehouseId;
     /**
      * 项目名称
      */
+    @ApiModelProperty(value = "项目名称")
     private String name;
     /**
      * 项目显示名称
      */
+    @ApiModelProperty(value = "项目显示名称")
     private String displayName;
     /**
      * 项目描述
      */
+    @ApiModelProperty(value = "项目描述")
     private String projectDesc;
     /**
      * 发布目标
      */
+    @ApiModelProperty(value = "发布目标")
     private Integer publishTargetId;
     /**
      * 启动调度周期
      */
+    @ApiModelProperty(value = "启动调度周期")
     private String isEnableScheduler;
     /**
      * 允许在本项目中直接编辑任务和代码
      */
+    @ApiModelProperty(value = "允许在本项目中直接编辑任务和代码")
     private String isEditTaskCode;
     /**
      * 能否下载select结果
      */
+    @ApiModelProperty(value = "能否下载select结果")
     private String isEnableSelect;
     /**
      * 数据仓库项目名称
      */
+    @ApiModelProperty(value = "数据仓库项目名称")
     private String dwName;
     /**
      * 数据仓库访问身份类型
      */
+    @ApiModelProperty(value = "数据仓库访问身份类型")
     private String dwAccessType;
     /**
      * 使用ACL授权
      */
+    @ApiModelProperty(value = "使用ACL授权")
     private String dwIsEnableAcl;
     /**
      * 允许对象创建者访问对象
      */
+    @ApiModelProperty(value = "允许对象创建者访问对象")
     private String dwIsEnableAccessObj;
     /**
      * 允许对象创建者授权对象
      */
+    @ApiModelProperty(value = "允许对象创建者授权对象")
     private String dwIsEnableAuthObj;
     /**
      * 项目空间数据保护
      */
+    @ApiModelProperty(value = "项目空间数据保护")
     private String dwIsProtectData;
     /**
      * 数据状态
      */
+    @ApiModelProperty(value = "数据状态")
     private String dataStatus;
     /**
      * 创建用户ID
      */
+    @ApiModelProperty(value = "创建用户ID")
     private String createUserId;
     /**
      * 数据创建时间
      */
+    @ApiModelProperty(value = "数据创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
     /**
      * 创建用户ID
      */
+    @ApiModelProperty(value = " 创建用户ID")
     private String updateUserId;
 
+    @ApiModelProperty(value = "")
     private String impalaJdbcUrl;
 
+    @ApiModelProperty(value = "")
     private String impalaMasterFqdn;
     /**
      * 数据更新时间
      */
+    @ApiModelProperty(value = "数据更新时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
+    
+    @ApiModelProperty(value = "项目配置文件")
+    private DmpProjectConfigInfo dmpProjectConfigInfo;
 
 
     public Integer getId() {
@@ -301,4 +328,12 @@ public class DmpProject implements Serializable {
         this.updateTime = updateTime;
     }
 
+	public DmpProjectConfigInfo getDmpProjectConfigInfo() {
+		return dmpProjectConfigInfo;
+	}
+
+	public void setDmpProjectConfigInfo(DmpProjectConfigInfo dmpProjectConfigInfo) {
+		this.dmpProjectConfigInfo = dmpProjectConfigInfo;
+	}
+
 }
\ No newline at end of file

src/main/java/com/jz/dmp/modules/model/DmpProjectConfigEngine.java

 package com.jz.dmp.modules.model;
 
 import java.io.Serializable;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
 import java.util.Date;
+import java.util.List;
 
 /**项目配置计算引擎关系表
  * @author ybz
@@ -77,6 +75,9 @@ public class DmpProjectConfigEngine implements Serializable{
 	@ApiModelProperty(value = "修改时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
+	
+	@ApiModelProperty(value = "选择引擎私有配置参数")
+	private List<DmpProjectEngineParam> dmpProjectEngineParams;
 
 	public Integer getConfigEngineId() {
 		return configEngineId;
@@ -149,4 +150,13 @@ public class DmpProjectConfigEngine implements Serializable{
 	public void setUpdateTime(Date updateTime) {
 		this.updateTime = updateTime;
 	}
+
+	public List<DmpProjectEngineParam> getDmpProjectEngineParams() {
+		return dmpProjectEngineParams;
+	}
+
+	public void setDmpProjectEngineParams(List<DmpProjectEngineParam> dmpProjectEngineParams) {
+		this.dmpProjectEngineParams = dmpProjectEngineParams;
+	}
+	
 }

src/main/java/com/jz/dmp/modules/model/DmpProjectConfigInfo.java

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.Date;
+import java.util.List;
 
 /**项目配置表
  * @author ybz
@@ -68,6 +69,9 @@ public class DmpProjectConfigInfo implements Serializable{
 	@ApiModelProperty(value = "修改时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
+	
+	@ApiModelProperty(value = "选择的计算引擎")
+	private List<DmpProjectConfigEngine> dmpProjectConfigEngines;
 
 	public Integer getProjectConfigId() {
 		return projectConfigId;
@@ -132,4 +136,13 @@ public class DmpProjectConfigInfo implements Serializable{
 	public void setUpdateTime(Date updateTime) {
 		this.updateTime = updateTime;
 	}
+
+	public List<DmpProjectConfigEngine> getDmpProjectConfigEngines() {
+		return dmpProjectConfigEngines;
+	}
+
+	public void setDmpProjectConfigEngines(List<DmpProjectConfigEngine> dmpProjectConfigEngines) {
+		this.dmpProjectConfigEngines = dmpProjectConfigEngines;
+	}
+	
 }

src/main/java/com/jz/dmp/modules/model/DmpPublicConfigInfo.java

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.Date;
+import java.util.List;
 
 /**公共配置表
  * @author ybz
@@ -200,6 +201,9 @@ public class DmpPublicConfigInfo implements Serializable{
 	@ApiModelProperty(value = "修改时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
+	
+	@ApiModelProperty(value = "计算引擎")
+	private List<DmpComputEngine> computEngines;
 
 	public Integer getPublicConfigId() {
 		return publicConfigId;
@@ -440,4 +444,13 @@ public class DmpPublicConfigInfo implements Serializable{
 	public void setUpdateTime(Date updateTime) {
 		this.updateTime = updateTime;
 	}
+
+	public List<DmpComputEngine> getComputEngines() {
+		return computEngines;
+	}
+
+	public void setComputEngines(List<DmpComputEngine> computEngines) {
+		this.computEngines = computEngines;
+	}
+	
 }

src/main/java/com/jz/dmp/modules/service/impl/DmpProjectServiceImpl.java

@@ -32,6 +32,7 @@ import com.jz.dmp.modules.model.DmpMember;
 import com.jz.dmp.modules.model.DmpProject;
 import com.jz.dmp.modules.model.DmpProjectSystemInfo;
 import com.jz.dmp.modules.service.DmpProjectService;
+import com.jz.dmp.modules.service.projconfig.DmpProjectConfigInfoService;
 
 /**
  * 项目信息服务的实现?
@@ -49,6 +50,9 @@ public class DmpProjectServiceImpl extends BaseService implements DmpProjectServ
 	@Autowired
 	private ProjectFlowsMapper projectFlowsMapper;
 	
+	@Autowired
+	private DmpProjectConfigInfoService dmpProjectConfigInfoService;
+	
 	/* (non-Javadoc)
 	 * @see com.ycxc.vmts.service.DmpProjectService#findList(com.ycxc.vmts.controller.bean.DmpProjectRequest, javax.servlet.http.HttpServletRequest)
 	 */
@@ -340,6 +344,9 @@ public class DmpProjectServiceImpl extends BaseService implements DmpProjectServ
 		
 		dmpProjectDao.insert(dmpProject);
 		
+		//保存项目配置信息
+		dmpProjectConfigInfoService.addOrEdit(dmpProject.getDmpProjectConfigInfo(), httpRequest);
+		
 		baseBeanResponse.setCode(StatuConstant.SUCCESS_CODE);
 		baseBeanResponse.setMessage("新增成功");
 		baseBeanResponse.setData(dmpProject);

src/main/java/com/jz/dmp/modules/service/projconfig/DmpComputEngineParamService.java

+package com.jz.dmp.modules.service.projconfig;
+
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import com.jz.common.bean.BaseBeanResponse;
+import com.jz.common.bean.BaseResponse;
+import com.jz.common.bean.PageInfoResponse;
+import com.jz.dmp.modules.controller.projconfig.bean.DmpComputEngineParamBatch;
+import com.jz.dmp.modules.controller.projconfig.bean.DmpComputEngineParamDto;
+import com.jz.dmp.modules.controller.projconfig.bean.DmpComputEngineParamRequest;
+import com.jz.dmp.modules.model.DmpComputEngineParam;
+
+/**
+ * 计算引擎参数表服务接口
+ * @author ybz
+ *
+ */
+public interface DmpComputEngineParamService {
+
+	/**条件分頁查询所有计算引擎参数表
+	 * @param dmpComputEngineParamRequest
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public PageInfoResponse<DmpComputEngineParamDto> findListWithPage(DmpComputEngineParamRequest dmpComputEngineParamRequest, HttpServletRequest httpRequest)throws Exception;
+	
+	/**条件查询所有计算引擎参数表
+	 * @param dmpComputEngineParamRequest
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpComputEngineParamDto> findList(DmpComputEngineParamRequest dmpComputEngineParamRequest, HttpServletRequest httpRequest)throws Exception;
+
+	
+
+	/**新增计算引擎参数表
+	 * @param dmpComputEngineParam
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpComputEngineParam> add(DmpComputEngineParam dmpComputEngineParam, HttpServletRequest httpRequest)throws Exception;
+	
+	/**主键查询计算引擎参数表
+	 * @param paramId
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpComputEngineParamDto> findById(Integer paramId, HttpServletRequest httpRequest)throws Exception;
+
+	/**修改计算引擎参数表
+	 * @param dmpComputEngineParam
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpComputEngineParam> edit(DmpComputEngineParam dmpComputEngineParam, HttpServletRequest httpRequest)throws Exception;
+	
+	/**新增或修改计算引擎参数表
+	 * @param dmpComputEngineParam
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpComputEngineParam> addOrEdit(DmpComputEngineParam dmpComputEngineParam, HttpServletRequest httpRequest)throws Exception;
+
+
+	/**主键删除计算引擎参数表
+	 * @param paramId
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseResponse deleteById(Integer paramId, HttpServletRequest httpRequest)throws Exception;
+	
+	/**主键软删除计算引擎参数表
+	 * @param paramId
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseResponse softDeleteById(Integer paramId, HttpServletRequest httpRequest)throws Exception;
+	
+	/**条件删除计算引擎参数表
+	 * @param dmpComputEngineParamRequest
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseResponse delete(DmpComputEngineParamRequest dmpComputEngineParamRequest, HttpServletRequest httpRequest)throws Exception;
+	
+	/**条件软删除计算引擎参数表
+	 * @param dmpComputEngineParamRequest
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseResponse softDelete(DmpComputEngineParamRequest dmpComputEngineParamRequest, HttpServletRequest httpRequest)throws Exception;
+
+	/**批量新增计算引擎参数表
+	 * @param dmpComputEngineParamVo
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpComputEngineParamBatch> addBatch(DmpComputEngineParamBatch dmpComputEngineParamBatch, HttpServletRequest httpRequest)throws Exception;
+
+	/**  
+	* @Title: deleteByIds  
+	* @Description: TODO(根据主键批量删除)  
+	* @param @param idList
+	* @param @param httpRequest
+	* @param @return
+	* @param @throws Exception    参数  
+	* @return BaseResponse    返回类型  
+	* @throws  
+	*/ 
+	public BaseResponse deleteByIds(List<Integer> idList, HttpServletRequest httpRequest)throws Exception;
+
+	/**  
+	* @Title: softDeleteByIds  
+	* @Description: TODO(根据主键批量软删除)  
+	* @param @param idList
+	* @param @param httpRequest
+	* @param @return
+	* @param @throws Exception    参数  
+	* @return BaseResponse    返回类型  
+	* @throws  
+	*/ 
+	public BaseResponse softDeleteByIds(List<Integer> idList, HttpServletRequest httpRequest)throws Exception;
+
+}

src/main/java/com/jz/dmp/modules/service/projconfig/DmpComputEngineService.java

+package com.jz.dmp.modules.service.projconfig;
+
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import com.jz.common.bean.BaseBeanResponse;
+import com.jz.common.bean.BaseResponse;
+import com.jz.common.bean.PageInfoResponse;
+import com.jz.dmp.modules.controller.projconfig.bean.DmpComputEngineBatch;
+import com.jz.dmp.modules.controller.projconfig.bean.DmpComputEngineDto;
+import com.jz.dmp.modules.controller.projconfig.bean.DmpComputEngineRequest;
+import com.jz.dmp.modules.model.DmpComputEngine;
+
+/**
+ * 计算引擎表服务接口
+ * @author ybz
+ *
+ */
+public interface DmpComputEngineService {
+
+	/**条件分頁查询所有计算引擎表
+	 * @param dmpComputEngineRequest
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public PageInfoResponse<DmpComputEngineDto> findListWithPage(DmpComputEngineRequest dmpComputEngineRequest, HttpServletRequest httpRequest)throws Exception;
+	
+	/**条件查询所有计算引擎表
+	 * @param dmpComputEngineRequest
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpComputEngineDto> findList(DmpComputEngineRequest dmpComputEngineRequest, HttpServletRequest httpRequest)throws Exception;
+
+	
+
+	/**新增计算引擎表
+	 * @param dmpComputEngine
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpComputEngine> add(DmpComputEngine dmpComputEngine, HttpServletRequest httpRequest)throws Exception;
+	
+	/**主键查询计算引擎表
+	 * @param engineId
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpComputEngineDto> findById(Integer engineId, HttpServletRequest httpRequest)throws Exception;
+
+	/**修改计算引擎表
+	 * @param dmpComputEngine
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpComputEngine> edit(DmpComputEngine dmpComputEngine, HttpServletRequest httpRequest)throws Exception;
+	
+	/**新增或修改计算引擎表
+	 * @param dmpComputEngine
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpComputEngine> addOrEdit(DmpComputEngine dmpComputEngine, HttpServletRequest httpRequest)throws Exception;
+
+
+	/**主键删除计算引擎表
+	 * @param engineId
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseResponse deleteById(Integer engineId, HttpServletRequest httpRequest)throws Exception;
+	
+	/**主键软删除计算引擎表
+	 * @param engineId
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseResponse softDeleteById(Integer engineId, HttpServletRequest httpRequest)throws Exception;
+	
+	/**条件删除计算引擎表
+	 * @param dmpComputEngineRequest
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseResponse delete(DmpComputEngineRequest dmpComputEngineRequest, HttpServletRequest httpRequest)throws Exception;
+	
+	/**条件软删除计算引擎表
+	 * @param dmpComputEngineRequest
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseResponse softDelete(DmpComputEngineRequest dmpComputEngineRequest, HttpServletRequest httpRequest)throws Exception;
+
+	/**批量新增计算引擎表
+	 * @param dmpComputEngineVo
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpComputEngineBatch> addBatch(DmpComputEngineBatch dmpComputEngineBatch, HttpServletRequest httpRequest)throws Exception;
+
+	/**  
+	* @Title: deleteByIds  
+	* @Description: TODO(根据主键批量删除)  
+	* @param @param idList
+	* @param @param httpRequest
+	* @param @return
+	* @param @throws Exception    参数  
+	* @return BaseResponse    返回类型  
+	* @throws  
+	*/ 
+	public BaseResponse deleteByIds(List<Integer> idList, HttpServletRequest httpRequest)throws Exception;
+
+	/**  
+	* @Title: softDeleteByIds  
+	* @Description: TODO(根据主键批量软删除)  
+	* @param @param idList
+	* @param @param httpRequest
+	* @param @return
+	* @param @throws Exception    参数  
+	* @return BaseResponse    返回类型  
+	* @throws  
+	*/ 
+	public BaseResponse softDeleteByIds(List<Integer> idList, HttpServletRequest httpRequest)throws Exception;
+
+}

src/main/java/com/jz/dmp/modules/service/projconfig/DmpProjectConfigEngineService.java

+package com.jz.dmp.modules.service.projconfig;
+
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import com.jz.common.bean.BaseBeanResponse;
+import com.jz.common.bean.BaseResponse;
+import com.jz.common.bean.PageInfoResponse;
+import com.jz.dmp.modules.controller.projconfig.bean.DmpProjectConfigEngineBatch;
+import com.jz.dmp.modules.controller.projconfig.bean.DmpProjectConfigEngineDto;
+import com.jz.dmp.modules.controller.projconfig.bean.DmpProjectConfigEngineRequest;
+import com.jz.dmp.modules.model.DmpProjectConfigEngine;
+
+/**
+ * 项目配置计算引擎关系表服务接口
+ * @author ybz
+ *
+ */
+public interface DmpProjectConfigEngineService {
+
+	/**条件分頁查询所有项目配置计算引擎关系表
+	 * @param dmpProjectConfigEngineRequest
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public PageInfoResponse<DmpProjectConfigEngineDto> findListWithPage(DmpProjectConfigEngineRequest dmpProjectConfigEngineRequest, HttpServletRequest httpRequest)throws Exception;
+	
+	/**条件查询所有项目配置计算引擎关系表
+	 * @param dmpProjectConfigEngineRequest
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpProjectConfigEngineDto> findList(DmpProjectConfigEngineRequest dmpProjectConfigEngineRequest, HttpServletRequest httpRequest)throws Exception;
+
+	
+
+	/**新增项目配置计算引擎关系表
+	 * @param dmpProjectConfigEngine
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpProjectConfigEngine> add(DmpProjectConfigEngine dmpProjectConfigEngine, HttpServletRequest httpRequest)throws Exception;
+	
+	/**主键查询项目配置计算引擎关系表
+	 * @param configEngineId
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpProjectConfigEngineDto> findById(Integer configEngineId, HttpServletRequest httpRequest)throws Exception;
+
+	/**修改项目配置计算引擎关系表
+	 * @param dmpProjectConfigEngine
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpProjectConfigEngine> edit(DmpProjectConfigEngine dmpProjectConfigEngine, HttpServletRequest httpRequest)throws Exception;
+	
+	/**新增或修改项目配置计算引擎关系表
+	 * @param dmpProjectConfigEngine
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpProjectConfigEngine> addOrEdit(DmpProjectConfigEngine dmpProjectConfigEngine, HttpServletRequest httpRequest)throws Exception;
+
+
+	/**主键删除项目配置计算引擎关系表
+	 * @param configEngineId
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseResponse deleteById(Integer configEngineId, HttpServletRequest httpRequest)throws Exception;
+	
+	/**主键软删除项目配置计算引擎关系表
+	 * @param configEngineId
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseResponse softDeleteById(Integer configEngineId, HttpServletRequest httpRequest)throws Exception;
+	
+	/**条件删除项目配置计算引擎关系表
+	 * @param dmpProjectConfigEngineRequest
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseResponse delete(DmpProjectConfigEngineRequest dmpProjectConfigEngineRequest, HttpServletRequest httpRequest)throws Exception;
+	
+	/**条件软删除项目配置计算引擎关系表
+	 * @param dmpProjectConfigEngineRequest
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseResponse softDelete(DmpProjectConfigEngineRequest dmpProjectConfigEngineRequest, HttpServletRequest httpRequest)throws Exception;
+
+	/**批量新增项目配置计算引擎关系表
+	 * @param dmpProjectConfigEngineVo
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpProjectConfigEngineBatch> addBatch(DmpProjectConfigEngineBatch dmpProjectConfigEngineBatch, HttpServletRequest httpRequest)throws Exception;
+
+	/**  
+	* @Title: deleteByIds  
+	* @Description: TODO(根据主键批量删除)  
+	* @param @param idList
+	* @param @param httpRequest
+	* @param @return
+	* @param @throws Exception    参数  
+	* @return BaseResponse    返回类型  
+	* @throws  
+	*/ 
+	public BaseResponse deleteByIds(List<Integer> idList, HttpServletRequest httpRequest)throws Exception;
+
+	/**  
+	* @Title: softDeleteByIds  
+	* @Description: TODO(根据主键批量软删除)  
+	* @param @param idList
+	* @param @param httpRequest
+	* @param @return
+	* @param @throws Exception    参数  
+	* @return BaseResponse    返回类型  
+	* @throws  
+	*/ 
+	public BaseResponse softDeleteByIds(List<Integer> idList, HttpServletRequest httpRequest)throws Exception;
+
+}

src/main/java/com/jz/dmp/modules/service/projconfig/DmpProjectConfigInfoService.java

+package com.jz.dmp.modules.service.projconfig;
+
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import com.jz.common.bean.BaseBeanResponse;
+import com.jz.common.bean.BaseResponse;
+import com.jz.common.bean.PageInfoResponse;
+import com.jz.dmp.modules.controller.projconfig.bean.DmpProjectConfigInfoBatch;
+import com.jz.dmp.modules.controller.projconfig.bean.DmpProjectConfigInfoDto;
+import com.jz.dmp.modules.controller.projconfig.bean.DmpProjectConfigInfoRequest;
+import com.jz.dmp.modules.model.DmpProjectConfigInfo;
+
+/**
+ * 项目配置表服务接口
+ * @author ybz
+ *
+ */
+public interface DmpProjectConfigInfoService {
+
+	/**条件分頁查询所有项目配置表
+	 * @param dmpProjectConfigInfoRequest
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public PageInfoResponse<DmpProjectConfigInfoDto> findListWithPage(DmpProjectConfigInfoRequest dmpProjectConfigInfoRequest, HttpServletRequest httpRequest)throws Exception;
+	
+	/**条件查询所有项目配置表
+	 * @param dmpProjectConfigInfoRequest
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpProjectConfigInfoDto> findList(DmpProjectConfigInfoRequest dmpProjectConfigInfoRequest, HttpServletRequest httpRequest)throws Exception;
+
+	
+
+	/**新增项目配置表
+	 * @param dmpProjectConfigInfo
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpProjectConfigInfo> add(DmpProjectConfigInfo dmpProjectConfigInfo, HttpServletRequest httpRequest)throws Exception;
+	
+	/**主键查询项目配置表
+	 * @param projectConfigId
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpProjectConfigInfoDto> findById(Integer projectConfigId, HttpServletRequest httpRequest)throws Exception;
+
+	/**修改项目配置表
+	 * @param dmpProjectConfigInfo
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpProjectConfigInfo> edit(DmpProjectConfigInfo dmpProjectConfigInfo, HttpServletRequest httpRequest)throws Exception;
+	
+	/**新增或修改项目配置表
+	 * @param dmpProjectConfigInfo
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpProjectConfigInfo> addOrEdit(DmpProjectConfigInfo dmpProjectConfigInfo, HttpServletRequest httpRequest)throws Exception;
+
+
+	/**主键删除项目配置表
+	 * @param projectConfigId
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseResponse deleteById(Integer projectConfigId, HttpServletRequest httpRequest)throws Exception;
+	
+	/**主键软删除项目配置表
+	 * @param projectConfigId
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseResponse softDeleteById(Integer projectConfigId, HttpServletRequest httpRequest)throws Exception;
+	
+	/**条件删除项目配置表
+	 * @param dmpProjectConfigInfoRequest
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseResponse delete(DmpProjectConfigInfoRequest dmpProjectConfigInfoRequest, HttpServletRequest httpRequest)throws Exception;
+	
+	/**条件软删除项目配置表
+	 * @param dmpProjectConfigInfoRequest
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseResponse softDelete(DmpProjectConfigInfoRequest dmpProjectConfigInfoRequest, HttpServletRequest httpRequest)throws Exception;
+
+	/**批量新增项目配置表
+	 * @param dmpProjectConfigInfoVo
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpProjectConfigInfoBatch> addBatch(DmpProjectConfigInfoBatch dmpProjectConfigInfoBatch, HttpServletRequest httpRequest)throws Exception;
+
+	/**  
+	* @Title: deleteByIds  
+	* @Description: TODO(根据主键批量删除)  
+	* @param @param idList
+	* @param @param httpRequest
+	* @param @return
+	* @param @throws Exception    参数  
+	* @return BaseResponse    返回类型  
+	* @throws  
+	*/ 
+	public BaseResponse deleteByIds(List<Integer> idList, HttpServletRequest httpRequest)throws Exception;
+
+	/**  
+	* @Title: softDeleteByIds  
+	* @Description: TODO(根据主键批量软删除)  
+	* @param @param idList
+	* @param @param httpRequest
+	* @param @return
+	* @param @throws Exception    参数  
+	* @return BaseResponse    返回类型  
+	* @throws  
+	*/ 
+	public BaseResponse softDeleteByIds(List<Integer> idList, HttpServletRequest httpRequest)throws Exception;
+
+	/**  
+	* @Title: findByProjectId  
+	* @Description: TODO(获取项目配置信息)  
+	* @param @param projectId
+	* @param @param httpRequest
+	* @param @return
+	* @param @throws Exception    参数  
+	* @return BaseBeanResponse<DmpProjectConfigInfoDto>    返回类型  
+	* @throws  
+	*/ 
+	public BaseBeanResponse<DmpProjectConfigInfoDto> findByProjectId(Integer projectId, HttpServletRequest httpRequest)throws Exception;
+
+}

src/main/java/com/jz/dmp/modules/service/projconfig/DmpProjectEngineParamService.java

+package com.jz.dmp.modules.service.projconfig;
+
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import com.jz.common.bean.BaseBeanResponse;
+import com.jz.common.bean.BaseResponse;
+import com.jz.common.bean.PageInfoResponse;
+import com.jz.dmp.modules.controller.projconfig.bean.DmpProjectEngineParamBatch;
+import com.jz.dmp.modules.controller.projconfig.bean.DmpProjectEngineParamDto;
+import com.jz.dmp.modules.controller.projconfig.bean.DmpProjectEngineParamRequest;
+import com.jz.dmp.modules.model.DmpProjectEngineParam;
+
+/**
+ * 计算引擎项目参数表服务接口
+ * @author ybz
+ *
+ */
+public interface DmpProjectEngineParamService {
+
+	/**条件分頁查询所有计算引擎项目参数表
+	 * @param dmpProjectEngineParamRequest
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public PageInfoResponse<DmpProjectEngineParamDto> findListWithPage(DmpProjectEngineParamRequest dmpProjectEngineParamRequest, HttpServletRequest httpRequest)throws Exception;
+	
+	/**条件查询所有计算引擎项目参数表
+	 * @param dmpProjectEngineParamRequest
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpProjectEngineParamDto> findList(DmpProjectEngineParamRequest dmpProjectEngineParamRequest, HttpServletRequest httpRequest)throws Exception;
+
+	
+
+	/**新增计算引擎项目参数表
+	 * @param dmpProjectEngineParam
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpProjectEngineParam> add(DmpProjectEngineParam dmpProjectEngineParam, HttpServletRequest httpRequest)throws Exception;
+	
+	/**主键查询计算引擎项目参数表
+	 * @param projectParamId
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpProjectEngineParamDto> findById(Integer projectParamId, HttpServletRequest httpRequest)throws Exception;
+
+	/**修改计算引擎项目参数表
+	 * @param dmpProjectEngineParam
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpProjectEngineParam> edit(DmpProjectEngineParam dmpProjectEngineParam, HttpServletRequest httpRequest)throws Exception;
+	
+	/**新增或修改计算引擎项目参数表
+	 * @param dmpProjectEngineParam
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpProjectEngineParam> addOrEdit(DmpProjectEngineParam dmpProjectEngineParam, HttpServletRequest httpRequest)throws Exception;
+
+
+	/**主键删除计算引擎项目参数表
+	 * @param projectParamId
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseResponse deleteById(Integer projectParamId, HttpServletRequest httpRequest)throws Exception;
+	
+	/**主键软删除计算引擎项目参数表
+	 * @param projectParamId
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseResponse softDeleteById(Integer projectParamId, HttpServletRequest httpRequest)throws Exception;
+	
+	/**条件删除计算引擎项目参数表
+	 * @param dmpProjectEngineParamRequest
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseResponse delete(DmpProjectEngineParamRequest dmpProjectEngineParamRequest, HttpServletRequest httpRequest)throws Exception;
+	
+	/**条件软删除计算引擎项目参数表
+	 * @param dmpProjectEngineParamRequest
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseResponse softDelete(DmpProjectEngineParamRequest dmpProjectEngineParamRequest, HttpServletRequest httpRequest)throws Exception;
+
+	/**批量新增计算引擎项目参数表
+	 * @param dmpProjectEngineParamVo
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpProjectEngineParamBatch> addBatch(DmpProjectEngineParamBatch dmpProjectEngineParamBatch, HttpServletRequest httpRequest)throws Exception;
+
+	/**  
+	* @Title: deleteByIds  
+	* @Description: TODO(根据主键批量删除)  
+	* @param @param idList
+	* @param @param httpRequest
+	* @param @return
+	* @param @throws Exception    参数  
+	* @return BaseResponse    返回类型  
+	* @throws  
+	*/ 
+	public BaseResponse deleteByIds(List<Integer> idList, HttpServletRequest httpRequest)throws Exception;
+
+	/**  
+	* @Title: softDeleteByIds  
+	* @Description: TODO(根据主键批量软删除)  
+	* @param @param idList
+	* @param @param httpRequest
+	* @param @return
+	* @param @throws Exception    参数  
+	* @return BaseResponse    返回类型  
+	* @throws  
+	*/ 
+	public BaseResponse softDeleteByIds(List<Integer> idList, HttpServletRequest httpRequest)throws Exception;
+
+}

src/main/java/com/jz/dmp/modules/service/projconfig/DmpPublicConfigInfoService.java

+package com.jz.dmp.modules.service.projconfig;
+
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import com.jz.common.bean.BaseBeanResponse;
+import com.jz.common.bean.BaseResponse;
+import com.jz.common.bean.PageInfoResponse;
+import com.jz.dmp.modules.controller.projconfig.bean.DmpPublicConfigInfoBatch;
+import com.jz.dmp.modules.controller.projconfig.bean.DmpPublicConfigInfoDto;
+import com.jz.dmp.modules.controller.projconfig.bean.DmpPublicConfigInfoRequest;
+import com.jz.dmp.modules.model.DmpPublicConfigInfo;
+
+/**
+ * 公共配置表服务接口
+ * @author ybz
+ *
+ */
+public interface DmpPublicConfigInfoService {
+
+	/**条件分頁查询所有公共配置表
+	 * @param dmpPublicConfigInfoRequest
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public PageInfoResponse<DmpPublicConfigInfoDto> findListWithPage(DmpPublicConfigInfoRequest dmpPublicConfigInfoRequest, HttpServletRequest httpRequest)throws Exception;
+	
+	/**条件查询所有公共配置表
+	 * @param dmpPublicConfigInfoRequest
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpPublicConfigInfoDto> findList(DmpPublicConfigInfoRequest dmpPublicConfigInfoRequest, HttpServletRequest httpRequest)throws Exception;
+
+	
+
+	/**新增公共配置表
+	 * @param dmpPublicConfigInfo
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpPublicConfigInfo> add(DmpPublicConfigInfo dmpPublicConfigInfo, HttpServletRequest httpRequest)throws Exception;
+	
+	/**主键查询公共配置表
+	 * @param publicConfigId
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpPublicConfigInfoDto> findById(Integer publicConfigId, HttpServletRequest httpRequest)throws Exception;
+
+	/**修改公共配置表
+	 * @param dmpPublicConfigInfo
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpPublicConfigInfo> edit(DmpPublicConfigInfo dmpPublicConfigInfo, HttpServletRequest httpRequest)throws Exception;
+	
+	/**新增或修改公共配置表
+	 * @param dmpPublicConfigInfo
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpPublicConfigInfo> addOrEdit(DmpPublicConfigInfo dmpPublicConfigInfo, HttpServletRequest httpRequest)throws Exception;
+
+
+	/**主键删除公共配置表
+	 * @param publicConfigId
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseResponse deleteById(Integer publicConfigId, HttpServletRequest httpRequest)throws Exception;
+	
+	/**主键软删除公共配置表
+	 * @param publicConfigId
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseResponse softDeleteById(Integer publicConfigId, HttpServletRequest httpRequest)throws Exception;
+	
+	/**条件删除公共配置表
+	 * @param dmpPublicConfigInfoRequest
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseResponse delete(DmpPublicConfigInfoRequest dmpPublicConfigInfoRequest, HttpServletRequest httpRequest)throws Exception;
+	
+	/**条件软删除公共配置表
+	 * @param dmpPublicConfigInfoRequest
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseResponse softDelete(DmpPublicConfigInfoRequest dmpPublicConfigInfoRequest, HttpServletRequest httpRequest)throws Exception;
+
+	/**批量新增公共配置表
+	 * @param dmpPublicConfigInfoVo
+	 * @param httpRequest
+	 * @return
+	 * @throws Exception
+	 */
+	public BaseBeanResponse<DmpPublicConfigInfoBatch> addBatch(DmpPublicConfigInfoBatch dmpPublicConfigInfoBatch, HttpServletRequest httpRequest)throws Exception;
+
+	/**  
+	* @Title: deleteByIds  
+	* @Description: TODO(根据主键批量删除)  
+	* @param @param idList
+	* @param @param httpRequest
+	* @param @return
+	* @param @throws Exception    参数  
+	* @return BaseResponse    返回类型  
+	* @throws  
+	*/ 
+	public BaseResponse deleteByIds(List<Integer> idList, HttpServletRequest httpRequest)throws Exception;
+
+	/**  
+	* @Title: softDeleteByIds  
+	* @Description: TODO(根据主键批量软删除)  
+	* @param @param idList
+	* @param @param httpRequest
+	* @param @return
+	* @param @throws Exception    参数  
+	* @return BaseResponse    返回类型  
+	* @throws  
+	*/ 
+	public BaseResponse softDeleteByIds(List<Integer> idList, HttpServletRequest httpRequest)throws Exception;
+
+}

src/main/resources/application-test.yml

 # 测试环境配置
 server:
-  port: 7182
+  port: 7181
   #contextPath: /resource
 
 management:
-  port: 54002
+  port: 54001
   health:
     mail:
       enabled: false

src/main/resources/logback-spring.xml

@@ -9,7 +9,7 @@
 
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <pattern>%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+            <pattern>%clr([TRACEID:%X{traceId}]){faint} %clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
             <charset>UTF-8</charset>
         </encoder>
     </appender>

src/main/resources/mapper/projconfig/DmpComputEngineMapper.xml

@@ -12,8 +12,25 @@
     <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
   </resultMap>
   
+  <resultMap id="paramResultMap" type="com.jz.dmp.modules.controller.projconfig.bean.DmpComputEngineParamDto">
+    <result column="param_id" property="paramId" jdbcType="INTEGER" />
+    <result column="engine_id" property="engineId" jdbcType="INTEGER" />
+    <result column="param_name" property="paramName" jdbcType="VARCHAR" />
+    <result column="param_type" property="paramType" jdbcType="CHAR" />
+    <result column="param_value" property="paramValue" jdbcType="VARCHAR" />
+    <result column="remark" property="remark" jdbcType="VARCHAR" />
+    <result column="data_status" property="dataStatus" jdbcType="CHAR" />
+    <result column="create_user_id" property="createUserId" jdbcType="INTEGER" />
+    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="update_user_id" property="updateUserId" jdbcType="INTEGER" />
+    <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  
   <resultMap id="BaseDtoResultMap" type="com.jz.dmp.modules.controller.projconfig.bean.DmpComputEngineDto" extends="BaseResultMap">
     <!-- /*$BaseDtoResultMapContent$*/ -->
+    <collection property="paramDtos" ofType="paramResultMap" javaType="java.util.List"
+    	column="engine_id" select="selectParamsByEngineId">
+    </collection>
   </resultMap>
 
   <sql id="Base_Column_List">
@@ -25,6 +42,21 @@
     <include refid="Base_Column_List" />
     <!-- /*$BaseDtoColumnListContent$*/ -->
   </sql>
+  
+  <sql id="param_Column_List">
+    param_id, engine_id, param_name, param_type, param_value,
+    remark, data_status, create_user_id, create_time, update_user_id,
+    update_time
+  </sql>
+  
+  <!-- 根据计算引擎封装引擎参数 -->
+  <select id="selectParamsByEngineId" resultMap="paramResultMap" parameterType="java.lang.String">
+    select
+    <include refid="param_Column_List" />
+    from dmp_comput_engine_param
+    where engine_id = #{engineId,jdbcType=INTEGER}
+    AND param_type='0' AND data_status='1'
+  </select>
 
   <!-- 根据主键查询计算引擎表 -->
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String">