Merge branch 'feature-content3' of git.gicdev.com:haoban3.0/haoban-manage3.0 into feature-content3

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/out/SecretSettingApiService.java

@@ -19,6 +19,14 @@ public interface SecretSettingApiService {
     SecretSettingDTO getSecretSetting(String wxEnterpriseId, int secretType);
 
     /**
+     * 获取SecretSetting列表
+     * @param wxEnterpriseIdList
+     * @param secretType
+     * @return
+     */
+    List<SecretSettingDTO> getSecretSettingList(List<String> wxEnterpriseIdList, int secretType);
+
+    /**
      * 保存或更新配置
      * @param secretSetting
      */

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/SecretSettingMapper.java

@@ -42,6 +42,17 @@ public interface SecretSettingMapper {
                                       @Param("enterpriseId") String enterpriseId);
 
     /**
+     * 批量获取配置
+     * @param wxEnterpriseIdList
+     * @param secretType
+     * @param enterpriseId
+     * @return
+     */
+    List<TabSecretSetting> getSecretSettingList(@Param("wxEnterpriseIdList") List<String> wxEnterpriseIdList,
+                                      @Param("secretType") int secretType,
+                                      @Param("enterpriseId") String enterpriseId);
+    
+    /**
      * 
     * @Title: isExsitGicMemberApp
     * @Description: 是否已经存在配置的gic会员小程序

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/SecretSettingService.java

@@ -4,8 +4,6 @@ import com.gic.haoban.manage.api.dto.SecretSettingDTO;
 
 import java.util.List;
 
-import org.apache.ibatis.annotations.Param;
-
 /**
  * Created 2020/6/3.
  *
@@ -42,6 +40,14 @@ public interface SecretSettingService {
     public SecretSettingDTO getSecretSetting(String wxEnterpriseId,int secretType);
 
     /**
+     * 通过wx企业id获取密钥设置列表
+     * @param wxEnterpriseIdList
+     * @param secretType
+     * @return
+     */
+    public List<SecretSettingDTO> getSecretSettingList(List<String> wxEnterpriseIdList, int secretType);
+
+    /**
      * 根据会员小程序类型获取
      * @param wxEnterpriseId
      * @param enterpriseId

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/SecretSettingServiceImpl.java

@@ -85,6 +85,13 @@ public class SecretSettingServiceImpl implements SecretSettingService {
     }
 
     @Override
+    public List<SecretSettingDTO> getSecretSettingList(List<String> wxEnterpriseIdList, int secretType) {
+        List<TabSecretSetting> secretSettingList = secretSettingMapper.getSecretSettingList(wxEnterpriseIdList, secretType, null);
+        return EntityUtil.changeEntityListByJSON(SecretSettingDTO.class, secretSettingList);
+
+    }
+
+    @Override
     public SecretSettingDTO getMemberSecretSetting(String wxEnterpriseId, String enterpriseId) {
         if (StringUtils.isNotBlank(enterpriseId) && !"-1".equals(enterpriseId)) {
             TabSecretSetting secretSetting = secretSettingMapper.getSecretSetting(wxEnterpriseId, SecretTypeEnum.MEMBER_WAPP.getVal(), enterpriseId);

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/SecretSettingApiServiceImpl.java

@@ -24,6 +24,11 @@ public class SecretSettingApiServiceImpl implements SecretSettingApiService {
     }
 
     @Override
+    public List<SecretSettingDTO> getSecretSettingList(List<String> wxEnterpriseIdList, int secretType) {
+        return secretSettingService.getSecretSettingList(wxEnterpriseIdList, secretType);
+    }
+
+    @Override
     public void saveOrUpdateSecretSetting(SecretSettingDTO secretSetting) {
         secretSettingService.saveSecretSetting(secretSetting);
     }

haoban-manage3-service/src/main/resources/mapper/SecretSettingMapper.xml

@@ -97,6 +97,22 @@
     ORDER BY create_time desc LIMIT 1
   </select>
 
+  <select id="getSecretSettingList"  resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+      from tab_haoban_secret_setting
+      where wx_enterprise_id in
+    <foreach collection="wxEnterpriseIdList" item="wxEnterpriseId" open="(" separator="," close=")">
+      #{wxEnterpriseId,jdbcType=VARCHAR}
+    </foreach>
+      and status_flag=1
+      and secret_type=#{secretType}
+    <if test="enterpriseId!=null">
+      and enterprise_id=#{enterpriseId,jdbcType=VARCHAR}
+    </if>
+      ORDER BY create_time desc
+  </select>
+  
   <select id="exsitGicEidMemberApp" resultType="com.gic.haoban.manage.api.dto.SecretSettingDTO">
   	select enterprise_id enterpriseId , secret_id secretId  from tab_haoban_secret_setting where wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR} 
   	and status_flag = 1 and secret_type = 4 and enterprise_id is not null