日志

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

@@ -76,6 +76,7 @@ public class GroupChatController {
     public RestResponse<Object> save(@RequestBody GroupChatSearchQDTO qdto) {
         List<Long> groupChatIdList = qdto.getGroupChatIdList();
         if (CollectionUtils.isEmpty(groupChatIdList)) {
+            GicLogRecordEvaluationContext.noWriteLog();
             return RestResponse.failure("1", "请选择认领的群");
         }
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
@@ -173,9 +174,11 @@ public class GroupChatController {
     @GicLogRecord(value = "${#logValue}", category = GicLogRecordCategoryEnum.HB_CHAT, optType = GicLogRecordOptTypeEnum.HB_1001_01, userFunc = LogRecordUserServiceImpl.class, optPage = "客户群列表")
     public RestResponse<Object> transfer(String staffId, String groupChatIdList) {
         if (StringUtils.isEmpty(staffId)) {
+            GicLogRecordEvaluationContext.noWriteLog();
             return RestResponse.failure("1", "请选择继承的群主");
         }
         if (StringUtils.isEmpty(groupChatIdList)) {
+            GicLogRecordEvaluationContext.noWriteLog();
             return RestResponse.failure("1", "请选择继承的群");
         }
         String[] arr = groupChatIdList.split(",");

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

@@ -22,7 +22,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.BasePageInfo;
 import com.gic.api.base.commons.JSONResponse;
 import com.gic.api.base.commons.Page;
@@ -39,12 +38,9 @@ import com.gic.haoban.common.utils.AuthWebRequestUtil;
 import com.gic.haoban.manage.api.dto.chat.GroupChatDTO;
 import com.gic.haoban.manage.api.dto.chat.GroupChatHmDTO;
 import com.gic.haoban.manage.api.dto.hm.HmLinkChatDTO;
-import com.gic.haoban.manage.api.dto.hm.HmLinkDTO;
-import com.gic.haoban.manage.api.dto.hm.HmLinkStoreSettingDTO;
 import com.gic.haoban.manage.api.dto.qdto.chat.ChatHmSearchQDTO;
 import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatSearchQDTO;
 import com.gic.haoban.manage.api.dto.qdto.hm.HmLinkChatQDTO;
-import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeDetailDTO;
 import com.gic.haoban.manage.api.service.chat.GroupChatApiService;
 import com.gic.haoban.manage.api.service.chat.GroupChatHmApiService;
 import com.gic.haoban.manage.web.log.LogRecordUserServiceImpl;
@@ -55,7 +51,6 @@ 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.member.tag.api.dto.MemberTagItemDTO;
 import com.gic.qcloud.BucketNameEnum;
 import com.gic.qcloud.FileUploadUtil;
 import com.gic.web.common.utils.DataPermissionExport;
@@ -99,6 +94,9 @@ public class GroupChatHmController {
         dto.setEnterpriseId(loginUser.getEnterpriseId());
         ServiceResponse<GroupChatHmDTO> resp = this.groupChatHmApiService.save(dto);
         if (resp.isSuccess()) {
+            String logContent = "新增群活码【" + dto.getChatHmCode() + "-" + dto.getName() + "】";
+            GicLogRecordEvaluationContext.putAttribute("logValue", logContent);
+            GicLogRecordEvaluationContext.putOptTargetId(AuthWebRequestUtil.getLoginUser().getClerkId());
             return RestResponse.successResult();
         }
         return RestResponse.failure("1", resp.getMessage());
@@ -244,7 +242,7 @@ public class GroupChatHmController {
      */
     @RequestMapping("discard")
     @GicLogRecord(value = "${#logValue}", category = GicLogRecordCategoryEnum.HB_QHM, optType = GicLogRecordOptTypeEnum.HB_1002_03, userFunc = LogRecordUserServiceImpl.class, optPage = "群活码")
-    public RestResponse<Object> discard(Long chatHmId) {
+    public RestResponse<Object> discard(Long chatHmId, @RequestParam(defaultValue = "0") int page) {
         if (null == chatHmId) {
             return RestResponse.failure("1", "群活码ID空");
         }
@@ -253,8 +251,13 @@ public class GroupChatHmController {
         String wxEnterpriseId = loginUser.getWxEnterpriseId();
         String clerkId = loginUser.getClerkId();
         String clerkName = loginUser.getClerkName();
+        ServiceResponse<GroupChatHmDTO> respDTO = this.groupChatHmApiService.detail(chatHmId);
         ServiceResponse<Void> resp = this.groupChatHmApiService.discard(chatHmId, wxEnterpriseId, clerkId, clerkName);
         if (resp.isSuccess()) {
+            String logContent = "废弃群活码【" + respDTO.getResult().getChatHmCode() + "-" + respDTO.getResult().getName()
+                    + "】";
+            GicLogRecordEvaluationContext.putAttribute("logValue", logContent);
+            GicLogRecordEvaluationContext.putOptTargetId(AuthWebRequestUtil.getLoginUser().getClerkId());
             return RestResponse.successResult();
         }
         return RestResponse.failure("1", resp.getMessage());