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

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

@@ -142,7 +142,7 @@ public class AzkabanApiUtils2 {
 		List<DmpRole> memberProjectRoles = dmpMember.getMemberProjectRoleList();
 
 		for (DmpRole role : memberProjectRoles) {
-			rolePermissMap.put(role.getRoleType(), role.getRemark());
+			rolePermissMap.put(role.getRoleCode(), role.getRemark());
 		}
 		SSOUserInfo ssoUserInfo = new SSOUserInfo();
 		ssoUserInfo.setUserName(dmpMember.getUsername());

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

 package com.jz.dmp.modules.controller.projconfig.bean;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jz.dmp.modules.model.DmpProjectConfigInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -16,6 +17,7 @@ import io.swagger.annotations.ApiModelProperty;
  *
  */
 @ApiModel(value = "项目配置表Dto", description = "项目配置表Dto")
+@JsonIgnoreProperties(value = {"handler"})
 public class DmpProjectConfigInfoDto extends DmpProjectConfigInfo {
 	
 	/**

src/main/java/com/jz/dmp/modules/controller/sys/bean/DmpMemberDto.java

@@ -27,5 +27,11 @@ public class DmpMemberDto extends DmpMember implements Serializable {
 	
 	@ApiModelProperty(value = "项目角色列表")
 	private List<String> roles;
+	
+	/**
+	 * 用于前端辅助字段
+	 */
+	@ApiModelProperty(value = "用于前端辅助字段")
+	private Integer webAssistFlag = 0;
 
 }

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

@@ -29,8 +29,8 @@ public class DmpProjectConfigEngine implements Serializable{
 	/**
 	* 项目主键
 	*/
-	@ApiModelProperty(value = "项目主键")
-    private Integer projectId;
+	@ApiModelProperty(value = "项目配置主键")
+    private Integer configId;
 
 	/**
 	* 引擎主键
@@ -87,12 +87,12 @@ public class DmpProjectConfigEngine implements Serializable{
 		this.configEngineId = configEngineId;
 	}
 
-	public Integer getProjectId() {
-		return projectId;
+	public Integer getConfigId() {
+		return configId;
 	}
 
-	public void setProjectId(Integer projectId) {
-		this.projectId = projectId;
+	public void setConfigId(Integer configId) {
+		this.configId = configId;
 	}
 
 	public Integer getEngineId() {

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

@@ -30,6 +30,7 @@ import com.jz.dmp.modules.controller.bean.MyDmpProjectConverter;
 import com.jz.dmp.modules.dao.DmpProjectDao;
 import com.jz.dmp.modules.model.DmpMember;
 import com.jz.dmp.modules.model.DmpProject;
+import com.jz.dmp.modules.model.DmpProjectConfigInfo;
 import com.jz.dmp.modules.model.DmpProjectSystemInfo;
 import com.jz.dmp.modules.service.DmpProjectService;
 import com.jz.dmp.modules.service.projconfig.DmpProjectConfigInfoService;
@@ -344,8 +345,12 @@ public class DmpProjectServiceImpl extends BaseService implements DmpProjectServ
 		
 		dmpProjectDao.insert(dmpProject);
 		
+		//设置projectId
+		DmpProjectConfigInfo dmpProjectConfigInfo = dmpProject.getDmpProjectConfigInfo();
+		dmpProjectConfigInfo.setProjectId(dmpProject.getId());
+		
 		//保存项目配置信息
-		dmpProjectConfigInfoService.addOrEdit(dmpProject.getDmpProjectConfigInfo(), httpRequest);
+		dmpProjectConfigInfoService.addOrEdit(dmpProjectConfigInfo, httpRequest);
 		
 		baseBeanResponse.setCode(StatuConstant.SUCCESS_CODE);
 		baseBeanResponse.setMessage("新增成功");

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

@@ -268,6 +268,11 @@ 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());
+			
 			dmpProjectConfigEngineMapper.insertBatch(dmpProjectConfigEngines);
 			
 			//保存填写的私有引擎参数

src/main/resources/application-test.yml

 # 测试环境配置
 server:
-  port: 7183
+  port: 7181
   #contextPath: /resource
 
 management:

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

@@ -55,7 +55,7 @@
     <include refid="param_Column_List" />
     from dmp_comput_engine_param
     where engine_id = #{engineId,jdbcType=INTEGER}
-    AND param_type='0' AND data_status='1'
+    AND data_status='1'
   </select>
 
   <!-- 根据主键查询计算引擎表 -->

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

@@ -3,7 +3,7 @@
 <mapper namespace="com.jz.dmp.modules.dao.projconfig.DmpProjectConfigEngineMapper" >
   <resultMap id="BaseResultMap" type="com.jz.dmp.modules.model.DmpProjectConfigEngine">
     <result column="config_engine_id" property="configEngineId" jdbcType="INTEGER" />
-    <result column="project_id" property="projectId" jdbcType="INTEGER" />
+    <result column="config_id" property="configId" jdbcType="INTEGER" />
     <result column="engine_id" property="engineId" jdbcType="INTEGER" />
     <result column="remark" property="remark" jdbcType="VARCHAR" />
     <result column="data_status" property="dataStatus" jdbcType="CHAR" />
@@ -18,7 +18,7 @@
   </resultMap>
 
   <sql id="Base_Column_List">
-    config_engine_id, project_id, engine_id, remark, data_status,
+    config_engine_id, config_id, engine_id, remark, data_status,
     create_user_id, create_time, update_user_id, update_time
   </sql>
   
@@ -58,8 +58,8 @@
       <if test="configEngineId != null" >
         AND config_engine_id = #{configEngineId,jdbcType=INTEGER}
       </if>
-      <if test="projectId != null" >
-        AND project_id = #{projectId,jdbcType=INTEGER}
+      <if test="configId != null" >
+        AND config_id = #{configId,jdbcType=INTEGER}
       </if>
       <if test="engineId != null" >
         AND engine_id = #{engineId,jdbcType=INTEGER}
@@ -102,8 +102,8 @@
       <if test="configEngineId != null" >
         AND config_engine_id = #{configEngineId,jdbcType=INTEGER}
       </if>
-      <if test="projectId != null" >
-        AND project_id = #{projectId,jdbcType=INTEGER}
+      <if test="configId != null" >
+        AND config_id = #{configId,jdbcType=INTEGER}
       </if>
       <if test="engineId != null" >
         AND engine_id = #{engineId,jdbcType=INTEGER}
@@ -139,11 +139,11 @@
   <!-- 插入项目配置计算引擎关系表 -->
   <insert id="insert" parameterType="com.jz.dmp.modules.model.DmpProjectConfigEngine">
     insert into dmp_project_config_engine (
-    config_engine_id, project_id, engine_id, remark, data_status,
+    config_engine_id, config_id, engine_id, remark, data_status,
     create_user_id, create_time, update_user_id, update_time
     )
     values (
-    #{configEngineId,jdbcType=INTEGER}, #{projectId,jdbcType=INTEGER}, #{engineId,jdbcType=INTEGER}, #{remark,jdbcType=VARCHAR}, #{dataStatus,jdbcType=CHAR},
+    #{configEngineId,jdbcType=INTEGER}, #{configId,jdbcType=INTEGER}, #{engineId,jdbcType=INTEGER}, #{remark,jdbcType=VARCHAR}, #{dataStatus,jdbcType=CHAR},
     #{createUserId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateUserId,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP}
     )
    </insert>
@@ -151,13 +151,13 @@
    <!-- 批量新增项目配置计算引擎关系表 -->
   <insert id="insertBatch" parameterType="com.jz.dmp.modules.model.DmpProjectConfigEngine">
     insert into dmp_project_config_engine (
-    config_engine_id, project_id, engine_id, remark, data_status,
+    config_engine_id, config_id, engine_id, remark, data_status,
     create_user_id, create_time, update_user_id, update_time
     )
     values 
     <foreach collection="list" item="item" separator=",">
     (
-    #{item.configEngineId,jdbcType=INTEGER}, #{item.projectId,jdbcType=INTEGER}, #{item.engineId,jdbcType=INTEGER}, #{item.remark,jdbcType=VARCHAR}, #{item.dataStatus,jdbcType=CHAR},
+    #{item.configEngineId,jdbcType=INTEGER}, #{item.configId,jdbcType=INTEGER}, #{item.engineId,jdbcType=INTEGER}, #{item.remark,jdbcType=VARCHAR}, #{item.dataStatus,jdbcType=CHAR},
     #{item.createUserId,jdbcType=INTEGER}, #{item.createTime,jdbcType=TIMESTAMP}, #{item.updateUserId,jdbcType=INTEGER}, #{item.updateTime,jdbcType=TIMESTAMP}
     )
     </foreach>
@@ -170,8 +170,8 @@
       <if test="configEngineId != null" >
         config_engine_id,
       </if>
-      <if test="projectId != null" >
-        project_id,
+      <if test="configId != null" >
+        config_id,
       </if>
       <if test="engineId != null" >
         engine_id,
@@ -199,8 +199,8 @@
       <if test="configEngineId != null" >
         #{configEngineId,jdbcType=INTEGER},
       </if>
-      <if test="projectId != null" >
-        #{projectId,jdbcType=INTEGER},
+      <if test="configId != null" >
+        #{configId,jdbcType=INTEGER},
       </if>
       <if test="engineId != null" >
         #{engineId,jdbcType=INTEGER},
@@ -230,7 +230,7 @@
   <update id="updateByPrimaryKey" parameterType="com.jz.dmp.modules.model.DmpProjectConfigEngine">
     update dmp_project_config_engine set 
           config_engine_id = #{configEngineId,jdbcType=INTEGER},
-          project_id = #{projectId,jdbcType=INTEGER},
+          config_id = #{configId,jdbcType=INTEGER},
           engine_id = #{engineId,jdbcType=INTEGER},
           remark = #{remark,jdbcType=VARCHAR},
           data_status = #{dataStatus,jdbcType=CHAR},
@@ -248,8 +248,8 @@
       <if test="configEngineId != null" >
         config_engine_id = #{configEngineId,jdbcType=INTEGER},
       </if>
-      <if test="projectId != null" >
-        project_id = #{projectId,jdbcType=INTEGER},
+      <if test="configId != null" >
+        config_id = #{configId,jdbcType=INTEGER},
       </if>
       <if test="engineId != null" >
         engine_id = #{engineId,jdbcType=INTEGER},
@@ -285,8 +285,8 @@
       <if test="configEngineId != null" >
         AND config_engine_id = #{configEngineId,jdbcType=INTEGER}
       </if>
-      <if test="projectId != null" >
-        AND project_id = #{projectId,jdbcType=INTEGER}
+      <if test="configId != null" >
+        AND config_id = #{configId,jdbcType=INTEGER}
       </if>
       <if test="engineId != null" >
         AND engine_id = #{engineId,jdbcType=INTEGER}

src/main/resources/mapper/sys/DmpMemberMapper.xml

@@ -295,7 +295,7 @@
         AND user_password = #{userPassword,jdbcType=VARCHAR}
       </if>
       <if test="realName != null" >
-        AND real_name = #{realName,jdbcType=VARCHAR}
+        AND real_name LIKE CONCAT('%',#{realName,jdbcType=VARCHAR},'%')
       </if>
       <if test="userPhone != null" >
         AND user_phone = #{userPhone,jdbcType=VARCHAR}