feat: 欢迎语操作日志 动态切换

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/welcome/dto/WelcomeDetailDTO.java

@@ -35,6 +35,11 @@ public class WelcomeDetailDTO implements Serializable {
      * 默认欢迎语标记 1是 0否
      */
     private Integer defaultWelcomeFlag;
+
+    /**
+     * 欢迎语类型
+     */
+    private Integer type;
     /**
      * 适用部门列表
      */
@@ -120,6 +125,14 @@ public class WelcomeDetailDTO implements Serializable {
         this.defaultWelcomeFlag = defaultWelcomeFlag;
     }
 
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
     @Override
     public String toString() {
         return "WelcomeDetailDTO{" +

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

@@ -58,7 +58,8 @@ public interface HmGroupApiService {
     /**
      * 根据名称查询groupName
      * @param groupName
+     * @param enterpriseId
      * @return
      */
-    ServiceResponse<List<HmGroupDTO>> queryGroupListByName(String groupName);
+    ServiceResponse<List<HmGroupDTO>> queryGroupListByName(String enterpriseId, String groupName);
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/hm/TabHaobanHmGroupSettingMapper.java

@@ -37,8 +37,9 @@ public interface TabHaobanHmGroupSettingMapper {
     /**
      * 根据名称精确查询
      * @param groupName
+     * @param enterpriseId
      * @return
      */
-    List<TabHaobanHmGroupSetting> queryHmGroupSettingByName(@Param("groupName") String groupName);
+    List<TabHaobanHmGroupSetting> queryHmGroupSettingByName(@Param("enterpriseId") String enterpriseId, @Param("groupName") String groupName);
 
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/welcome/WelcomeDetailBO.java

@@ -21,6 +21,11 @@ public class WelcomeDetailBO {
      * 标题
      */
     private String title;
+
+    /**
+     * 欢迎语类型
+     */
+    private Integer type;
     /**
      * 内容
      */
@@ -118,6 +123,14 @@ public class WelcomeDetailBO {
         this.defaultWelcomeFlag = defaultWelcomeFlag;
     }
 
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
     @Override
     public String toString() {
         return "WelcomeDetailBO{" +

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

@@ -56,8 +56,9 @@ public interface HmGroupService {
     /**
      * 根据名称精确查询分组
      * @param groupName
+     * @param enterpriseId
      * @return
      */
-    List<HmGroupSettingBO> queryGroupSettingByName(String groupName);
+    List<HmGroupSettingBO> queryGroupSettingByName(String enterpriseId, String groupName);
 
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/HmGroupServiceImpl.java

@@ -136,8 +136,8 @@ public class HmGroupServiceImpl implements HmGroupService {
         }
     }
 
-    public List<HmGroupSettingBO> queryGroupSettingByName(String groupName){
-        List<TabHaobanHmGroupSetting> tabHaobanHmGroupSettings = haobanHmGroupSettingMapper.queryHmGroupSettingByName(groupName);
+    public List<HmGroupSettingBO> queryGroupSettingByName(String enterpriseId, String groupName){
+        List<TabHaobanHmGroupSetting> tabHaobanHmGroupSettings = haobanHmGroupSettingMapper.queryHmGroupSettingByName(enterpriseId, groupName);
         if (CollectionUtils.isEmpty(tabHaobanHmGroupSettings)){
             return Collections.emptyList();
         }

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

@@ -319,6 +319,7 @@ public class WelcomeServiceImpl implements WelcomeService {
         welcomeDetail.setWelcomeContent(welcome.getWelcomeContent());
         welcomeDetail.setOpenFlag(welcome.getOpenFlag());
         welcomeDetail.setDefaultWelcomeFlag(welcome.getDefaultWelcomeFlag());
+        welcomeDetail.setType(welcome.getType());
         // 媒体列表
         welcomeDetail.setWelcomeMediaList(
                 convertWelcomeMedia(welcomeMediaMapper.listByWelcomeId(welcome.getWelcomeId()))

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/WelcomeApiServiceImpl.java

@@ -131,6 +131,7 @@ public class WelcomeApiServiceImpl implements WelcomeApiService {
         dto.setWelcomeContent(welcome.getWelcomeContent());
         dto.setOpenFlag(welcome.getOpenFlag());
         dto.setDefaultWelcomeFlag(welcome.getDefaultWelcomeFlag());
+        dto.setType(welcome.getType());
         // 媒体列表
         dto.setWelcomeMediaList(
                 CollectionUtils.isEmpty(welcome.getWelcomeMediaList()) ? Collections.emptyList()

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/hm/HmGroupApiServiceImpl.java

@@ -61,7 +61,7 @@ public class HmGroupApiServiceImpl implements HmGroupApiService {
         if (StringUtils.equals(DEFAULT_GROUP_NAME, hmGroupDTO.getGroupName())) {
             return ServiceResponse.failure(HaoBanErrCodeCommon.ERR_9.getCode() + "", "分组名称不可使用默认分组名称");
         }
-        List<HmGroupSettingBO> groupSettingBos = groupService.queryGroupSettingByName(hmGroupDTO.getGroupName());
+        List<HmGroupSettingBO> groupSettingBos = groupService.queryGroupSettingByName(hmGroupDTO.getEnterpriseId(), hmGroupDTO.getGroupName());
         if (hmGroupDTO.getGroupId() == null) {
             // insert
             // check groupName unique
@@ -190,8 +190,8 @@ public class HmGroupApiServiceImpl implements HmGroupApiService {
      * @return
      */
     @Override
-    public ServiceResponse<List<HmGroupDTO>> queryGroupListByName(String groupName) {
-        List<HmGroupSettingBO> hmGroupSettingBos = groupService.queryGroupSettingByName(groupName);
+    public ServiceResponse<List<HmGroupDTO>> queryGroupListByName(String enterpriseId, String groupName) {
+        List<HmGroupSettingBO> hmGroupSettingBos = groupService.queryGroupSettingByName(enterpriseId, groupName);
         return ServiceResponse.success(EntityUtil.changeEntityListByOrika(HmGroupDTO.class, hmGroupSettingBos));
     }
 }

haoban-manage3-service/src/main/resources/mapper/hm/TabHaobanHmGroupSettingMapper.xml

@@ -209,6 +209,7 @@
         select <include refid="Base_Column_List"/>
         from tab_haoban_hm_group_setting
         where group_name = #{groupName}
+        and enterprise_id = #{enterpriseId}
         and `status` = 1
     </select>
 </mapper>
\ No newline at end of file

haoban-manage3-service/src/test/java/HmPageServiceTest.java

@@ -136,7 +136,7 @@ public class HmPageServiceTest {
 
     @Test
     public void groupNameCheckTest(){
-        ServiceResponse<List<HmGroupDTO>> ms = groupService.queryGroupListByName("MS");
+        ServiceResponse<List<HmGroupDTO>> ms = groupService.queryGroupListByName("ff8080815dacd3a2015dacd3ef5c0000", "测试006");
         System.out.println(JSON.toJSONString(ms));
     }
 

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

@@ -84,7 +84,7 @@ public class WelcomeController extends WebBaseController {
      * @author : YongEn
      * @date : 2022/2/11
      */
-    @GicLogRecord(value = "${#logContent}", category = GicLogRecordCategoryEnum.HUOMA, optType = GicLogRecordOptTypeEnum.WELCOME_ADD
+    @GicLogRecord(value = "${#logContent}", category = GicLogRecordCategoryEnum.HUOMA, optType = GicLogRecordOptTypeEnum.NORMAL_WELCOME_ADD
             ,optPage = "欢迎语设置-新建欢迎语", userFunc = LogRecordUserServiceImpl.class, afterFunc = LogRecordAfterServiceImpl.class)
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     public RestResponse<Boolean> saveWelcome(@RequestBody @Valid SaveWelcomeQO qo) {
@@ -108,26 +108,33 @@ public class WelcomeController extends WebBaseController {
         if (qo.getType() == null) {
             qdto.setType(HmWelcomeType.NORMAL.getCode());
         }
-        String logContent = "";
+        StringBuilder logContent = new StringBuilder();
+        if (StringUtils.isBlank(qdto.getWelcomeId())){
+            logContent.append("新增");
+        }else {
+            logContent.append("修改");
+        }
         if (HmWelcomeType.NORMAL.getCode().equals(qdto.getType())){
             GicLogRecordEvaluationContext.putAttribute(LogRecordAfterServiceImpl.WELCOME_TYPE, HmWelcomeType.NORMAL.getCode());
-            logContent = "新增普通欢迎语";
+            logContent.append("普通欢迎语");
         }else {
             GicLogRecordEvaluationContext.putAttribute(LogRecordAfterServiceImpl.WELCOME_TYPE, HmWelcomeType.SPECIAL.getCode());
-            logContent = "新增特殊欢迎语";
+            logContent.append("特殊欢迎语");
         }
         if (qdto.getWelcomeId() == null) {
-            logContent = logContent + "【" + qdto.getTitle() + "】";
+            logContent.append("【");
+            logContent.append(qdto.getTitle());
+            logContent.append("】");
             GicLogRecordEvaluationContext.putAttribute(LogRecordAfterServiceImpl.WELCOME_OPT, "add");
         } else {
             GicLogRecordEvaluationContext.putAttribute(LogRecordAfterServiceImpl.WELCOME_OPT, "edit");
             ServiceResponse<WelcomeDetailDTO> welcomeResult = welcomeApiService.getWelcome(qdto.getWelcomeId(), qdto.getWxEnterpriseId());
             if (welcomeResult.getResult() != null) {
                 WelcomeDetailDTO welcomeDetail = welcomeResult.getResult();
-                logContent = this.buildEditWelcomeOpLog(welcomeDetail, qdto);
+                logContent.append(this.buildEditWelcomeOpLog(welcomeDetail, qdto));
             }
         }
-        GicLogRecordEvaluationContext.putAttribute("logContent", logContent);
+        GicLogRecordEvaluationContext.putAttribute("logContent", logContent.toString());
         ServiceResponse<Boolean> response = welcomeApiService.saveWelcome(qdto);
         if (!response.isSuccess()){
             GicLogRecordEvaluationContext.noWriteLog();
@@ -171,8 +178,8 @@ public class WelcomeController extends WebBaseController {
      * @author : YongEn
      * @date : 2022/2/11
      */
-    @GicLogRecord(value = "${#logContent}", category = GicLogRecordCategoryEnum.HUOMA, optType = GicLogRecordOptTypeEnum.WELCOM_DEL
-            ,optPage = "欢迎语设置-特殊欢迎语", userFunc = LogRecordUserServiceImpl.class )
+    @GicLogRecord(value = "${#logContent}", category = GicLogRecordCategoryEnum.HUOMA, optType = GicLogRecordOptTypeEnum.NORMAL_WELCOME_DEL
+            ,optPage = "欢迎语设置-特殊欢迎语", userFunc = LogRecordUserServiceImpl.class, afterFunc = LogRecordAfterServiceImpl.class)
     @RequestMapping(value = "/remove")
     public RestResponse<?> removeWelcome(@RequestParam("welcomeId") String welcomeId) {
         if (StringUtils.isEmpty(welcomeId)) {
@@ -181,10 +188,13 @@ public class WelcomeController extends WebBaseController {
         String logContent = "删除新增特殊欢迎语";
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         ServiceResponse<WelcomeDetailDTO> serviceWelcome = welcomeApiService.getWelcome(welcomeId, loginUser.getEnterpriseId());
+        Integer welcomeType = HmWelcomeType.NORMAL.getCode();
         if (serviceWelcome.isSuccess() && serviceWelcome.getResult() != null){
             String title = serviceWelcome.getResult().getTitle();
+            welcomeType = serviceWelcome.getResult().getType();
             logContent = logContent + "【" + title + "】";
         }
+        GicLogRecordEvaluationContext.putAttribute("welcome_del_type", welcomeType);
         GicLogRecordEvaluationContext.putAttribute("logContent", logContent);
         ServiceResponse<WelcomeRemoveCheckDTO> serviceResponse = welcomeApiService.removeWelcomeWithErrorInfo(welcomeId);
         if (serviceResponse.getResult() != null) {

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

@@ -138,10 +138,11 @@ public class HmGroupController extends WebBaseController {
 
     @RequestMapping(path = "/check/name")
     public RestResponse<?> checkGroupName(HmGroupSettingVO groupSettingVO){
+        WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         if (StringUtils.isBlank(groupSettingVO.getGroupName())){
             return RestResponse.successResult(Collections.emptyList());
         }
-        ServiceResponse<List<HmGroupDTO>> serviceResponse = groupApiService.queryGroupListByName(groupSettingVO.getGroupName());
+        ServiceResponse<List<HmGroupDTO>> serviceResponse = groupApiService.queryGroupListByName(loginUser.getEnterpriseId(), groupSettingVO.getGroupName());
         if (serviceResponse.isSuccess()){
             return RestResponse.successResult(serviceResponse.getResult());
         }

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/log/LogRecordAfterServiceImpl.java

 package com.gic.haoban.manage.web.log;
 
+import com.gic.haoban.manage.api.enums.hm.HmWelcomeType;
 import com.gic.log.record.bean.GicLogRecordBean;
 import com.gic.log.record.service.LogRecordAfterService;
 import com.gic.log.record.util.GicLogRecordEvaluationContext;
@@ -22,13 +23,34 @@ public class LogRecordAfterServiceImpl extends LogRecordAfterService {
     @Override
     public void deal(GicLogRecordBean gicLogRecordBean) {
         String value = GicLogRecordEvaluationContext.getAttribute(WELCOME_OPT, String.class);
+        Integer welcomeType = GicLogRecordEvaluationContext.getAttribute(WELCOME_TYPE, Integer.class);
+
+        Integer welcomeDelType = GicLogRecordEvaluationContext.getAttribute("welcome_del_type", Integer.class);
+
         if ("add".equals(value)){
-            // 新建普通欢迎语
-            this.changeLogRecordOptType(gicLogRecordBean, GicLogRecordOptTypeEnum.WELCOME_ADD);
+            // 新建欢迎语
+            if (HmWelcomeType.NORMAL.getCode().equals(welcomeType)){
+                this.changeLogRecordOptType(gicLogRecordBean, GicLogRecordOptTypeEnum.NORMAL_WELCOME_ADD);
+            }else {
+                this.changeLogRecordOptType(gicLogRecordBean, GicLogRecordOptTypeEnum.SPECIAL_WELCOME_ADD);
+            }
         }
         if (StringUtils.equals("edit", value)){
-            // 编辑普通欢迎语
-            this.changeLogRecordOptType(gicLogRecordBean, GicLogRecordOptTypeEnum.WELCOM_UPDATE);
+            // 修改欢迎语
+            if (HmWelcomeType.NORMAL.getCode().equals(welcomeType)){
+                this.changeLogRecordOptType(gicLogRecordBean, GicLogRecordOptTypeEnum.NORMAL_WELCOME_UPDATE);
+            }else {
+                this.changeLogRecordOptType(gicLogRecordBean, GicLogRecordOptTypeEnum.SPECIAL_WELCOM_UPDATE);
+            }
+        }
+
+        if (welcomeDelType != null) {
+            // 删除欢迎语
+            if (HmWelcomeType.NORMAL.getCode().equals(welcomeDelType)) {
+                this.changeLogRecordOptType(gicLogRecordBean, GicLogRecordOptTypeEnum.NORMAL_WELCOME_DEL);
+            }else {
+                this.changeLogRecordOptType(gicLogRecordBean, GicLogRecordOptTypeEnum.SPECIAL_WELCOM_DEL);
+            }
         }
     }