feat: 日志格式调整

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

@@ -152,7 +152,7 @@ public class WelcomeController extends WebBaseController {
                 .append(welcomeDetail.getWelcomeContent())
                 .append("」更改为「")
                 .append(qdto.getWelcomeContent())
-                .append("」，附件「");
+                .append("」");
         List<String> oldMedia = new ArrayList<>();
         for (WelcomeMediaDTO welcomeMediaDTO : welcomeDetail.getWelcomeMediaList()) {
             oldMedia.add(WelcomeMediaTypeEnum.getDescByCode(welcomeMediaDTO.getMediaType()) + "-" + welcomeMediaDTO.getMediaTitle());
@@ -163,10 +163,13 @@ public class WelcomeController extends WebBaseController {
                 newMedia.add(WelcomeMediaTypeEnum.getDescByCode(saveWelcomeMediaQDTO.getMediaType()) + "-" + saveWelcomeMediaQDTO.getMediaTitle());
             }
         }
-        stringBuilder.append(StringUtils.join(oldMedia, "、"))
-                .append("」变更为「")
-                .append(StringUtils.join(newMedia, "、"))
-                .append("」");
+        if (CollectionUtils.isNotEmpty(oldMedia) || CollectionUtils.isNotEmpty(newMedia)) {
+            stringBuilder.append("，附件「");
+            stringBuilder.append(StringUtils.join(oldMedia, "、"))
+                    .append("」变更为「")
+                    .append(StringUtils.join(newMedia, "、"))
+                    .append("」");
+        }
         return stringBuilder.toString();
     }
 
@@ -185,24 +188,39 @@ public class WelcomeController extends WebBaseController {
         if (StringUtils.isEmpty(welcomeId)) {
             return RestResponse.failure(Constant.STRING_1, "欢迎语id为空", Boolean.FALSE);
         }
-        String logContent = "删除新增特殊欢迎语";
+        // 构建操作日志
+        this.buildDelWelComeOpLog(welcomeId);
+        ServiceResponse<WelcomeRemoveCheckDTO> serviceResponse = welcomeApiService.removeWelcomeWithErrorInfo(welcomeId);
+        if (serviceResponse.getResult() != null) {
+            // can't remove
+            GicLogRecordEvaluationContext.noWriteLog();
+            return RestResponse.failure(HaoBanErrCode.ERR_9.getCode() + "", this.buildErrorMessage(serviceResponse.getResult()));
+        }
+        return RestResponse.successResult();
+    }
+
+    private void buildDelWelComeOpLog(String welcomeId) {
+        String logContent = "删除";
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         ServiceResponse<WelcomeDetailDTO> serviceWelcome = welcomeApiService.getWelcome(welcomeId, loginUser.getEnterpriseId());
         Integer welcomeType = HmWelcomeType.NORMAL.getCode();
+        String oldWelcomeTitle = "";
         if (serviceWelcome.isSuccess() && serviceWelcome.getResult() != null){
             String title = serviceWelcome.getResult().getTitle();
             welcomeType = serviceWelcome.getResult().getType();
-            logContent = logContent + "【" + title + "】";
+            if (HmWelcomeType.NORMAL.getCode().equals(welcomeType)){
+                logContent += "普通";
+            }else if (HmWelcomeType.SPECIAL.getCode().equals(welcomeType)){
+                logContent += "特殊";
+            }
+            oldWelcomeTitle = title;
+        }
+        logContent += "欢迎语";
+        if (StringUtils.isNotBlank(oldWelcomeTitle)){
+            logContent = logContent + "【" + oldWelcomeTitle + "】";
         }
         GicLogRecordEvaluationContext.putAttribute("welcome_del_type", welcomeType);
         GicLogRecordEvaluationContext.putAttribute("logContent", logContent);
-        ServiceResponse<WelcomeRemoveCheckDTO> serviceResponse = welcomeApiService.removeWelcomeWithErrorInfo(welcomeId);
-        if (serviceResponse.getResult() != null) {
-            // can't remove
-            GicLogRecordEvaluationContext.noWriteLog();
-            return RestResponse.failure(HaoBanErrCode.ERR_9.getCode() + "", this.buildErrorMessage(serviceResponse.getResult()));
-        }
-        return RestResponse.successResult();
     }
 
     private String buildErrorMessage(WelcomeRemoveCheckDTO welcomeRemoveCheckDTO) {