Merge branch 'dmp_dev' of http://gitlab.ioubuy.cn/yaobenzhang/jz-dmp-service into dmp_dev

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

@@ -13,6 +13,8 @@ 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.controller.projconfig.bean.DmpPublicConfigInfoDto;
+import com.jz.dmp.modules.controller.projconfig.bean.DmpPublicConfigInfoRequest;
 import com.jz.dmp.modules.model.DmpPublicConfigInfo;
 import com.jz.dmp.modules.service.projconfig.DmpComputEngineService;
 import com.jz.dmp.modules.service.projconfig.DmpPublicConfigInfoService;
@@ -76,4 +78,24 @@ public class DmpPublicConfigInfoController {
 		return baseBeanResponse;
 	}
 	
+	/**查询公共配置
+	 * @param dmpPublicConfigInfoRequest
+	 * @return
+	 */
+	@MethodCallLogPrint
+	@RequestMapping(method = RequestMethod.GET, value = "/findOne")
+	@ApiOperation(value = "查询公共配置", notes = "查询公共配置")
+	public BaseBeanResponse<DmpPublicConfigInfoDto> findOne(HttpServletRequest httpRequest){
+		BaseBeanResponse<DmpPublicConfigInfoDto> baseBeanResponse = new BaseBeanResponse<DmpPublicConfigInfoDto>();
+		try {
+			baseBeanResponse = dmpPublicConfigInfoService.findOne(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

@@ -24,6 +24,9 @@ public class DmpComputEngineDto extends DmpComputEngine {
 	@ApiModelProperty(value = "计算引擎参数列表")
 	private List<DmpComputEngineParamDto> paramDtos;
 	
+	@ApiModelProperty(value = "计算引擎公共参数列表")
+	private List<DmpComputEngineParamDto> pubParamDtos;
+
 	public List<DmpComputEngineParamDto> getParamDtos() {
 		return paramDtos;
 	}
@@ -32,4 +35,12 @@ public class DmpComputEngineDto extends DmpComputEngine {
 		this.paramDtos = paramDtos;
 	}
 
+	public List<DmpComputEngineParamDto> getPubParamDtos() {
+		return pubParamDtos;
+	}
+
+	public void setPubParamDtos(List<DmpComputEngineParamDto> pubParamDtos) {
+		this.pubParamDtos = pubParamDtos;
+	}
+
 }

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

 package com.jz.dmp.modules.controller.projconfig.bean;
 
+import java.util.List;
+
 import com.jz.dmp.modules.model.DmpPublicConfigInfo;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 
 /**公共配置表Dto
  * @author ybz
@@ -10,4 +13,15 @@ import io.swagger.annotations.ApiModel;
 @ApiModel(value = "公共配置表Dto", description = "公共配置表Dto")
 public class DmpPublicConfigInfoDto extends DmpPublicConfigInfo {
 	
+	@ApiModelProperty(value = "计算引擎列表")
+	private List<DmpComputEngineDto> dmpComputEngineDtos;
+
+	public List<DmpComputEngineDto> getDmpComputEngineDtos() {
+		return dmpComputEngineDtos;
+	}
+
+	public void setDmpComputEngineDtos(List<DmpComputEngineDto> dmpComputEngineDtos) {
+		this.dmpComputEngineDtos = dmpComputEngineDtos;
+	}
+	
 }

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

+package com.jz.dmp.modules.controller.projconfig.bean;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.beans.BeanUtils;
+import com.jz.dmp.modules.model.DmpComputEngine;
+
+public class MyDmpComputEngineConverter {
+	
+	private static MyDmpComputEngineConverter instance;
+	
+	private MyDmpComputEngineConverter() {};
+	
+	public synchronized static MyDmpComputEngineConverter INSTANCE() {
+		if (instance==null) {
+			instance = new MyDmpComputEngineConverter();
+		}
+		
+		return instance;
+	}
+	
+	public DmpComputEngineDto domain2dto(DmpComputEngine dmpComputEngine) {
+		DmpComputEngineDto dmpComputEngineDto = new DmpComputEngineDto();
+		BeanUtils.copyProperties(dmpComputEngine, dmpComputEngineDto);
+		
+		return dmpComputEngineDto;
+	}
+	
+	public List<DmpComputEngineDto> domain2dto(List<DmpComputEngine> dmpComputEngines) {
+		List<DmpComputEngineDto> dmpComputEngineDtos = new ArrayList<DmpComputEngineDto>();
+		dmpComputEngines.stream().forEach(x -> {
+			dmpComputEngineDtos.add(domain2dto(x));
+		});
+		
+		return dmpComputEngineDtos;
+	}
+	
+	public DmpComputEngine dto2domain(DmpComputEngineDto dmpComputEngineDto) {
+		DmpComputEngine dmpComputEngine = new DmpComputEngine();
+		BeanUtils.copyProperties(dmpComputEngineDto, dmpComputEngine);
+		
+		return dmpComputEngine;
+	}
+	
+	public List<DmpComputEngine> dto2domain(List<DmpComputEngineDto> dmpComputEngineDtos) {
+		List<DmpComputEngine> dmpComputEngines = new ArrayList<DmpComputEngine>();
+		dmpComputEngineDtos.stream().forEach(x -> {
+			dmpComputEngines.add(domain2dto(x));
+		});
+		
+		return dmpComputEngines;
+	}
+
+}

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

@@ -132,4 +132,15 @@ public interface DmpPublicConfigInfoService {
 	*/ 
 	public BaseResponse softDeleteByIds(List<Integer> idList, HttpServletRequest httpRequest)throws Exception;
 
+	/**  
+	* @Title: findOne  
+	* @Description: TODO(查询公共配置)  
+	* @param @param httpRequest
+	* @param @return
+	* @param @throws Exception    参数  
+	* @return BaseBeanResponse<DmpPublicConfigInfoDto>    返回类型  
+	* @throws  
+	*/ 
+	public BaseBeanResponse<DmpPublicConfigInfoDto> findOne(HttpServletRequest httpRequest)throws Exception;
+
 }

src/main/java/com/jz/dmp/modules/service/projconfig/impl/DmpProjectConfigInfoServiceImpl.java

@@ -268,19 +268,27 @@ public class DmpProjectConfigInfoServiceImpl extends BaseService implements DmpP
 			
 			//保存选择的引擎
 			List<DmpProjectConfigEngine> dmpProjectConfigEngines = dmpProjectConfigInfo.getDmpProjectConfigEngines();
-			dmpProjectConfigEngines = dmpProjectConfigEngines.stream().map(x->{
-				x.setConfigId(dmpProjectConfigInfo.getProjectConfigId());
-				return x;
-			}).collect(Collectors.toList());
+			for (DmpProjectConfigEngine dmpProjectConfigEngine : dmpProjectConfigEngines) {
 				
-			dmpProjectConfigEngineMapper.insertBatch(dmpProjectConfigEngines);
+				dmpProjectConfigEngine.setConfigId(dmpProjectConfigInfo.getProjectConfigId());
+				dmpProjectConfigEngine.setDataStatus("1");
+				dmpProjectConfigEngine.setCreateUserId(getHttpRequestUserId(httpRequest));
+				dmpProjectConfigEngine.setCreateTime(new Date());
+				
+				dmpProjectConfigEngineMapper.insert(dmpProjectConfigEngine);
 				
 				//保存填写的私有引擎参数
-			List<DmpProjectEngineParam> dmpProjectEngineParams = dmpProjectConfigEngines.stream()
-					.flatMap(x->{
-						return x.getDmpProjectEngineParams().stream();
+				List<DmpProjectEngineParam> dmpProjectEngineParams = dmpProjectConfigEngine.getDmpProjectEngineParams();
+				dmpProjectEngineParams = dmpProjectEngineParams.stream().map(x->{
+					x.setConfigEngineId(dmpProjectConfigEngine.getConfigEngineId());
+					x.setDataStatus("1");
+					x.setCreateUserId(getHttpRequestUserId(httpRequest));
+					x.setCreateTime(new Date());
+					return x;
 				}).collect(Collectors.toList());
+				
 				dmpProjectEngineParamMapper.insertBatch(dmpProjectEngineParams);
+			}
 
 			baseBeanResponse.setCode(StatuConstant.SUCCESS_CODE);
 			baseBeanResponse.setMessage("新增成功");

src/main/java/com/jz/dmp/modules/service/projconfig/impl/DmpPublicConfigInfoServiceImpl.java

@@ -18,13 +18,18 @@ import com.github.pagehelper.PageInfo;
 import com.jz.common.bean.BaseBeanResponse;
 import com.jz.common.bean.BaseResponse;
 import com.jz.common.bean.PageInfoResponse;
+import com.jz.common.constant.CommConstant;
 import com.jz.common.constant.StatuConstant;
 import com.jz.common.persistence.BaseService;
+import com.jz.dmp.modules.controller.projconfig.bean.DmpComputEngineDto;
 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.controller.projconfig.bean.MyDmpComputEngineConverter;
+import com.jz.dmp.modules.dao.projconfig.DmpComputEngineMapper;
 import com.jz.dmp.modules.dao.projconfig.DmpComputEngineParamMapper;
 import com.jz.dmp.modules.dao.projconfig.DmpPublicConfigInfoMapper;
+import com.jz.dmp.modules.model.DmpComputEngine;
 import com.jz.dmp.modules.model.DmpComputEngineParam;
 import com.jz.dmp.modules.model.DmpPublicConfigInfo;
 import com.jz.dmp.modules.service.projconfig.DmpComputEngineParamService;
@@ -44,6 +49,9 @@ public class DmpPublicConfigInfoServiceImpl extends BaseService implements DmpPu
 	@Autowired
 	private DmpPublicConfigInfoMapper dmpPublicConfigInfoMapper;
 	
+	@Autowired
+	private DmpComputEngineMapper dmpComputEngineMapper;
+	
 	@Autowired
 	private DmpComputEngineParamMapper dmpComputEngineParamMapper;
 
@@ -903,4 +911,29 @@ public class DmpPublicConfigInfoServiceImpl extends BaseService implements DmpPu
 		return baseResponse;
 	}
 
+	/**
+	 *获取公共配置
+	 */
+	@Override
+	public BaseBeanResponse<DmpPublicConfigInfoDto> findOne(HttpServletRequest httpRequest) throws Exception {
+		BaseBeanResponse<DmpPublicConfigInfoDto> baseBeanResponse = new BaseBeanResponse<DmpPublicConfigInfoDto>();
+		
+		DmpPublicConfigInfoDto dmpPublicConfigInfoDto = new DmpPublicConfigInfoDto();
+		
+		Map<String, Object> param = new HashMap<String, Object>();
+		List<DmpPublicConfigInfoDto> list = dmpPublicConfigInfoMapper.findList(param);
+		if (!CollectionUtils.isEmpty(list)) {
+			dmpPublicConfigInfoDto = list.get(0);
+			Map<String, Object> param2 = new HashMap<String, Object>();
+			List<DmpComputEngineDto> dmpComputEngineDtos = dmpComputEngineMapper.findList(param2);
+			dmpPublicConfigInfoDto.setDmpComputEngineDtos(dmpComputEngineDtos);
+		}
+		
+		baseBeanResponse.setCode(StatuConstant.SUCCESS_CODE);
+		baseBeanResponse.setMessage("查询成功");
+		baseBeanResponse.setData(dmpPublicConfigInfoDto);
+		
+		return baseBeanResponse;
+	}
+
 }

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

@@ -31,6 +31,10 @@
     <collection property="paramDtos" ofType="paramResultMap" javaType="java.util.List"
     	column="engine_id" select="selectParamsByEngineId">
     </collection>
+    <!-- /*$BaseDtoResultMapContent$*/ -->
+    <collection property="pubParamDtos" ofType="paramResultMap" javaType="java.util.List"
+    	column="engine_id" select="selectPubParamsByEngineId">
+    </collection>
   </resultMap>
 
   <sql id="Base_Column_List">
@@ -55,7 +59,16 @@
     <include refid="param_Column_List" />
     from dmp_comput_engine_param
     where engine_id = #{engineId,jdbcType=INTEGER}
-    AND data_status='1'
+    AND data_status='1' AND param_type='1'
+  </select>
+  
+  <!-- 根据计算引擎封装引擎公共参数 -->
+  <select id="selectPubParamsByEngineId" resultMap="paramResultMap" parameterType="java.lang.String">
+    select
+    <include refid="param_Column_List" />
+    from dmp_comput_engine_param
+    where engine_id = #{engineId,jdbcType=INTEGER}
+    AND data_status='1' AND param_type='0'
   </select>
 
   <!-- 根据主键查询计算引擎表 -->

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

@@ -137,7 +137,7 @@
   </update>
 
   <!-- 插入项目配置计算引擎关系表 -->
-  <insert id="insert" parameterType="com.jz.dmp.modules.model.DmpProjectConfigEngine">
+  <insert id="insert" parameterType="com.jz.dmp.modules.model.DmpProjectConfigEngine" useGeneratedKeys="true" keyProperty="configEngineId">
     insert into dmp_project_config_engine (
     config_engine_id, config_id, engine_id, remark, data_status,
     create_user_id, create_time, update_user_id, update_time
@@ -164,7 +164,7 @@
    </insert>
 	
   <!-- 选择性插入项目配置计算引擎关系表 -->
-  <insert id="insertSelective" parameterType="com.jz.dmp.modules.model.DmpProjectConfigEngine">
+  <insert id="insertSelective" parameterType="com.jz.dmp.modules.model.DmpProjectConfigEngine" useGeneratedKeys="true" keyProperty="configEngineId">
     insert into dmp_project_config_engine
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="configEngineId != null" >

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

@@ -185,7 +185,7 @@
   </update>
 
   <!-- 插入项目配置表 -->
-  <insert id="insert" parameterType="com.jz.dmp.modules.model.DmpProjectConfigInfo">
+  <insert id="insert" parameterType="com.jz.dmp.modules.model.DmpProjectConfigInfo" useGeneratedKeys="true" keyProperty="projectConfigId">
     insert into dmp_project_config_info (
     project_config_id, project_id, remark, data_status, create_user_id,
     create_time, update_user_id, update_time
@@ -212,7 +212,7 @@
    </insert>
 	
   <!-- 选择性插入项目配置表 -->
-  <insert id="insertSelective" parameterType="com.jz.dmp.modules.model.DmpProjectConfigInfo">
+  <insert id="insertSelective" parameterType="com.jz.dmp.modules.model.DmpProjectConfigInfo" useGeneratedKeys="true" keyProperty="projectConfigId">
     insert into dmp_project_config_info
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="projectConfigId != null" >