Merge remote-tracking branch 'origin/feature/五月二期' into developer

# Conflicts:
#	haoban-manage3-service/pom.xml

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

@@ -247,5 +247,16 @@ public interface WxEnterpriseApiService {
      * @return 过滤的好办自建应用appidList
      */
     ServiceResponse<List<String>> filterWxAppidList(List<String> wxAppidList);
+    /**
+     * 定时任务，同步自建应用信息
+     */
+    ServiceResponse<Boolean> syncWxEnterpriseInfo(String params);
+
+    /**
+     * 删除
+     * @param wxEnterpriseId 企业微信id
+     * @return
+     */
+    ServiceResponse<Boolean> deleteByWxEnterpriseId(String wxEnterpriseId);
 
 }

haoban-manage3-service/pom.xml

@@ -207,6 +207,11 @@
             <artifactId>image-combiner</artifactId>
             <version>2.6.3</version>
         </dependency>
+        <dependency>
+            <groupId>com.gic.operating</groupId>
+            <artifactId>gic-operating-api</artifactId>
+            <version>${gic-operating-api}</version>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -82,4 +82,11 @@ public interface WxEnterpriseMapper {
      * 根据appidList查询appidList
      */
     List<String> getWxAppidListByList(@Param("wxAppidList")List<String> wxAppidList);
+    /**
+     * 根据好办app类型所有企业微信
+     *
+     * @return
+     */
+    List<TabHaobanWxEnterprise> listAllByWxSecurityType(@Param("wxSecurityType") Integer wxSecurityType);
+    void deleteByWxEnterpriseId(@Param("wxEnterpriseId") String wxEnterpriseId) ;
 }
\ No newline at end of file

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

@@ -80,4 +80,17 @@ public interface WxEnterpriseService {
 	 */
 	List<String> getWxAppidListByList(List<String> wxAppidList);
 
+	/**
+	 * 根据好办app类型所有企业微信
+	 *
+	 * @return
+	 */
+	List<TabHaobanWxEnterprise> listAllByWxSecurityType(Integer wxSecurityType);
+
+	/**
+	 * 删除
+	 * @param wxEnterpriseId
+	 */
+	void deleteByWxEnterpriseId(String wxEnterpriseId) ;
+
 }

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

@@ -301,4 +301,14 @@ public class WxEnterpriseServiceImpl implements WxEnterpriseService {
         }
         return this.mapper.getWxAppidListByList(wxAppidList);
     }
+
+    @Override
+    public List<TabHaobanWxEnterprise> listAllByWxSecurityType(Integer wxSecurityType) {
+        return this.mapper.listAllByWxSecurityType(wxSecurityType);
+    }
+
+    @Override
+    public void deleteByWxEnterpriseId(String wxEnterpriseId) {
+        this.mapper.deleteByWxEnterpriseId(wxEnterpriseId);
+    }
 }

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

@@ -23,6 +23,7 @@ import com.gic.haoban.manage.service.dao.mapper.WxEnterpriseRelatedMapper;
 import com.gic.haoban.manage.service.entity.*;
 import com.gic.haoban.manage.service.pojo.bo.StaffPrivacyUseLogBO;
 import com.gic.haoban.manage.service.service.*;
+import com.gic.operating.api.service.HaobanWxEnterpriseApiService;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
@@ -65,6 +66,8 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
     private HaobanCommonMQApiService haobanCommonMQApiService ;
     @Autowired
     private HaobanRoleApiService haobanRoleApiService;
+    @Autowired
+    private HaobanWxEnterpriseApiService haobanWxEnterpriseApiService;
 
 
     @Override
@@ -554,4 +557,22 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
         wxAppidList.removeAll(list);
         return ServiceResponse.success(wxAppidList);
     }
+
+    @Override
+    public ServiceResponse<Boolean> syncWxEnterpriseInfo(String params) {
+        log.info("定时同步自建应用信息");
+        List<TabHaobanWxEnterprise> list = wxEnterpriseService.listAllByWxSecurityType(5);
+        if (CollUtil.isNotEmpty(list)){
+            list.stream().forEach(a->{
+                //haobanWxEnterpriseApiService.saveOrUpdate();
+            });
+        }
+        return null;
+    }
+
+    @Override
+    public ServiceResponse<Boolean> deleteByWxEnterpriseId(String wxEnterpriseId) {
+        wxEnterpriseService.deleteByWxEnterpriseId(wxEnterpriseId);
+        return ServiceResponse.success(true);
+    }
 }

haoban-manage3-service/src/main/resources/dubbo-haoban-manage-service.xml

@@ -224,5 +224,6 @@
     <dubbo:reference interface="com.gic.orderecommerce.api.service.EcommerceOrderOutputApiService" id="ecommerceOrderOutputApiService" timeout="10000" retries="0" check="false"/>
     <dubbo:reference interface="com.gic.order.api.service.sharding.OrderApiService" id="orderApiService" timeout="10000" retries="0" check="false"/>
     <dubbo:reference interface="com.gic.member.api.service.MemberOutApiService" id="memberOutApiService" timeout="10000" retries="0" check="false"/>
+    <dubbo:reference interface="com.gic.operating.api.service.HaobanWxEnterpriseApiService" id="haobanWxEnterpriseApiService" timeout="10000" retries="0" check="false"/>
 
 </beans>
\ No newline at end of file

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

@@ -561,4 +561,20 @@
             </foreach>
         </if>
     </select>
+    <select id="listAllByWxSecurityType" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from tab_haoban_wx_enterprise
+            status_flag = 1
+        and wx_security_type = #{wxSecurityType}
+
+    </select>
+
+    <update id="deleteByWxEnterpriseId">
+    	 update tab_haoban_wx_enterprise
+        set status_flag = 0,
+            update_time   = now()
+        where wx_enterprise_id = #{wxEnterpriseId}
+    </update>
+
 </mapper>
\ No newline at end of file