Merge branch 'feature/xgh/2406企微托管' into 'developer'

企微托管

See merge request !1924

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/OpenStaffOfflineEnum.java

+package com.gic.haoban.manage.api.enums;
+
+public enum OpenStaffOfflineEnum {
+
+    OFFLINE1(1, "首次托管,需要二次验证"),
+    OFFLINE2(2, "异常断开"),
+    OFFLINE3(3, "手机端结束登录"),
+    OFFLINE4(4, "当前账号在其它设备登录");
+
+    OpenStaffOfflineEnum(Integer code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    private int code;
+    private String desc;
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+}

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

@@ -7,6 +7,7 @@ import com.gic.haoban.manage.api.dto.OpenStaffDTO;
 import com.gic.haoban.manage.api.dto.OpenStaffLicenseDTO;
 import com.gic.haoban.manage.api.dto.OpenStaffListDTO;
 import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
+import com.gic.haoban.manage.api.enums.OpenStaffOfflineEnum;
 import com.gic.haoban.manage.api.qdto.OpenStaffInitQDTO;
 import com.gic.haoban.manage.api.qdto.OpenStaffPageQDTO;
 
@@ -72,7 +73,7 @@ public interface OpenStaffApiService {
     /**
      * 退出登录
      */
-    public ServiceResponse<Void> logout(String uuid) ;
+    public ServiceResponse<Void> logout(String uuid , OpenStaffOfflineEnum offlineEnum) ;
 
     public ServiceResponse<Void> logout(Long openStaffId) ;
 

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

@@ -92,7 +92,12 @@ public interface NoticeMessageApiService {
      */
     public ServiceResponse<Boolean> addOrCreateNoticeMessage(List<NoticeMessageQDTO> qdto);
 
-
-    public void sendMessageForOpenStaff(String enterpriseId, Map<String, String> map) ;
+    /**
+     * 托管账号退出-发送公众号消息
+     * @param enterpriseId
+     * @param accountName
+     * @param reason
+     */
+    public void sendMessageForOpenStaff(String enterpriseId, String accountName, String reason) ;
 
 }
\ No newline at end of file

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

@@ -3,6 +3,7 @@ package com.gic.haoban.manage.web.controller;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.authcenter.commons.util.IgnoreLogin;
+import com.gic.haoban.manage.api.enums.OpenStaffOfflineEnum;
 import com.gic.haoban.manage.api.enums.QwOpenStepEnum;
 import com.gic.haoban.manage.api.service.OpenStaffApiService;
 import com.gic.haoban.task.manage.api.dto.open.OpenQwMessageDTO;
@@ -71,7 +72,7 @@ public class QywxCallbackController extends WebBaseController {
                 this.v100004(uuid,json) ;
                 break;
             case 100005 :
-                this.close(uuid,json) ;
+                this.close(uuid,OpenStaffOfflineEnum.OFFLINE3) ;
                 break;
             case 104001 :
                 this.loginSuccess(uuid,json) ;
@@ -82,6 +83,12 @@ public class QywxCallbackController extends WebBaseController {
             case 100009 :
                 this.v100009(uuid,json) ;
                 break;
+            case 100008:
+                this.close(uuid,OpenStaffOfflineEnum.OFFLINE4);
+                break;
+            case 100007:
+                this.close(uuid,OpenStaffOfflineEnum.OFFLINE2);
+                break;
             default:
                 break;
         }
@@ -185,9 +192,9 @@ public class QywxCallbackController extends WebBaseController {
         String corpName = json.getString("corp_name") ;
         this.openStaffApiService.login(uuid,qwCorpId,corpName,qwUserid) ;
     }
-    private void close(String uuid , JSONObject json) {
+    private void close(String uuid , OpenStaffOfflineEnum offlineEnum) {
         logger.info("退出={}",uuid);
-        this.openStaffApiService.logout(uuid) ;
+        this.openStaffApiService.logout(uuid, offlineEnum) ;
     }
     private void v100003(String uuid , JSONObject json) {
         logger.info("取消登录={}",uuid);

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

@@ -11,11 +11,11 @@ import java.util.List;
 
 public interface OpenStaffService {
 
-    public TabOpenStaff save(TabOpenStaff tab) ;
+    TabOpenStaff save(TabOpenStaff tab) ;
 
-    public TabOpenStaff getByUUID(String uuid) ;
+    TabOpenStaff getByUUID(String uuid) ;
 
-    public void logout(String uuid, String loginRemark, int step , String noticeReason) ;
+    void logout(String uuid, String loginRemark, int step , String noticeReason) ;
 
     ServiceResponse<Page<OpenStaffListDTO>> page(OpenStaffPageQDTO qdto, BasePageInfo basePageInfo);
 

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

@@ -153,8 +153,8 @@ public class QywxAlarmWordsController {
         user.setEnterpriseId(loginUser.getEnterpriseId());
         user.setRealName(loginUser.getClerkName());
         String fileName = "敏感词" ;
-        Date startDate = new Date();
-        Date endDate = new Date() ;
+        Date startDate = qdto.getStartDate();
+        Date endDate = qdto.getEndDate() ;
         if(null != startDate && null != endDate) {
             fileName = fileName + "-" + DateUtil.formatString(startDate, "yyyy-MM-dd") + "到" + DateUtil.formatString(endDate, "yyyy-MM-dd");
         }

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

@@ -127,8 +127,8 @@ public class QywxOpenController {
         user.setEnterpriseId(loginUser.getEnterpriseId());
         user.setRealName(loginUser.getClerkName());
         String fileName = "好办托管企微号";
-        Date startDate = new Date();
-        Date endDate = new Date();
+        Date startDate = qdto.getStartDate();
+        Date endDate = qdto.getEndDate();
         if (null != startDate && null != endDate) {
             fileName = "好办托管企微号" + "-" + DateUtil.formatString(startDate, "yyyy-MM-dd") + "到" + DateUtil.formatString(endDate, "yyyy-MM-dd");
         }