Merge remote-tracking branch 'origin/master'

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/SysConfigDao.java

@@ -18,6 +18,8 @@ public interface SysConfigDao extends BaseDAO<Long, SysConfig> {
      */
     SysConfig findByParamName(String paramName);
 
+    List<SysConfig> findByParamNameList(@Param("paramNameList") List<String> paramNameList);
+
     /**
      * 获取value
      * @param paramName

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/SysConfigService.java

@@ -15,6 +15,8 @@ public interface SysConfigService extends BaseService<Long, SysConfig> {
      * @describe 根据配置名称获取配置信息
      */
     SysConfig findByParamName(String paramName);
+    
+    List<SysConfig> findByParamName(List<String> paramNameList);
 
     String findConfigValue(String paramName);
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/SysConfigServiceImpl.java

@@ -28,6 +28,11 @@ public class SysConfigServiceImpl extends BaseServiceImpl<Long, SysConfig> imple
 	}
 
     @Override
+	public List<SysConfig> findByParamName(List<String> paramNameList) {
+		return sysConfigDao.findByParamNameList(paramNameList);
+	}
+
+	@Override
     public String findConfigValue(String paramName){
         return sysConfigDao.findConfigValue(paramName);
     }

cooleshow-user/user-biz/src/main/resources/config/mybatis/SysConfigMapper.xml

@@ -110,4 +110,11 @@
     <select id="findConfigValue" resultType="java.lang.String">
 		SELECT param_value_ FROM sys_config WHERE param_name_ = #{paramName}
 	</select>
+	
+	<select id="findByParamNameList" resultMap="SysConfig">
+		SELECT * FROM sys_config WHERE param_name_ in 
+		<foreach collection="paramNameList" item="paramName" open="(" close=")" separator=",">
+            #{paramName}
+        </foreach>
+	</select>
 </mapper>

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/SysConfigController.java

@@ -3,6 +3,7 @@ package com.yonge.cooleshow.teacher.controller;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -53,4 +54,14 @@ public class SysConfigController extends BaseController {
 		}
 		return succeed(sysConfigService.findByParamName(paramName));
 	}
+
+	@ApiOperation(value = "查询参数")
+	@GetMapping(value = "queryByParamNameList")
+	public Object queryByParamNameList(String paramNames) {
+		if(StringUtils.isBlank(paramNames)){
+			return failed("参数不能为空");
+		}
+		List<String> paramNameList = Arrays.asList(paramNames.split(","));
+		return succeed(sysConfigService.findByParamName(paramNameList));
+	}
 }