Skip to content

H
haoban-manage3.0
Commit 86cc0acd by 徐高华
Options

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

Feature/社群

See merge request !841
parents 6ec1030f a4a73c0d
Showing with 21 additions and 24 deletions
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabQywxErrorLogMapper.java
......@@ -22,11 +22,6 @@ public interface TabQywxErrorLogMapper {
/**
* 分页列表
*
* @param qywxErrorLogListQDTO qdto qywx错误日志列表
* @return {@link List }<{@link TabQywxErrorLog }>
* @author mozhu
* @date 2022-04-18 16:55:23
*/
List<TabQywxErrorLog> queryListByPage(QywxErrorLogListQDTO qywxErrorLogListQDTO);
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/QywxErrorLogApiServiceImpl.java
......@@ -41,7 +41,7 @@ public class QywxErrorLogApiServiceImpl implements QywxErrorLogApiService {
@Override
public Page<QywxErrorLogDTO> queryListByPage(QywxErrorLogListQDTO qywxErrorLogListQDTO) {
qywxErrorLogListQDTO.setStartDate(DateUtil.format(DateUtil.beginOfDay(DateUtil.parse(qywxErrorLogListQDTO.getStartDate())), DatePattern.NORM_DATETIME_PATTERN));
qywxErrorLogListQDTO.setEndDate(DateUtil.format(DateUtil.beginOfDay(DateUtil.parse(qywxErrorLogListQDTO.getEndDate())), DatePattern.NORM_DATETIME_PATTERN));
qywxErrorLogListQDTO.setEndDate(DateUtil.format(DateUtil.endOfDay(DateUtil.parse(qywxErrorLogListQDTO.getEndDate())), DatePattern.NORM_DATETIME_PATTERN));
PageHelper.startPage(qywxErrorLogListQDTO.getPageNum(), qywxErrorLogListQDTO.getPageSize());
List<TabQywxErrorLog> list = this.tabQywxErrorLogService.queryListByPage(qywxErrorLogListQDTO);
return PageUtil.changePageHelperToCurrentPage(new PageInfo<>(list), QywxErrorLogDTO.class);
......
haoban-manage3-service/src/main/resources/jdbc-haoban-manage-service.xml
......@@ -12,7 +12,7 @@
<context:annotation-config />
<import resource="classpath*:applicationContext-db-only.xml"/>
<import resource="classpath*:applicationContext-db-only-with-emoji.xml"/>
<bean class="com.gic.haoban.common.init.HaobanSqlSessionFactoryBean" id="sqlSessionFactory">
<property name="dataSource" ref="dataSource" />
......
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());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment