Skip to content

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

Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into developer

parents 1c7e2b9c 6123a15e
Showing with 215 additions and 144 deletions
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/dao/mapper/TabHaobanWelcomeTemplateRelationMapper.java
......@@ -26,7 +26,7 @@ public interface TabHaobanWelcomeTemplateRelationMapper {
*/
List<TabHaobanWelcomeTemplateRelation> queryWelcomeTemplate(WelcomeRelationQO welcomeRelationQO);
TabHaobanWelcomeTemplateRelation queryWelTemplateRelation(@Param("welcomeId") String welcomeId,
List<TabHaobanWelcomeTemplateRelation> queryWelTemplateRelation(@Param("welcomeId") String welcomeId,
@Param("referId") String referId,
@Param("status") Integer status);
}
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/qo/HmPageRelationQO.java
......@@ -26,6 +26,11 @@ public class HmPageRelationQO extends BasePageInfo {
*/
private String wxEnterpriseId;
/**
* 引用方id
*/
private String referId;
public String getPageCode() {
return pageCode;
}
......@@ -65,4 +70,12 @@ public class HmPageRelationQO extends BasePageInfo {
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public String getReferId() {
return referId;
}
public void setReferId(String referId) {
this.referId = referId;
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/HmPageRelationService.java
......@@ -19,11 +19,14 @@ public interface HmPageRelationService {
* 保存活码 与落地页的引用关系
*
* @param hmPageRelationBO
*
* @return true 保存成功
*/
boolean savePageRelation(HmPageRelationBO hmPageRelationBO);
/**
* 更新 落地页关联状态
* referId pageId
*
* @param hmPageRelationBO
* @return
......@@ -46,7 +49,7 @@ public interface HmPageRelationService {
Page<HmPageRelationBO> queryPageRelationWithSearchText(HmPageRelationQO hmPageRelationQo);
/**
* 统计templateCode 被引用的总数
* 统计pageCode 被引用的总数
* @param pageCode
* @return
*/
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/HmWelComeService.java deleted 100644 → 0
package com.gic.haoban.manage.service.service.hm;
import com.gic.haoban.manage.service.pojo.bo.hm.HmWelcomeRelationBO;
import com.gic.haoban.manage.service.pojo.bo.welcome.WelcomeDetailBO;
/**
* @Author MUSI
* @Date 2022/7/1 6:00 PM
* @Description 活码欢迎语相关
* @Version
**/
public interface HmWelComeService {
/**
* 根据 关联方的code 获取关联的欢迎语
* @param referId
* @return
*/
WelcomeDetailBO queryHmWelcomeWithReferId(String referId);
/**
* 保存欢迎语引用关联关系
* @param hmWelcomeRelationBO
* @return
*/
Boolean saveHmWelcomeRelation(HmWelcomeRelationBO hmWelcomeRelationBO);
/**
* 修改关联关系状态
*
* @param referId
* @param status
*
* @see com.gic.haoban.manage.api.enums.WelcomeRelationStatusEnum
* @return
*/
Boolean updateWelcomeRelationStatus(String referId, Integer status);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/WelcomeRelationService.java
......@@ -2,6 +2,7 @@ package com.gic.haoban.manage.service.service.hm;
import com.gic.api.base.commons.Page;
import com.gic.haoban.manage.service.pojo.bo.hm.HmWelcomeRelationBO;
import com.gic.haoban.manage.service.pojo.bo.welcome.WelcomeDetailBO;
import com.gic.haoban.manage.service.pojo.qo.WelcomeRelationQO;
import java.util.List;
......@@ -35,4 +36,28 @@ public interface WelcomeRelationService {
* @return
*/
Page<HmWelcomeRelationBO> queryWelcomeRelationPage(WelcomeRelationQO welcomeRelationQo);
/**
* 根据 关联方的code 获取关联的欢迎语
* @param referId
* @return
*/
WelcomeDetailBO queryHmWelcomeWithReferId(String referId);
/**
* 保存欢迎语引用关联关系
* @param hmWelcomeRelationBO
* @return
*/
Boolean saveHmWelcomeRelation(HmWelcomeRelationBO hmWelcomeRelationBO);
/**
* 修改关联关系状态
*
* @param hmWelcomeRelationBO
*
* @see com.gic.haoban.manage.api.enums.WelcomeRelationStatusEnum
* @return
*/
Boolean updateWelcomeRelationStatus(HmWelcomeRelationBO hmWelcomeRelationBO);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/HmPageRelationServiceImpl.java
......@@ -10,6 +10,7 @@ import com.gic.haoban.manage.service.pojo.bo.hm.HmPageRelationBO;
import com.gic.haoban.manage.service.pojo.qo.HmPageRelationQO;
import com.gic.haoban.manage.service.service.hm.HmPageRelationService;
import com.github.pagehelper.PageHelper;
import org.apache.commons.collections.CollectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
......@@ -41,7 +42,7 @@ public class HmPageRelationServiceImpl implements HmPageRelationService {
public boolean savePageRelation(HmPageRelationBO hmPageRelationBO) {
TabHaobanHmPageRelation pageRelation = new TabHaobanHmPageRelation();
pageRelation.setEnterpriseId(hmPageRelationBO.getEnterpriseId());
pageRelation.setWxEnterpriseId(pageRelation.getWxEnterpriseId());
pageRelation.setWxEnterpriseId(hmPageRelationBO.getWxEnterpriseId());
pageRelation.setPageCode(hmPageRelationBO.getPageCode());
pageRelation.setReferId(hmPageRelationBO.getReferId());
pageRelation.setReferName(hmPageRelationBO.getReferName());
......@@ -54,7 +55,21 @@ public class HmPageRelationServiceImpl implements HmPageRelationService {
@Override
public boolean updateRelationStatus(HmPageRelationBO hmPageRelationBO) {
return false;
// 移除该referId之前的引用
Date now = new Date();
HmPageRelationQO pageRelationQo = new HmPageRelationQO();
pageRelationQo.setStatus(HmPageStatus.ENABLE.getCode());
pageRelationQo.setReferId(hmPageRelationBO.getReferId());
List<TabHaobanHmPageRelation> tabHaobanHmPageRelations = haobanHmPageRelationMapper.queryPageRelationList(pageRelationQo);
if (CollectionUtils.isNotEmpty(tabHaobanHmPageRelations)){
for (TabHaobanHmPageRelation tabHaobanHmPageRelation : tabHaobanHmPageRelations) {
tabHaobanHmPageRelation.setStatus(HmPageStatus.DISABLE.getCode());
tabHaobanHmPageRelation.setUpdateTime(now);
haobanHmPageRelationMapper.updateByPrimaryKey(tabHaobanHmPageRelation);
}
}
// insert new relation
return this.savePageRelation(hmPageRelationBO);
}
@Override
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/HmWelComeServiceImpl.java deleted 100644 → 0
package com.gic.haoban.manage.service.service.hm.impl;
import com.gic.commons.util.UniqueIdUtils;
import com.gic.haoban.manage.api.enums.WelcomeRelationStatusEnum;
import com.gic.haoban.manage.service.dao.mapper.TabHaobanWelcomeTemplateRelationMapper;
import com.gic.haoban.manage.service.entity.hm.TabHaobanWelcomeTemplateRelation;
import com.gic.haoban.manage.service.pojo.bo.hm.HmWelcomeRelationBO;
import com.gic.haoban.manage.service.pojo.bo.welcome.WelcomeDetailBO;
import com.gic.haoban.manage.service.service.WelcomeService;
import com.gic.haoban.manage.service.service.hm.HmWelComeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
/**
* @Author MUSI
* @Date 2022/7/4 1:06 PM
* @Description
* @Version
**/
@Component
public class HmWelComeServiceImpl implements HmWelComeService {
@Autowired
private TabHaobanWelcomeTemplateRelationMapper welcomeTemplateRelationMapper;
@Autowired
private WelcomeService welcomeService;
/**
* 根据 关联方的code 获取关联的欢迎语
*
* @param referId
* @return
*/
@Override
public WelcomeDetailBO queryHmWelcomeWithReferId(String referId) {
TabHaobanWelcomeTemplateRelation welcomeTemplateRelation = welcomeTemplateRelationMapper.queryWelTemplateRelation(null, referId, WelcomeRelationStatusEnum.ENABLE.getCode());
if (welcomeTemplateRelation == null) {
return null;
}
return welcomeService.getWelcome(welcomeTemplateRelation.getWelcomeId(), welcomeTemplateRelation.getEnterpriseId());
}
/**
* 保存欢迎语引用关联关系
*
* @param hmWelcomeRelationBO
* @return
*/
@Override
@Transactional(rollbackFor = RuntimeException.class)
public Boolean saveHmWelcomeRelation(HmWelcomeRelationBO hmWelcomeRelationBO) {
TabHaobanWelcomeTemplateRelation welcomeTemplateRelation = new TabHaobanWelcomeTemplateRelation();
welcomeTemplateRelation.setRelationId(UniqueIdUtils.uniqueLong());
welcomeTemplateRelation.setEnterpriseId(hmWelcomeRelationBO.getEnterpriseId());
welcomeTemplateRelation.setWxEnterpriseId(hmWelcomeRelationBO.getWxEnterpriseId());
welcomeTemplateRelation.setWelcomeId(hmWelcomeRelationBO.getWelcomeId());
welcomeTemplateRelation.setReferId(hmWelcomeRelationBO.getReferId());
welcomeTemplateRelation.setReferName(hmWelcomeRelationBO.getReferName());
welcomeTemplateRelation.setType(hmWelcomeRelationBO.getType());
welcomeTemplateRelation.setStatus(WelcomeRelationStatusEnum.ENABLE.getCode());
welcomeTemplateRelation.setCreateTime(new Date());
welcomeTemplateRelation.setUpdateTime(new Date());
welcomeTemplateRelationMapper.insertSelective(welcomeTemplateRelation);
return Boolean.TRUE;
}
/**
* 删除关联关系
* 此处事务 为了事务传播
*
* @param referId
* @return
*/
@Override
@Transactional(rollbackFor = RuntimeException.class)
public Boolean updateWelcomeRelationStatus(String referId, Integer status) {
TabHaobanWelcomeTemplateRelation welcomeTemplateRelation = welcomeTemplateRelationMapper.queryWelTemplateRelation(null, referId, WelcomeRelationStatusEnum.ENABLE.getCode());
if (welcomeTemplateRelation == null) {
return Boolean.FALSE;
}
TabHaobanWelcomeTemplateRelation temp = new TabHaobanWelcomeTemplateRelation();
temp.setRelationId(welcomeTemplateRelation.getRelationId());
temp.setUpdateTime(new Date());
temp.setStatus(status);
welcomeTemplateRelationMapper.updateByPrimaryKeySelective(temp);
return Boolean.TRUE;
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/WelcomeRelationServiceImpl.java
package com.gic.haoban.manage.service.service.hm.impl;
import com.alibaba.fastjson.JSON;
import com.gic.api.base.commons.Page;
import com.gic.commons.util.UniqueIdUtils;
import com.gic.haoban.common.utils.EntityUtil;
import com.gic.haoban.common.utils.PageUtil;
import com.gic.haoban.manage.api.enums.WelcomeRelationStatusEnum;
import com.gic.haoban.manage.service.dao.mapper.TabHaobanWelcomeTemplateRelationMapper;
import com.gic.haoban.manage.service.entity.hm.TabHaobanWelcomeTemplateRelation;
import com.gic.haoban.manage.service.pojo.bo.hm.HmWelcomeRelationBO;
import com.gic.haoban.manage.service.pojo.bo.welcome.WelcomeDetailBO;
import com.gic.haoban.manage.service.pojo.qo.WelcomeRelationQO;
import com.gic.haoban.manage.service.service.WelcomeService;
import com.gic.haoban.manage.service.service.hm.WelcomeRelationService;
import com.github.pagehelper.PageHelper;
import org.apache.commons.collections.CollectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
......@@ -26,9 +36,14 @@ import java.util.stream.Collectors;
@Component
public class WelcomeRelationServiceImpl implements WelcomeRelationService {
private static final Logger log = LoggerFactory.getLogger(WelcomeRelationServiceImpl.class);
@Autowired
private TabHaobanWelcomeTemplateRelationMapper welcomeTemplateRelationMapper;
@Autowired
private WelcomeService welcomeService;
/**
* 查询欢迎语关联关系
*
......@@ -38,13 +53,11 @@ public class WelcomeRelationServiceImpl implements WelcomeRelationService {
*/
@Override
public HmWelcomeRelationBO queryWelcomeRelation(String referId, Integer status) {
TabHaobanWelcomeTemplateRelation welcomeTemplateRelation = welcomeTemplateRelationMapper.queryWelTemplateRelation(null, referId, status);
if (welcomeTemplateRelation == null) {
List<TabHaobanWelcomeTemplateRelation> welcomeTemplateRelations = welcomeTemplateRelationMapper.queryWelTemplateRelation(null, referId, status);
if (CollectionUtils.isEmpty(welcomeTemplateRelations)) {
return null;
}
HmWelcomeRelationBO welcomeRelationBo = new HmWelcomeRelationBO();
BeanUtils.copyProperties(welcomeTemplateRelation, welcomeRelationBo);
return welcomeRelationBo;
return EntityUtil.changeEntityByOrika(HmWelcomeRelationBO.class, welcomeTemplateRelations.get(0));
}
/**
......@@ -80,4 +93,65 @@ public class WelcomeRelationServiceImpl implements WelcomeRelationService {
(com.github.pagehelper.Page<TabHaobanWelcomeTemplateRelation>) welcomeTemplateRelationMapper.queryWelcomeTemplate(welcomeRelationQo);
return PageUtil.changePageHelperToCurrentPage(tabHaobanWelcomeTemplateRelations, HmWelcomeRelationBO.class);
}
/**
* 根据 关联方的code 获取关联的欢迎语
*
* @param referId
* @return
*/
@Override
public WelcomeDetailBO queryHmWelcomeWithReferId(String referId) {
List<TabHaobanWelcomeTemplateRelation> welcomeTemplateRelations = welcomeTemplateRelationMapper.queryWelTemplateRelation(null, referId, WelcomeRelationStatusEnum.ENABLE.getCode());
if (CollectionUtils.isEmpty(welcomeTemplateRelations)) {
return null;
}
return welcomeService.getWelcome(welcomeTemplateRelations.get(0).getWelcomeId(), welcomeTemplateRelations.get(0).getEnterpriseId());
}
/**
* 保存欢迎语引用关联关系
*
* @param hmWelcomeRelationBO
* @return
*/
@Override
@Transactional(rollbackFor = RuntimeException.class)
public Boolean saveHmWelcomeRelation(HmWelcomeRelationBO hmWelcomeRelationBO) {
log.info("[saveHmWelcomeRelation] params:{}", JSON.toJSONString(hmWelcomeRelationBO));
TabHaobanWelcomeTemplateRelation welcomeTemplateRelation = new TabHaobanWelcomeTemplateRelation();
welcomeTemplateRelation.setRelationId(UniqueIdUtils.uniqueLong());
welcomeTemplateRelation.setEnterpriseId(hmWelcomeRelationBO.getEnterpriseId());
welcomeTemplateRelation.setWxEnterpriseId(hmWelcomeRelationBO.getWxEnterpriseId());
welcomeTemplateRelation.setWelcomeId(hmWelcomeRelationBO.getWelcomeId());
welcomeTemplateRelation.setReferId(hmWelcomeRelationBO.getReferId());
welcomeTemplateRelation.setReferName(hmWelcomeRelationBO.getReferName());
welcomeTemplateRelation.setType(hmWelcomeRelationBO.getType());
welcomeTemplateRelation.setStatus(WelcomeRelationStatusEnum.ENABLE.getCode());
welcomeTemplateRelation.setCreateTime(new Date());
welcomeTemplateRelation.setUpdateTime(new Date());
welcomeTemplateRelationMapper.insertSelective(welcomeTemplateRelation);
return Boolean.TRUE;
}
/**
* 删除关联关系
*
* @param hmWelcomeRelationBO
* @return
*/
@Override
@Transactional(rollbackFor = RuntimeException.class)
public Boolean updateWelcomeRelationStatus(HmWelcomeRelationBO hmWelcomeRelationBO) {
log.info("[updateWelcomeRelationStatus] params:{}", JSON.toJSONString(hmWelcomeRelationBO));
// 取消该referId已有的引用
List<TabHaobanWelcomeTemplateRelation> tabHaobanWelcomeTemplateRelations =
welcomeTemplateRelationMapper.queryWelTemplateRelation(null, hmWelcomeRelationBO.getReferId(), WelcomeRelationStatusEnum.ENABLE.getCode());
for (TabHaobanWelcomeTemplateRelation tabHaobanWelcomeTemplateRelation : tabHaobanWelcomeTemplateRelations) {
tabHaobanWelcomeTemplateRelation.setStatus(WelcomeRelationStatusEnum.DISABLE.getCode());
tabHaobanWelcomeTemplateRelation.setUpdateTime(new Date());
welcomeTemplateRelationMapper.updateByPrimaryKeySelective(tabHaobanWelcomeTemplateRelation);
}
return this.saveHmWelcomeRelation(hmWelcomeRelationBO);
}
}
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/log/LogRecordUserServiceImpl.java 0 → 100644
package com.gic.haoban.manage.web.log;
import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
import com.gic.haoban.common.utils.AuthWebRequestUtil;
import com.gic.log.record.bean.GicLogRecordUser;
import com.gic.log.record.service.LogRecordUserService;
import org.springframework.stereotype.Service;
/**
* 描述: LogRecordUserServiceImpl
*
* @author yujie
* @date 2022/1/22 15:17
*/
@Service
public class LogRecordUserServiceImpl extends LogRecordUserService {
@Override
public boolean isDefault() { //是否默认的用户获取类，如果设置了默认的 注解里的 userFunc的默认值就会变成这个获取用户信息
return true;
}
@Override
public GicLogRecordUser getUser() {
WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
return new GicLogRecordUser(loginUser.getClerkId(), loginUser.getClerkName(), loginUser.getClerkFullName(), loginUser.getEnterpriseId());
}
}
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() {
......
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