Merge branch 'feature/社群' into 'developer'

Feature/社群

See merge request !834

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

@@ -607,7 +607,7 @@ public class GroupChatServiceImpl implements GroupChatService {
                 chat.setChatNotice(notice);
                 chat.setName(chatName);
                 // 匹配GIC商户ID ,如果已经初始化过,不再自动匹配GIC商户
-                if (chat.getInitFlag() == 0 ) {
+                if (chat.getInitFlag() == 0) {
                     enterpriseId = matchGicEnterpriseId(wxEnterpriseId, enterpriseId, staff);
                     chat.setEnterpriseId(enterpriseId);
                     if (StringUtils.isNotEmpty(chat.getEnterpriseId())) {

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

 package com.gic.haoban.manage.web.controller.chat;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -55,13 +54,10 @@ import com.gic.log.record.anno.GicLogRecord;
 import com.gic.log.record.util.GicLogRecordCategoryEnum;
 import com.gic.log.record.util.GicLogRecordEvaluationContext;
 import com.gic.log.record.util.GicLogRecordOptTypeEnum;
-import com.gic.thirdparty.cloudfile.CloudFileUtil;
-import com.gic.thirdparty.cloudfile.enums.CloudFileBusinessOptEnum;
-import com.gic.thirdparty.cloudfile.enums.CloudFileTypeEnum;
-import com.gic.thirdparty.cloudfile.pojo.CloudFileInfo;
+import com.gic.qcloud.BucketNameEnum;
+import com.gic.qcloud.FileUploadUtil;
 import com.gic.web.common.utils.DataPermissionExport;
 import com.gic.web.common.utils.ExecutorPoolSingleton;
-import com.gic.web.common.utils.SessionContextUtils;
 import com.google.common.collect.Sets;
 
 /**
@@ -410,7 +406,13 @@ public class GroupChatHmController {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
         String qrCodeName = "群活码";
         final String fileName = qrCodeName + "_" + sdf.format(new Date()) + ".zip";
-        final AuthorizedUser au = SessionContextUtils.getLoginUser();
+        WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
+        String wxEnterpriseId = loginUser.getWxEnterpriseId();
+        String enterpriseId = loginUser.getEnterpriseId();
+        final AuthorizedUser au = new AuthorizedUser();
+        au.setEnterpriseId(enterpriseId);
+        au.setUserId(loginUser.getClerkId());
+        au.setRealName(loginUser.getClerkName());
         String path = RequestThreadLocal.get().getSession().getServletContext().getRealPath("/chat/qrcode/");
         String uuId = ToolUtil.randomUUID();
         path = path + uuId;
@@ -424,9 +426,6 @@ public class GroupChatHmController {
             } catch (IOException e) {
             }
         }
-        WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
-        String wxEnterpriseId = loginUser.getWxEnterpriseId();
-        String enterpriseId = loginUser.getEnterpriseId();
         qdto.setEnterpriseId(enterpriseId);
         qdto.setWxEnterpriseId(wxEnterpriseId);
         qdto.setStatus(1);
@@ -453,6 +452,7 @@ public class GroupChatHmController {
                     ZipOutputStream out = new ZipOutputStream(new FileOutputStream(tempFile));
                     for (GroupChatHmDTO dto : dtoList) {
                         String qrCodeUrl = dto.getWxQrCode();
+                        logger.info("下载={}",qrCodeUrl);
                         if (StringUtils.isNotBlank(qrCodeUrl)) {
                             try {
                                 ZipEntry e = new ZipEntry(dto.getChatHmCode() + "_" + dto.getName() + ".png");
@@ -469,12 +469,14 @@ public class GroupChatHmController {
                         out.close();
                     } catch (IOException e) {
                     }
-                    CloudFileTypeEnum cloudFileTypeEnum = CloudFileTypeEnum.OTHER;
+                    /*CloudFileTypeEnum cloudFileTypeEnum = CloudFileTypeEnum.OTHER;
                     CloudFileInfo cloudFileInfo = CloudFileUtil.uploadFile(new FileInputStream(tempFile), "zip",
                             cloudFileTypeEnum, au.getEnterpriseDTO().getFactoryCode(),
-                            CloudFileBusinessOptEnum.HAOBAN_COMMON);
+                            CloudFileBusinessOptEnum.HAOBAN_COMMON);*/
+                    
+                    String url = FileUploadUtil.simpleUploadFileFromLocal(tempFile, fileName, BucketNameEnum.COMPRESS_60000.getName());
                     DownloadReportDTO downloadReportDTO = new DownloadReportDTO();
-                    downloadReportDTO.setDownloadUrl(cloudFileInfo.getOrgFileUrl());
+                    downloadReportDTO.setDownloadUrl("https://" + url);
                     downloadReportService.updateDownloadReport(reportId, downloadReportDTO);
                     tempFile.deleteOnExit();
                 } catch (Exception e) {

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

@@ -66,7 +66,7 @@ public class GroupChatPlanController {
     private StaffApiService staffApiService;
 
     @RequestMapping("add")
-    @GicLogRecord(value = "${#logValue}", category = GicLogRecordCategoryEnum.HB_QF, optType = GicLogRecordOptTypeEnum.HB_1000_01, userFunc = LogRecordUserServiceImpl.class, optPage = "客户群群发")
+    @GicLogRecord(value = "${#logValue}", category = GicLogRecordCategoryEnum.HB_QQF, optType = GicLogRecordOptTypeEnum.HB_1000_01, userFunc = LogRecordUserServiceImpl.class, optPage = "客户群群发")
     public RestResponse<Object> save(@RequestBody GroupChatPlanDTO dto) {
         if (StringUtils.isBlank(dto.getStaffIdList())) {
             GicLogRecordEvaluationContext.noWriteLog();
@@ -88,7 +88,7 @@ public class GroupChatPlanController {
     }
 
     @RequestMapping("del")
-    @GicLogRecord(value = "${#logValue}", category = GicLogRecordCategoryEnum.HB_QF, optType = GicLogRecordOptTypeEnum.HB_1000_04, userFunc = LogRecordUserServiceImpl.class, optPage = "客户群群发")
+    @GicLogRecord(value = "${#logValue}", category = GicLogRecordCategoryEnum.HB_QQF, optType = GicLogRecordOptTypeEnum.HB_1000_04, userFunc = LogRecordUserServiceImpl.class, optPage = "客户群群发")
     public RestResponse<Object> del(Long planId) {
         if (null == planId) {
             GicLogRecordEvaluationContext.noWriteLog();
@@ -117,7 +117,7 @@ public class GroupChatPlanController {
     * @throws
      */
     @RequestMapping("stop")
-    @GicLogRecord(value = "${#logValue}", category = GicLogRecordCategoryEnum.HB_QF, optType = GicLogRecordOptTypeEnum.HB_1000_03, userFunc = LogRecordUserServiceImpl.class, optPage = "客户群群发")
+    @GicLogRecord(value = "${#logValue}", category = GicLogRecordCategoryEnum.HB_QQF, optType = GicLogRecordOptTypeEnum.HB_1000_03, userFunc = LogRecordUserServiceImpl.class, optPage = "客户群群发")
     public RestResponse<Object> stop(Long planId) {
         if (null == planId) {
             GicLogRecordEvaluationContext.noWriteLog();
@@ -142,7 +142,7 @@ public class GroupChatPlanController {
     }
 
     @RequestMapping("update")
-    @GicLogRecord(value = "${#logValue}", category = GicLogRecordCategoryEnum.HB_QF, optType = GicLogRecordOptTypeEnum.HB_1000_02, userFunc = LogRecordUserServiceImpl.class, optPage = "客户群群发")
+    @GicLogRecord(value = "${#logValue}", category = GicLogRecordCategoryEnum.HB_QQF, optType = GicLogRecordOptTypeEnum.HB_1000_02, userFunc = LogRecordUserServiceImpl.class, optPage = "客户群群发")
     public RestResponse<Object> update(@RequestBody GroupChatPlanDTO dto) {
         logger.info("更新参数={}", JSON.toJSONString(dto));
         ServiceResponse<GroupChatPlanDTO> oldResp = this.groupChatPlanApiService.detail(dto.getPlanId());