Merge branch 'developer-20200428application' into 'developer'

Developer 20200428application

See merge request !61

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

@@ -10,4 +10,6 @@ public interface ApplicationApiService {
 
 	List<ApplicationDTO> listByApplications(List<String> applicationIds);
 
+	List<ApplicationDTO> listApplicationByWxEnterpriseId(String wxEnterpriseId);
+
 }

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

+package com.gic.haoban.manage.service.dao.mapper;
+
+import java.util.List;
+
+import com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseApplicationRelated;
+
+public interface TabHaobanWxEnterpriseApplicationRelatedMapper {
+    int deleteByPrimaryKey(String wxEnterpriseApplicationRelatedId);
+
+    int insert(TabHaobanWxEnterpriseApplicationRelated record);
+
+    int insertSelective(TabHaobanWxEnterpriseApplicationRelated record);
+
+    TabHaobanWxEnterpriseApplicationRelated selectByPrimaryKey(String wxEnterpriseApplicationRelatedId);
+
+    int updateByPrimaryKeySelective(TabHaobanWxEnterpriseApplicationRelated record);
+
+    int updateByPrimaryKey(TabHaobanWxEnterpriseApplicationRelated record);
+
+	TabHaobanWxEnterpriseApplicationRelated selectByApplicationIdAndWxEnterpriseId(String applicationId,
+			String wxEnterpriseId);
+
+	List<TabHaobanWxEnterpriseApplicationRelated> listByWxEnterpriseId(String wxEnterpriseId);
+}
\ No newline at end of file

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

+package com.gic.haoban.manage.service.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class TabHaobanWxEnterpriseApplicationRelated implements Serializable {
+    private String wxEnterpriseApplicationRelatedId;
+
+    private String applicationId;
+
+    private String wxEnterpriseId;
+
+    private Integer statusFlag;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private static final long serialVersionUID = 1L;
+
+    public String getWxEnterpriseApplicationRelatedId() {
+        return wxEnterpriseApplicationRelatedId;
+    }
+
+    public void setWxEnterpriseApplicationRelatedId(String wxEnterpriseApplicationRelatedId) {
+        this.wxEnterpriseApplicationRelatedId = wxEnterpriseApplicationRelatedId == null ? null : wxEnterpriseApplicationRelatedId.trim();
+    }
+
+    public String getApplicationId() {
+        return applicationId;
+    }
+
+    public void setApplicationId(String applicationId) {
+        this.applicationId = applicationId == null ? null : applicationId.trim();
+    }
+
+    public String getWxEnterpriseId() {
+        return wxEnterpriseId;
+    }
+
+    public void setWxEnterpriseId(String wxEnterpriseId) {
+        this.wxEnterpriseId = wxEnterpriseId == null ? null : wxEnterpriseId.trim();
+    }
+
+    public Integer getStatusFlag() {
+        return statusFlag;
+    }
+
+    public void setStatusFlag(Integer statusFlag) {
+        this.statusFlag = statusFlag;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+}
\ No newline at end of file

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

+package com.gic.haoban.manage.service.service;
+
+import java.util.List;
+import java.util.Set;
+
+import com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseApplicationRelated;
+
+public interface WxEnterpriseApplicationRelatedService {
+
+	void saveEnterpriseApplicationRelateds(Set<String> applicationSet, String wxEnterpriseId);
+
+	List<TabHaobanWxEnterpriseApplicationRelated> listByWxEnterpriseId(String wxEnterpriseId);
+
+}

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

+package com.gic.haoban.manage.service.service.impl;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.gic.haoban.common.utils.StringUtil;
+import com.gic.haoban.manage.service.dao.mapper.TabHaobanWxEnterpriseApplicationRelatedMapper;
+import com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseApplicationRelated;
+import com.gic.haoban.manage.service.service.WxEnterpriseApplicationRelatedService;
+
+@Service
+public class WxEnterpriseApplicationRelatedServiceImpl implements WxEnterpriseApplicationRelatedService{
+	
+	@Autowired 
+	private TabHaobanWxEnterpriseApplicationRelatedMapper mapper;
+	
+	@Override
+	public void saveEnterpriseApplicationRelateds(Set<String> applicationSet,String wxEnterpriseId){
+		List<TabHaobanWxEnterpriseApplicationRelated> list = mapper.listByWxEnterpriseId(wxEnterpriseId);
+		//删除已经设置过的 这次不设置的应用
+		for (TabHaobanWxEnterpriseApplicationRelated tabHaobanWxEnterpriseApplicationRelated : list) {
+			if(!applicationSet.contains(tabHaobanWxEnterpriseApplicationRelated.getApplicationId())){
+				mapper.deleteByPrimaryKey(tabHaobanWxEnterpriseApplicationRelated.getWxEnterpriseApplicationRelatedId());
+			}
+		}
+		//新增设置的应用
+		for (String applicationId : applicationSet) {
+			TabHaobanWxEnterpriseApplicationRelated tab = mapper.selectByApplicationIdAndWxEnterpriseId(applicationId,wxEnterpriseId);
+			if(tab != null){
+				tab = new TabHaobanWxEnterpriseApplicationRelated();
+				tab.setApplicationId(applicationId);
+				tab.setCreateTime(new Date());
+				tab.setUpdateTime(tab.getCreateTime());
+				tab.setStatusFlag(1);
+				tab.setWxEnterpriseId(wxEnterpriseId);
+				tab.setWxEnterpriseApplicationRelatedId(StringUtil.randomUUID());
+				mapper.insert(tab);
+			}
+		}
+	}
+
+	@Override
+	public List<TabHaobanWxEnterpriseApplicationRelated> listByWxEnterpriseId(String wxEnterpriseId) {
+		return mapper.listByWxEnterpriseId(wxEnterpriseId);
+	}
+
+}

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

 package com.gic.haoban.manage.service.service.out.impl;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -11,7 +14,9 @@ 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.entity.TabHaobanWxEnterpriseApplicationRelated;
 import com.gic.haoban.manage.service.service.ApplicationService;
+import com.gic.haoban.manage.service.service.WxEnterpriseApplicationRelatedService;
 
 import org.springframework.stereotype.Service;
 
@@ -22,6 +27,8 @@ public class ApplicationApiServiceImpl implements ApplicationApiService {
 	private ApplicationService applicationService;
 	@Autowired
 	private ApplicationMapper applicationMapper;
+	@Autowired
+	private WxEnterpriseApplicationRelatedService wxEnterpriseApplicationRelatedService;
 	@Override
 	public List<ApplicationDTO> listApplication() {
 		List<TabHaobanApplication> list = applicationService.listApplication();
@@ -37,5 +44,24 @@ public class ApplicationApiServiceImpl implements ApplicationApiService {
 		List<ApplicationDTO> result = EntityUtil.changeEntityListByJSON(ApplicationDTO.class, list);
 		return result;
 	}
+	
+	void saveEnterpriseApplicationRelateds(Set<String> applicationSet, String wxEnterpriseId){
+		wxEnterpriseApplicationRelatedService.saveEnterpriseApplicationRelateds(applicationSet, wxEnterpriseId);
+	}
+
+	@Override
+	public List<ApplicationDTO> listApplicationByWxEnterpriseId(String wxEnterpriseId) {
+		List<TabHaobanApplication> list = applicationService.listApplication();
+		List<TabHaobanWxEnterpriseApplicationRelated> relatedList = wxEnterpriseApplicationRelatedService.listByWxEnterpriseId(wxEnterpriseId);
+		List<String> applicationIds = relatedList.stream().map(s->s.getApplicationId()).collect(Collectors.toList());
+		List<TabHaobanApplication> result = new ArrayList<TabHaobanApplication>();
+		for (TabHaobanApplication tabHaobanApplication : list) {
+			if(applicationIds.contains(tabHaobanApplication.getApplicationId())){
+				result.add(tabHaobanApplication);
+			}
+		}
+
+		return EntityUtil.changeEntityListByJSON(ApplicationDTO.class, result);
+	}
 
 }

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

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.gic.haoban.manage.service.dao.mapper.TabHaobanWxEnterpriseApplicationRelatedMapper" >
+  <resultMap id="BaseResultMap" type="com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseApplicationRelated" >
+    <id column="wx_enterprise_application_related_id" property="wxEnterpriseApplicationRelatedId" jdbcType="VARCHAR" />
+    <result column="application_id" property="applicationId" jdbcType="VARCHAR" />
+    <result column="wx_enterprise_id" property="wxEnterpriseId" jdbcType="VARCHAR" />
+    <result column="status_flag" property="statusFlag" jdbcType="INTEGER" />
+    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    wx_enterprise_application_related_id, application_id, wx_enterprise_id, status_flag, 
+    create_time, update_time
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from tab_haoban_wx_enterprise_application_related
+    where wx_enterprise_application_related_id = #{wxEnterpriseApplicationRelatedId,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    delete from tab_haoban_wx_enterprise_application_related
+    where wx_enterprise_application_related_id = #{wxEnterpriseApplicationRelatedId,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseApplicationRelated" >
+    insert into tab_haoban_wx_enterprise_application_related (wx_enterprise_application_related_id, application_id, 
+      wx_enterprise_id, status_flag, create_time, 
+      update_time)
+    values (#{wxEnterpriseApplicationRelatedId,jdbcType=VARCHAR}, #{applicationId,jdbcType=VARCHAR}, 
+      #{wxEnterpriseId,jdbcType=VARCHAR}, #{statusFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseApplicationRelated" >
+    insert into tab_haoban_wx_enterprise_application_related
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="wxEnterpriseApplicationRelatedId != null" >
+        wx_enterprise_application_related_id,
+      </if>
+      <if test="applicationId != null" >
+        application_id,
+      </if>
+      <if test="wxEnterpriseId != null" >
+        wx_enterprise_id,
+      </if>
+      <if test="statusFlag != null" >
+        status_flag,
+      </if>
+      <if test="createTime != null" >
+        create_time,
+      </if>
+      <if test="updateTime != null" >
+        update_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="wxEnterpriseApplicationRelatedId != null" >
+        #{wxEnterpriseApplicationRelatedId,jdbcType=VARCHAR},
+      </if>
+      <if test="applicationId != null" >
+        #{applicationId,jdbcType=VARCHAR},
+      </if>
+      <if test="wxEnterpriseId != null" >
+        #{wxEnterpriseId,jdbcType=VARCHAR},
+      </if>
+      <if test="statusFlag != null" >
+        #{statusFlag,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null" >
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseApplicationRelated" >
+    update tab_haoban_wx_enterprise_application_related
+    <set >
+      <if test="applicationId != null" >
+        application_id = #{applicationId,jdbcType=VARCHAR},
+      </if>
+      <if test="wxEnterpriseId != null" >
+        wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR},
+      </if>
+      <if test="statusFlag != null" >
+        status_flag = #{statusFlag,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null" >
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where wx_enterprise_application_related_id = #{wxEnterpriseApplicationRelatedId,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseApplicationRelated" >
+    update tab_haoban_wx_enterprise_application_related
+    set application_id = #{applicationId,jdbcType=VARCHAR},
+      wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR},
+      status_flag = #{statusFlag,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_time = #{updateTime,jdbcType=TIMESTAMP}
+    where wx_enterprise_application_related_id = #{wxEnterpriseApplicationRelatedId,jdbcType=VARCHAR}
+  </update>
+  
+  
+  <select id=selectByApplicationIdAndWxEnterpriseId resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from tab_haoban_wx_enterprise_application_related
+    where wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR}
+    and application_id = #{applicationId}
+    and status_flag = 1
+  </select>
+  
+  <select id=listByWxEnterpriseId resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from tab_haoban_wx_enterprise_application_related
+    where wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR}
+    and status_flag = 1
+  </select>
+</mapper>
\ No newline at end of file

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

@@ -65,7 +65,9 @@ public class ApplicationController extends WebBaseController{
 	
 	@RequestMapping("application-list")
 	public HaobanResponse applicationList() {
-		List<ApplicationDTO> list = applicationApiService.listApplication();
+		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+		String wxEnterpriseId = login.getWxEnterpriseId();
+		List<ApplicationDTO> list = applicationApiService.listApplicationByWxEnterpriseId(wxEnterpriseId);
 		return resultResponse(HaoBanErrCode.ERR_1,list);
 	}
 	@IgnoreLogin
@@ -75,7 +77,7 @@ public class ApplicationController extends WebBaseController{
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
 		Map<String,Object> map = new HashMap<>();
-		List<ApplicationDTO> list = applicationApiService.listApplication();
+		List<ApplicationDTO> list = applicationApiService.listApplicationByWxEnterpriseId(wxEnterpriseId);
 		List<String> applicationIds = list.stream().map(s->s.getApplicationId()).collect(Collectors.toList());
 		List<ApplicationSettingDTO> result = applicationSettingApiService.listOpenByWxEnterpriseIdAndApplicationIds(wxEnterpriseId,applicationIds);
 		//开启

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

@@ -30,7 +30,7 @@ public class ApplicationController extends WebBaseController{
 	@RequestMapping("application-list")
 	public HaobanResponse applicationList(String wxEnterpriseId) {
 		
-		List<ApplicationDTO> list = applicationApiService.listApplication();
+		List<ApplicationDTO> list = applicationApiService.listApplicationByWxEnterpriseId(wxEnterpriseId);
 
 		List<String> applicationIds = list.stream().map(s->s.getApplicationId()).collect(Collectors.toList());
 		List<ApplicationSettingDTO> settings = applicationSettingApiService.listOpenByWxEnterpriseIdAndApplicationIds(wxEnterpriseId, applicationIds);