企微托管账号

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

 package com.gic.haoban.manage.service.dao.mapper;
 
 
+import com.gic.haoban.manage.api.dto.OpenStaffDTO;
+import com.gic.haoban.manage.api.qdto.OpenStaffPageQDTO;
 import com.gic.haoban.manage.service.entity.TabOpenStaff;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 public interface OpenStaffMapper {
 
     /**
@@ -31,4 +35,6 @@ public interface OpenStaffMapper {
     void update2Qrcode(@Param("id") Long id , @Param("qrcode")String qrcode , @Param("key")String key) ;
 
     void updateLoginStep(@Param("id")Long openStaffId, @Param("step")int step);
+
+    List<OpenStaffDTO> list(OpenStaffPageQDTO qdto);
 }
\ No newline at end of file

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

 package com.gic.haoban.manage.service.service;
 
+import com.gic.api.base.commons.BasePageInfo;
+import com.gic.api.base.commons.Page;
+import com.gic.api.base.commons.ServiceResponse;
+import com.gic.haoban.manage.api.dto.OpenStaffDTO;
+import com.gic.haoban.manage.api.qdto.OpenStaffPageQDTO;
 import com.gic.haoban.manage.service.entity.TabOpenStaff;
 
 public interface OpenStaffService {
@@ -10,4 +15,5 @@ public interface OpenStaffService {
 
     public void logout(String uuid) ;
 
+    ServiceResponse<Page<OpenStaffDTO>> page(OpenStaffPageQDTO qdto, BasePageInfo basePageInfo);
 }

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

 package com.gic.haoban.manage.service.service.impl;
 
+import com.gic.api.base.commons.BasePageInfo;
+import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
+import com.gic.commons.util.PageHelperUtils;
 import com.gic.commons.util.UniqueIdUtils;
+import com.gic.haoban.manage.api.dto.OpenStaffDTO;
+import com.gic.haoban.manage.api.dto.chat.GroupChatDTO;
+import com.gic.haoban.manage.api.qdto.OpenStaffPageQDTO;
 import com.gic.haoban.manage.api.service.OpenStaffApiService;
 import com.gic.haoban.manage.service.dao.mapper.OpenStaffMapper;
 import com.gic.haoban.manage.service.entity.TabOpenStaff;
 import com.gic.haoban.manage.service.service.OpenStaffService;
 import com.gic.haoban.manage.service.util.OpenUtils;
+import com.github.pagehelper.PageHelper;
+import org.apache.commons.lang.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
+import java.util.List;
 
 @Service("openStaffService")
 public class OpenStaffServiceImpl implements OpenStaffService {
@@ -64,4 +73,12 @@ public class OpenStaffServiceImpl implements OpenStaffService {
         openStaff.setUuid(null);
         this.openStaffMapper.update(openStaff) ;
     }
+
+    @Override
+    public ServiceResponse<Page<OpenStaffDTO>> page(OpenStaffPageQDTO qdto, BasePageInfo basePageInfo) {
+        PageHelper.startPage(basePageInfo);
+        List<OpenStaffDTO> list = this.openStaffMapper.list(qdto);
+        Page<OpenStaffDTO> retPage = PageHelperUtils.changePageHelperToCurrentPage(list, OpenStaffDTO.class);
+        return ServiceResponse.success(retPage);
+    }
 }

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

@@ -200,6 +200,6 @@ public class OpenStaffApiServiceImpl implements OpenStaffApiService {
 
     @Override
     public ServiceResponse<Page<OpenStaffDTO>> page(OpenStaffPageQDTO qdto, BasePageInfo basePageInfo) {
-        return null;
+        return this.openStaffService.page(qdto,basePageInfo);
     }
 }

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

@@ -4,7 +4,7 @@
     <resultMap id="BaseResultMap" type="com.gic.haoban.manage.service.entity.TabOpenStaff">
         <id column="open_staff_id" javaType="long" jdbcType="BIGINT" property="openStaffId"/>
         <result column="wx_enterprise_id" javaType="String" jdbcType="CHAR" property="wxEnterpriseId"/>
-        <result column="enterprise_id" property="enterpriseId" />
+        <result column="enterprise_id" property="enterpriseId"/>
         <result column="staff_id" javaType="String" jdbcType="CHAR" property="staffId"/>
         <result column="create_time" javaType="java.util.Date" jdbcType="TIMESTAMP" property="createTime"/>
         <result column="update_time" javaType="java.util.Date" jdbcType="TIMESTAMP" property="updateTime"/>
@@ -21,27 +21,32 @@
         <result column="valid_flag" javaType="int" jdbcType="INTEGER" property="validFlag"/>
         <result column="auth_time" javaType="java.util.Date" jdbcType="TIMESTAMP" property="authTime"/>
         <result column="first_auth_time" javaType="java.util.Date" jdbcType="TIMESTAMP" property="firstAuthTime"/>
-        <result column="valid_qrcode_flag" property="validQrcodeFlag" />
+        <result column="valid_qrcode_flag" property="validQrcodeFlag"/>
     </resultMap>
 
     <sql id="Base_Column_List">
-        open_staff_id, wx_enterprise_id,enterprise_id, staff_id, create_time, update_time, uuid, delete_flag,status_flag, step, qw_user_id, wx_corp_id, qr_code_1, key_1,
+        open_staff_id
+        , wx_enterprise_id,enterprise_id, staff_id, create_time, update_time, uuid, delete_flag,status_flag, step, qw_user_id, wx_corp_id, qr_code_1, key_1,
 	    qr_code_2, key_2, valid_flag, auth_time,first_auth_time , valid_qrcode_flag
     </sql>
 
     <insert id="insert" parameterType="com.gic.haoban.manage.service.dao.mapper.OpenStaffMapper">
             <![CDATA[
-            INSERT INTO tab_haoban_open_staff(
-                open_staff_id, wx_enterprise_id, staff_id, create_time,  update_time, uuid,  delete_flag,  status_flag,   step, qw_user_id,  wx_corp_id,   qr_code_1, key_1,
-                qr_code_2,  key_2,valid_flag, auth_time, first_auth_time , enterprise_id , valid_qrcode_flag
-            )VALUES(
-                       #{openStaffId,jdbcType=BIGINT},      #{wxEnterpriseId,jdbcType=CHAR},   #{staffId,jdbcType=CHAR},   #{createTime,jdbcType=TIMESTAMP},
-                       #{updateTime,jdbcType=TIMESTAMP},    #{uuid,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=INTEGER},    #{statusFlag,jdbcType=INTEGER},
-                       #{step,jdbcType=INTEGER},     #{qwUserId,jdbcType=BIGINT},  #{wxCorpId,jdbcType=BIGINT},     #{qrCode1,jdbcType=VARCHAR},
-                       #{key1,jdbcType=VARCHAR},    #{qrCode2,jdbcType=VARCHAR},  #{key2,jdbcType=VARCHAR},    #{validFlag,jdbcType=INTEGER},
-                       #{authTime,jdbcType=TIMESTAMP},   #{firstAuthTime,jdbcType=TIMESTAMP} , #{enterpriseId} , #{validQrcodeFlag}
-                   )
-            ]]>
+        INSERT INTO tab_haoban_open_staff(open_staff_id, wx_enterprise_id, staff_id, create_time, update_time, uuid,
+                                          delete_flag, status_flag, step, qw_user_id, wx_corp_id, qr_code_1, key_1,
+                                          qr_code_2, key_2, valid_flag, auth_time, first_auth_time, enterprise_id,
+                                          valid_qrcode_flag)
+        VALUES (#{openStaffId,jdbcType=BIGINT}, #{wxEnterpriseId,jdbcType=CHAR}, #{staffId,jdbcType=CHAR},
+                #{createTime,jdbcType=TIMESTAMP},
+                #{updateTime,jdbcType=TIMESTAMP}, #{uuid,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=INTEGER},
+                #{statusFlag,jdbcType=INTEGER},
+                #{step,jdbcType=INTEGER}, #{qwUserId,jdbcType=BIGINT}, #{wxCorpId,jdbcType=BIGINT},
+                #{qrCode1,jdbcType=VARCHAR},
+                #{key1,jdbcType=VARCHAR}, #{qrCode2,jdbcType=VARCHAR}, #{key2,jdbcType=VARCHAR},
+                #{validFlag,jdbcType=INTEGER},
+                #{authTime,jdbcType=TIMESTAMP}, #{firstAuthTime,jdbcType=TIMESTAMP}, #{enterpriseId},
+                #{validQrcodeFlag})
+        ]]>
     </insert>
 
     <update id="update" parameterType="com.gic.haoban.manage.service.entity.TabOpenStaff">
@@ -65,35 +70,57 @@
     </update>
 
     <update id="updateValiFlag">
-        update tab_haoban_open_staff set valid_flag = 1 where uuid = #{uuid}
+        update tab_haoban_open_staff
+        set valid_flag = 1
+        where uuid = #{uuid}
     </update>
 
     <update id="update2QrcodeFlag">
-        update tab_haoban_open_staff set valid_qrcode_flag = 1 where id = #{id}
+        update tab_haoban_open_staff
+        set valid_qrcode_flag = 1
+        where id = #{id}
     </update>
 
     <update id="update2Qrcode">
-        update tab_haoban_open_staff set qr_code_2 = #{qrCode} , key_2 = #{key} where id = #{id}
+        update tab_haoban_open_staff
+        set qr_code_2 = #{qrCode},
+            key_2     = #{key}
+        where id = #{id}
     </update>
 
     <update id="updateLoginStep">
-        update tab_haoban_open_staff set step = #{step} where open_staff_id = #{id}
+        update tab_haoban_open_staff
+        set step = #{step}
+        where open_staff_id = #{id}
     </update>
 
     <delete id="deleteByPrimaryKey">
-        update tab_haoban_open_staff set delete_flag = 1 , update_time =now() where open_staff_id = #{id}
+        update tab_haoban_open_staff
+        set delete_flag = 1,
+            update_time =now()
+        where open_staff_id = #{id}
     </delete>
 
-    <select id="getByStaffId"  resultMap="BaseResultMap">
-        select <include refid="Base_Column_List" /> from tab_haoban_open_staff where staff_id = #{staffId} and delete_flag = 0
+    <select id="getByStaffId" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from tab_haoban_open_staff where staff_id = #{staffId} and delete_flag = 0
     </select>
 
     <select id="getById" resultMap="BaseResultMap">
-        select <include refid="Base_Column_List"/> from tab_haoban_open_staff where open_staff_id = #{id} and delete_flag = 0
+        select
+        <include refid="Base_Column_List"/>
+        from tab_haoban_open_staff where open_staff_id = #{id} and delete_flag = 0
     </select>
 
     <select id="getByUUID" resultMap="BaseResultMap">
-        select <include refid="Base_Column_List"/> from tab_haoban_open_staff where uuid = #{uuid} and delete_flag = 0
+        select
+        <include refid="Base_Column_List"/>
+        from tab_haoban_open_staff where uuid = #{uuid} and delete_flag = 0
+    </select>
+
+    <select id="list" resultMap="BaseResultMap"  parameterType="com.gic.haoban.manage.api.qdto.OpenStaffPageQDTO">
+        select * from tab_haoban_open_staff
     </select>
 
 </mapper>
\ No newline at end of file

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

@@ -3,6 +3,7 @@ package com.gic.haoban.manage.web.controller.open;
 import com.gic.api.base.commons.BasePageInfo;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
+import com.gic.commons.util.PageHelperUtils;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
 import com.gic.haoban.common.utils.AuthWebRequestUtil;
@@ -11,12 +12,14 @@ import com.gic.haoban.manage.api.dto.OpenStaffDTO;
 import com.gic.haoban.manage.api.dto.OpenStaffLicenseDTO;
 import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
 import com.gic.haoban.manage.api.dto.StaffDTO;
+import com.gic.haoban.manage.api.dto.chat.GroupChatHmDTO;
 import com.gic.haoban.manage.api.qdto.OpenStaffInitQDTO;
 import com.gic.haoban.manage.api.qdto.OpenStaffPageQDTO;
 import com.gic.haoban.manage.api.service.OpenStaffApiService;
 import com.gic.haoban.manage.api.service.StaffApiService;
 import com.gic.haoban.manage.api.service.StaffClerkRelationApiService;
 import com.gic.haoban.manage.web.qo.open.OpenStaffQO;
+import com.gic.haoban.manage.web.vo.chat.GroupChatHmVO;
 import com.gic.haoban.manage.web.vo.open.OpenStaffVO;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
@@ -48,14 +51,16 @@ public class QywxOpenController {
      * @param qo
      * @return
      */
-    @RequestMapping("open-staff-list")
+    @RequestMapping("open-staff-page")
     public RestResponse<Page<OpenStaffVO>> page(@RequestBody OpenStaffQO qo,BasePageInfo basePageInfo) {
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         OpenStaffPageQDTO qdto = EntityUtil.changeEntityByJSON(OpenStaffPageQDTO.class,qo) ;
         qdto.setWxEnterpriseId(loginUser.getWxEnterpriseId());
         qdto.setEnterpriseId(loginUser.getEnterpriseId());
-        ServiceResponse<Page<OpenStaffDTO>> page = this.openStaffApiService.page(qdto, basePageInfo);
-        return RestResponse.successResult(null);
+        ServiceResponse<Page<OpenStaffDTO>> pageResp = this.openStaffApiService.page(qdto, basePageInfo);
+        Page<OpenStaffDTO> page = pageResp.getResult();
+        Page<OpenStaffVO> retPage = PageHelperUtils.changePageToCurrentPage(page, OpenStaffVO.class);
+        return RestResponse.successResult(retPage);
     }
 
     /**