feat: 各步骤操作日志

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

@@ -45,4 +45,11 @@ public interface HmGroupApiService {
      * @return
      */
     ServiceResponse<Integer> queryGroupTotalReferCount(String enterpriseId, String wxEnterpriseId);
+
+    /**
+     * 查询单个分组信息
+     * @param groupId
+     * @return
+     */
+    ServiceResponse<HmGroupDTO> queryGroupDetail(Long groupId);
 }
\ No newline at end of file

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.haoban.base.api.common.errCode.HaoBanErrCodeCommon;
+import com.gic.haoban.common.utils.EntityUtil;
 import com.gic.haoban.common.utils.PageUtil;
 import com.gic.haoban.manage.api.dto.hm.HmGroupDTO;
 import com.gic.haoban.manage.api.dto.hm.HmGroupQueryDTO;
@@ -150,4 +151,17 @@ public class HmGroupApiServiceImpl implements HmGroupApiService {
         Integer referCount = groupService.queryGroupTotalReferCount(enterpriseId, wxEnterpriseId);
         return ServiceResponse.success(referCount);
     }
+
+    /**
+     * 查询单个分组信息
+     *
+     * @param groupId
+     * @return
+     */
+    @Override
+    public ServiceResponse<HmGroupDTO> queryGroupDetail(Long groupId) {
+        HmGroupSettingBO groupSettingBO = groupService.queryGroupSettingDetail(groupId);
+        HmGroupDTO groupDTO = EntityUtil.changeEntityByOrika(HmGroupDTO.class, groupSettingBO);
+        return ServiceResponse.success(groupDTO);
+    }
 }

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

 package com.gic.haoban.manage.service.service.out.impl.hm;
 
+import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.haoban.base.api.common.errCode.HaoBanErrCodeCommon;
@@ -68,7 +69,7 @@ public class HmPageApiServiceImpl implements HmPageApiService {
     @Override
     @Transactional(rollbackFor = RuntimeException.class)
     public ServiceResponse<Boolean> deleteHmPage(HmPageDTO pageDTO) {
-
+        log.info("[deleteHmPage] 删除落地页模板, params:{}", JSON.toJSONString(pageDTO));
         HmPageBO pageBo = haobanHmPageService.queryHmPageDetail(pageDTO.getPageId());
         if (Objects.isNull(pageBo) || !Objects.equals(HmPageStatus.ENABLE.getCode(), pageBo.getStatus())) {
             return ServiceResponse.failure(HaoBanErrCodeCommon.ERR_8.getCode() + "", HaoBanErrCodeCommon.ERR_8.getMsg());

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

@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.Optional;
 
 /**
  * @Author MUSI
@@ -45,6 +46,7 @@ public class HmGroupController extends WebBaseController {
         hmGroupDTO.setWxEnterpriseId(loginUser.getWxEnterpriseId());
         ServiceResponse<Long> serviceResponse = groupApiService.saveOrUpdateHmGroupSetting(hmGroupDTO);
         if (serviceResponse.isSuccess()){
+            String logContent = "新增分组【" + hmGroupDTO.getGroupName() + "】";
             return RestResponse.successResult(serviceResponse.getResult());
         }
         return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
@@ -76,8 +78,13 @@ public class HmGroupController extends WebBaseController {
         hmGroupDTO.setGroupId(hmGroupSettingVO.getGroupId());
         hmGroupDTO.setEnterpriseId(loginUser.getEnterpriseId());
         hmGroupDTO.setWxEnterpriseId(loginUser.getWxEnterpriseId());
+
+        ServiceResponse<HmGroupDTO> queryGroupDetail = groupApiService.queryGroupDetail(hmGroupDTO.getGroupId());
+
         ServiceResponse<Long> serviceResponse = groupApiService.saveOrUpdateHmGroupSetting(hmGroupDTO);
         if (serviceResponse.isSuccess()){
+            String oldGroupName = Optional.ofNullable(queryGroupDetail.getResult()).map(HmGroupDTO::getGroupName).orElse("");
+            String logContent = "修改分组【" + hmGroupDTO.getGroupName() + "】：分组名称「 " + oldGroupName + "」变更为「 " + hmGroupDTO.getGroupName() + "」";
             return RestResponse.successResult(serviceResponse.getResult());
         }
         return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
@@ -93,8 +100,11 @@ public class HmGroupController extends WebBaseController {
         hmGroupDTO.setModifierId(loginUser.getClerkId());
         hmGroupDTO.setModifierName(loginUser.getClerkName());
         hmGroupDTO.setGroupId(hmGroupSettingVO.getGroupId());
+
+        ServiceResponse<HmGroupDTO> queryGroupDetail = groupApiService.queryGroupDetail(hmGroupDTO.getGroupId());
         ServiceResponse<Boolean> serviceResponse = groupApiService.deleteGroupSetting(hmGroupDTO);
         if (serviceResponse.isSuccess()){
+            String logContent = "删除分组【" + queryGroupDetail.getResult().getGroupName()+ "】";
             return RestResponse.successResult(serviceResponse.getResult());
         }
         return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());

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

@@ -7,6 +7,7 @@ import com.gic.haoban.base.api.common.PageResult2;
 import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
 import com.gic.haoban.common.utils.AuthWebRequestUtil;
 import com.gic.haoban.common.utils.PageUtil;
+import com.gic.haoban.manage.api.dto.qdto.hm.HmPageQDTO;
 import com.gic.haoban.manage.api.dto.qdto.hm.HmPageRelationQDTO;
 import com.gic.haoban.manage.api.dto.hm.HmPageRelationDTO;
 import com.gic.haoban.manage.api.dto.hm.HmPageDTO;
@@ -15,6 +16,7 @@ import com.gic.haoban.manage.web.vo.hm.HmPageInfoVO;
 import com.gic.haoban.manage.web.vo.hm.HmPageListVO;
 import com.gic.haoban.manage.web.vo.hm.HmPageSettingReq;
 import com.gic.haoban.manage.web.vo.hm.PageRelationVO;
+import com.gic.log.record.anno.GicLogRecord;
 import com.gic.log.record.util.GicLogRecordEvaluationContext;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -133,7 +135,7 @@ public class HmPageController {
     public RestResponse<?> queryPageList(HmPageListVO pageListVO){
 
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
-        com.gic.haoban.manage.api.dto.qdto.hm.HmPageQDTO hmPageQDTO = new com.gic.haoban.manage.api.dto.qdto.hm.HmPageQDTO();
+        HmPageQDTO hmPageQDTO = new HmPageQDTO();
         hmPageQDTO.setPageNum(pageListVO.getPageNum());
         hmPageQDTO.setPageSize(pageListVO.getPageSize());
         hmPageQDTO.setEnterpriseId(loginUser.getEnterpriseId());
@@ -156,14 +158,18 @@ public class HmPageController {
     }
 
     @RequestMapping(path = "/page/delete")
-    public RestResponse<?> deletePage(Long pageId){
+    public RestResponse<?> deletePage(Long templateId){
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         HmPageDTO hmPageDTO = new HmPageDTO();
-        hmPageDTO.setPageId(pageId);
+        hmPageDTO.setPageId(templateId);
         hmPageDTO.setModifierId(loginUser.getClerkId());
         hmPageDTO.setModifierName(loginUser.getClerkName());
+
+        ServiceResponse<HmPageDTO> queryPageDetail = pageApiService.queryPageDetail(templateId);
         ServiceResponse<Boolean> serviceResponse = pageApiService.deleteHmPage(hmPageDTO);
         if (serviceResponse.isSuccess()){
+            String logContent = "删除落地页模板【" + queryPageDetail.getResult().getPageTitle() + "-" + queryPageDetail.getResult().getPageName()+"】";
+
             return RestResponse.successResult(serviceResponse.getResult());
         }
         return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/hm/HmPageListVO.java

 package com.gic.haoban.manage.web.vo.hm;
 
 import com.gic.haoban.base.api.common.BasePageInfo;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -14,8 +15,10 @@ public class HmPageListVO extends BasePageInfo {
 
     private String pageSearchText;
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date startTime;
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date endTime;
 
     public String getPageSearchText() {