Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

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

@@ -8,6 +8,6 @@ public interface ApplicationApiService {
 
 	List<ApplicationDTO> listApplication();
 
-	
+	List<ApplicationDTO> listByApplications(List<String> applicationIds);
 
 }

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

 package com.gic.haoban.manage.api.service;
 
+import java.util.List;
+
 import com.gic.haoban.manage.api.dto.ApplicationSettingDTO;
 
 /**
@@ -11,4 +13,5 @@ public interface ApplicationSettingApiService {
 
 	ApplicationSettingDTO findSettingByWxEnterpriseIdAndApplicationId(String wxEnterpriseId,String applicationId);
 
+	List<ApplicationSettingDTO> listOpenByWxEnterpriseIdAndApplicationIds(String wxEnterpriseId,List<String> applicationIds);
 }

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

@@ -2,6 +2,8 @@ package com.gic.haoban.manage.service.dao.mapper;
 
 import java.util.List;
 
+import org.apache.ibatis.annotations.Param;
+
 import com.gic.haoban.manage.service.entity.TabHaobanApplication;
 
 public interface ApplicationMapper {
@@ -18,4 +20,7 @@ public interface ApplicationMapper {
     int updateByPrimaryKey(TabHaobanApplication record);
 
 	List<TabHaobanApplication> listApplication();
+	
+	List<TabHaobanApplication> listByApplicationIds(@Param("applicationIds")List<String> applicationIds);
+	
 }
\ No newline at end of file

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

 package com.gic.haoban.manage.service.dao.mapper;
 
+import java.util.List;
+
 import org.apache.ibatis.annotations.Param;
 
 import com.gic.haoban.manage.service.entity.TabHaobanApplicationSetting;
@@ -20,4 +22,6 @@ public interface ApplicationSettingMapper {
     void saveSetting(@Param("wxEnterpriseId")String wxEnterpriseId, @Param("applicationId")String applicationId,@Param("openFlag")int openFlag);
     
     TabHaobanApplicationSetting findSetting(@Param("wxEnterpriseId")String wxEnterpriseId, @Param("applicationId")String applicationId);
+    
+    List<TabHaobanApplicationSetting> listOpenByWxEnterpriseIdAndApplicationIds(@Param("wxEnterpriseId")String wxEnterpriseId, @Param("applicationIds")List<String> applicationIds);
 }
\ No newline at end of file

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

@@ -2,6 +2,8 @@ package com.gic.haoban.manage.service.dao.mapper;
 
 import java.util.List;
 
+import org.apache.ibatis.annotations.Param;
+
 import com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseRelated;
 
 public interface WxEnterpriseRelatedMapper {
@@ -23,6 +25,6 @@ public interface WxEnterpriseRelatedMapper {
 
 	List<TabHaobanWxEnterpriseRelated> queryAllHasGicEnterpriseId();
 	
-	List<TabHaobanWxEnterpriseRelated> listEnterpriseByEnterpriseIds(List<String> enterpriseIds);
+	List<TabHaobanWxEnterpriseRelated> listEnterpriseByEnterpriseIds(@Param("enterpriseIds")List<String> enterpriseIds);
 
 }
\ No newline at end of file

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

@@ -4,11 +4,15 @@ import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
+import cn.hutool.core.collection.CollectionUtil;
+
 import com.gic.commons.util.EntityUtil;
 import com.gic.haoban.manage.api.dto.ApplicationDTO;
 import com.gic.haoban.manage.api.service.ApplicationApiService;
+import com.gic.haoban.manage.service.dao.mapper.ApplicationMapper;
 import com.gic.haoban.manage.service.entity.TabHaobanApplication;
 import com.gic.haoban.manage.service.service.ApplicationService;
+
 import org.springframework.stereotype.Service;
 
 @Service
@@ -16,11 +20,22 @@ public class ApplicationApiServiceImpl implements ApplicationApiService {
 	
 	@Autowired
 	private ApplicationService applicationService;
-
+	@Autowired
+	private ApplicationMapper applicationMapper;
 	@Override
 	public List<ApplicationDTO> listApplication() {
 		List<TabHaobanApplication> list = applicationService.listApplication();
 		return EntityUtil.changeEntityListByJSON(ApplicationDTO.class, list);
 	}
 
+	@Override
+	public List<ApplicationDTO> listByApplications(List<String> applicationIds) {
+		List<TabHaobanApplication> list = applicationMapper.listByApplicationIds(applicationIds);
+		if(CollectionUtil.isEmpty(list)){
+			return null;
+		}
+		List<ApplicationDTO> result = EntityUtil.changeEntityListByJSON(ApplicationDTO.class, list);
+		return result;
+	}
+
 }

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

 package com.gic.haoban.manage.service.service.out.impl;
 
 import java.util.Date;
+import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import cn.hutool.core.collection.CollectionUtil;
+
 import com.gic.commons.util.EntityUtil;
 import com.gic.haoban.common.utils.UuidUtil;
 import com.gic.haoban.manage.api.dto.ApplicationSettingDTO;
@@ -48,4 +51,15 @@ public class ApplicationSettingApiServiceImpl implements ApplicationSettingApiSe
 		ApplicationSettingDTO dto = EntityUtil.changeEntity(ApplicationSettingDTO.class, tab);
 		return dto;
 	}
+
+	@Override
+	public List<ApplicationSettingDTO> listOpenByWxEnterpriseIdAndApplicationIds(
+			String wxEnterpriseId, List<String> applicationIds) {
+	    List<TabHaobanApplicationSetting> list = applicationSettingMapper.listOpenByWxEnterpriseIdAndApplicationIds(wxEnterpriseId,applicationIds);
+		if(CollectionUtil.isEmpty(list)){
+			return null;
+		}
+		List<ApplicationSettingDTO> result = EntityUtil.changeEntityListByJSON(ApplicationSettingDTO.class, list);
+		return result;
+	}
 }

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

@@ -145,4 +145,17 @@
     from tab_haoban_application
     where status_flag = 1
   </select>
+    <select id="listByApplicationIds" resultMap="BaseResultMap" >
+    select 
+    <include refid="Base_Column_List" />
+    from tab_haoban_application
+    where status_flag = 1
+         <if test="applicationIds != null and applicationIds.size() > 0">
+	    	and application_id IN 
+		    <foreach collection="applicationIds" item="id" index="index" open="(" close=")" separator=",">
+		      #{id,jdbcType=VARCHAR}
+		    </foreach>
+      	</if>
+  </select>
+
 </mapper>
\ No newline at end of file

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

@@ -138,4 +138,21 @@
        and wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR}
   </select>
   
+   <select id="listOpenByWxEnterpriseIdAndApplicationIds" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from tab_haoban_application_setting
+    where 
+       	 wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR}
+       	 and open_flag = 1
+       <if test="applicationIds != null and applicationIds.size() > 0">
+	    	and application_id IN 
+		    <foreach collection="applicationIds" item="id" index="index" open="(" close=")" separator=",">
+		      #{id,jdbcType=VARCHAR}
+		    </foreach>
+      </if>
+  </select>
+  
+  
+  
 </mapper>
\ No newline at end of file

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/ApplicationController.java

 package com.gic.haoban.manage.web.controller;
 
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import cn.hutool.core.collection.CollectionUtil;
 
 import com.alibaba.fastjson.JSON;
 import com.ctrip.framework.apollo.spring.annotation.ApolloConfig;
@@ -55,6 +61,30 @@ public class ApplicationController extends WebBaseController{
 		List<ApplicationDTO> list = applicationApiService.listApplication();
 		return resultResponse(HaoBanErrCode.ERR_1,list);
 	}
+	@IgnoreLogin
+	@RequestMapping("application-open-close-list")
+	public HaobanResponse applicationList(String wxEnterpriseId) {
+		Map<String,Object> map = new HashMap<>();
+		List<ApplicationDTO> list = applicationApiService.listApplication();
+		List<String> applicationIds = list.stream().map(s->s.getApplicationId()).collect(Collectors.toList());
+		List<ApplicationSettingDTO> result = applicationSettingApiService.listOpenByWxEnterpriseIdAndApplicationIds(wxEnterpriseId,applicationIds);
+		//开启
+		List<ApplicationDTO> openList = new ArrayList<ApplicationDTO>();
+		List<String> openApplicationIds = new ArrayList<>();
+		if(CollectionUtil.isNotEmpty(result)){
+			openApplicationIds = result.stream().map(s->s.getApplicationId()).collect(Collectors.toList());
+			openList = applicationApiService.listByApplications(openApplicationIds);
+		}
+		//关闭
+		List<ApplicationDTO> closeList = new ArrayList<ApplicationDTO>();
+		applicationIds.removeAll(openApplicationIds);
+		if(CollectionUtil.isNotEmpty(applicationIds)){
+			closeList = applicationApiService.listByApplications(applicationIds);
+		}		
+		map.put("open", openList);
+		map.put("close", closeList);
+		return resultResponse(HaoBanErrCode.ERR_1,map);
+	}
 	
 	@RequestMapping("open-or-close")
 	public HaobanResponse applicationList(String wxEnterpriseId, String applicationId, Integer openFlag) {