Skip to content

H
haoban-manage3.0
Commit b2dc2714 by songyinghui
Options

feat: long 类型js失真问题

parent 7a611915
Showing with 129 additions and 6 deletions
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/WelcomeMediaTypeEnum.java
......@@ -36,4 +36,13 @@ public enum WelcomeMediaTypeEnum implements Serializable {
public String getDesc() {
return desc;
}
public static String getDescByCode(Integer code){
for (WelcomeMediaTypeEnum welcomeMediaTypeEnum : values()) {
if (welcomeMediaTypeEnum.getCode().equals(code)){
return welcomeMediaTypeEnum.getDesc();
}
}
return "";
}
}
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/config/LongHttpMessageConverter.java 0 → 100644
package com.gic.haoban.manage.web.config;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.module.SimpleModule;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
/**
* Created 2021/12/23.
*
* @author hua
*/
public class LongHttpMessageConverter extends MappingJackson2HttpMessageConverter {
public LongHttpMessageConverter() {
super();
//修复：前端js 精度问题
ObjectMapper objectMapper = getObjectMapper();
SimpleModule simpleModule = new SimpleModule();
simpleModule.addSerializer(Long.class, ToStringSerializer.instance);
simpleModule.addSerializer(Long.TYPE, ToStringSerializer.instance);
objectMapper.registerModule(simpleModule);
setObjectMapper(objectMapper);
}
}
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WelcomeController.java
......@@ -13,12 +13,14 @@ import com.gic.haoban.manage.api.dto.hm.HmWelcomeRelationDTO;
import com.gic.haoban.manage.api.dto.welcome.dto.FriendSettingDetailDTO;
import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeDetailDTO;
import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeListDTO;
import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeMediaDTO;
import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeRemoveCheckDTO;
import com.gic.haoban.manage.api.dto.welcome.qdto.QueryWelcomeQDTO;
import com.gic.haoban.manage.api.dto.welcome.qdto.QueryWelcomeRelationQDTO;
import com.gic.haoban.manage.api.dto.welcome.qdto.SaveFriendSettingQDTO;
import com.gic.haoban.manage.api.dto.welcome.qdto.SaveWelcomeMediaQDTO;
import com.gic.haoban.manage.api.dto.welcome.qdto.SaveWelcomeQDTO;
import com.gic.haoban.manage.api.enums.WelcomeMediaTypeEnum;
import com.gic.haoban.manage.api.enums.hm.HmWelcomeType;
import com.gic.haoban.manage.api.service.hm.HmWelcomeRelationApiService;
import com.gic.haoban.manage.api.service.out.WelcomeApiService;
......@@ -26,6 +28,7 @@ import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
import com.gic.haoban.manage.web.qo.welcome.ListWelcomeQO;
import com.gic.haoban.manage.web.qo.welcome.SaveFriendSettingQO;
import com.gic.haoban.manage.web.qo.welcome.SaveWelcomeQO;
import com.gic.log.record.util.GicLogRecordEvaluationContext;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
......@@ -35,6 +38,7 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.validation.Valid;
import java.util.ArrayList;
import java.util.List;
/**
......@@ -98,10 +102,48 @@ public class WelcomeController extends WebBaseController {
if (qo.getType() == null) {
qdto.setType(HmWelcomeType.NORMAL.getCode());
}
String logContent = "";
if (qdto.getWelcomeId() == null) {
logContent = "新增特殊欢迎语【" + qdto.getTitle() + "】";
} else {
ServiceResponse<WelcomeDetailDTO> welcomeResult = welcomeApiService.getWelcome(qdto.getWelcomeId(), qdto.getWxEnterpriseId());
if (welcomeResult.getResult() != null) {
//
WelcomeDetailDTO welcomeDetail = welcomeResult.getResult();
logContent = this.buildEditWelcomeOpLog(welcomeDetail, qdto);
}
}
GicLogRecordEvaluationContext.putAttribute("name", logContent);
ServiceResponse<Boolean> response = welcomeApiService.saveWelcome(qdto);
return RestResponse.successResult(response.getResult());
}
private String buildEditWelcomeOpLog(WelcomeDetailDTO welcomeDetail, SaveWelcomeQDTO qdto) {
StringBuilder stringBuilder = new StringBuilder();
stringBuilder.append("编辑特殊欢迎语：欢迎语标题「")
.append(welcomeDetail.getTitle())
.append("」变更为「 ")
.append(qdto.getTitle())
.append("」，欢迎语内容「")
.append(welcomeDetail.getWelcomeContent())
.append("」更改为「")
.append(qdto.getWelcomeContent())
.append("」，附件「");
List<String> oldMedia = new ArrayList<>();
for (WelcomeMediaDTO welcomeMediaDTO : welcomeDetail.getWelcomeMediaList()) {
oldMedia.add(WelcomeMediaTypeEnum.getDescByCode(welcomeMediaDTO.getMediaType()) + "-" + welcomeMediaDTO.getMediaTitle());
}
List<String> newMedia = new ArrayList<>();
for (SaveWelcomeMediaQDTO saveWelcomeMediaQDTO : qdto.getWelcomeMediaList()) {
newMedia.add(WelcomeMediaTypeEnum.getDescByCode(saveWelcomeMediaQDTO.getMediaType()) + "-" + saveWelcomeMediaQDTO.getMediaTitle());
}
stringBuilder.append(StringUtils.join(oldMedia, "、"))
.append("」变更为「")
.append(StringUtils.join(newMedia, "、"))
.append("」");
return stringBuilder.toString();
}
/**
* desc: 删除欢迎语
*
......@@ -118,7 +160,7 @@ public class WelcomeController extends WebBaseController {
ServiceResponse<WelcomeRemoveCheckDTO> serviceResponse = welcomeApiService.removeWelcomeWithErrorInfo(welcomeId);
if (serviceResponse.getResult() != null) {
// can't remove
return RestResponse.failure(HaoBanErrCode.ERR_9.getCode()+"", this.buildErrorMessage(serviceResponse.getResult()));
return RestResponse.failure(HaoBanErrCode.ERR_9.getCode() + "", this.buildErrorMessage(serviceResponse.getResult()));
}
return RestResponse.successResult();
}
......@@ -135,12 +177,12 @@ public class WelcomeController extends WebBaseController {
.append(welcomeRemoveCheckDTO.getLinkReferNum())
.append("），请确认相关活码是否不再使用该欢迎语以及链接已投放结束，取消关联后才可删除该模板");
} else if (welcomeRemoveCheckDTO.getQrCodeReferNum() != null
&& welcomeRemoveCheckDTO.getQrCodeReferNum() > 0){
&& welcomeRemoveCheckDTO.getQrCodeReferNum() > 0) {
stringBuilder.append("当前模板已关联状态为正常的活码（")
.append(welcomeRemoveCheckDTO.getQrCodeReferNum())
.append("），请确认相关活码是否不再使用该欢迎语，取消关联后才可删除该模板");
}else if (welcomeRemoveCheckDTO.getLinkReferNum() != null
&& welcomeRemoveCheckDTO.getLinkReferNum() > 0){
} else if (welcomeRemoveCheckDTO.getLinkReferNum() != null
&& welcomeRemoveCheckDTO.getLinkReferNum() > 0) {
stringBuilder.append("当前模板已关联状态为正常的链接（")
.append(welcomeRemoveCheckDTO.getLinkReferNum())
.append("），请确认相关链接已投放结束，取消关联后才可删除该模板");
......@@ -272,8 +314,8 @@ public class WelcomeController extends WebBaseController {
@RequestMapping(path = "/statistics")
public RestResponse<?> checkWelcomeReferStatistics(String welcomeId) {
if (StringUtils.isBlank(welcomeId)){
return RestResponse.failure(HaoBanErrCode.ERR_2.getCode()+"", HaoBanErrCode.ERR_2.getMsg());
if (StringUtils.isBlank(welcomeId)) {
return RestResponse.failure(HaoBanErrCode.ERR_2.getCode() + "", HaoBanErrCode.ERR_2.getMsg());
}
return RestResponse.successResult(welcomeApiService.welcomeReferStatistics(welcomeId).getResult());
}
......
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/hm/HmPageController.java
......@@ -15,6 +15,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.util.GicLogRecordEvaluationContext;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
......@@ -53,8 +54,10 @@ public class HmPageController {
pageDTO.setWxEnterpriseId(loginUser.getWxEnterpriseId());
ServiceResponse<Long> serviceResponse = pageApiService.saveOrUpdateHmPage(pageDTO);
if (serviceResponse.isSuccess()){
String logContent = "新增落地页模板【MB01" + serviceResponse.getResult()+"-" + pageSettingVO.getTemplateName() +"】";
return RestResponse.successResult(serviceResponse.getResult());
}
GicLogRecordEvaluationContext.putAttribute("saved", Boolean.FALSE);
return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
}
......@@ -75,13 +78,56 @@ public class HmPageController {
pageDTO.setCreateorName(loginUser.getClerkName());
pageDTO.setEnterpriseId(loginUser.getEnterpriseId());
pageDTO.setWxEnterpriseId(loginUser.getWxEnterpriseId());
ServiceResponse<HmPageDTO> queryPageDetail = pageApiService.queryPageDetail(pageDTO.getPageId());
ServiceResponse<Long> serviceResponse = pageApiService.saveOrUpdateHmPage(pageDTO);
if (serviceResponse.isSuccess()){
String logContent = this.buildEditPageContent(pageDTO, queryPageDetail.getResult());
return RestResponse.successResult(serviceResponse.getResult());
}
return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
}
/**
* 编辑落地页模板【模板ID-模板名称】：模板名称「 模板旧名称」变更「 模板新名称」，
* 页面标题「 页面旧标题」便跟「 页面新标题」，
* 商户名称「 商户名称」变更「 商户名称」，
* 商户电话「 商户电话」变更「 商户电话」，
* 商户LOGO、页面背景、
* 引导语「 引导语」变更「 引导语」
* @param newPageDTO
* @param oldPageDTO
* @return
*/
private String buildEditPageContent(HmPageDTO newPageDTO, HmPageDTO oldPageDTO){
StringBuilder stringBuilder = new StringBuilder();
stringBuilder.append("编辑落地页模板【")
.append(oldPageDTO.getPageCode())
.append("-")
.append(oldPageDTO.getPageName())
.append("：模板名称「 ")
.append(oldPageDTO.getPageName())
.append("」变更为「 ")
.append(newPageDTO.getPageName())
.append("」，页面标题「 ")
.append(oldPageDTO.getPageTitle())
.append("」变更为「")
.append(newPageDTO.getPageTitle())
.append("」，商户名称「")
.append(oldPageDTO.getMerchantName())
.append("」变更为「 ")
.append(newPageDTO.getMerchantName())
.append("」，商户电话「 ")
.append(oldPageDTO.getMerchantPhoneNumber())
.append("」变更为「")
.append(newPageDTO.getMerchantPhoneNumber())
.append("」，引导语「 ")
.append(oldPageDTO.getGuideComment())
.append("」变更为「")
.append(newPageDTO.getGuideComment())
.append("」");
return stringBuilder.toString();
}
@RequestMapping(path = "/page/list")
public RestResponse<?> queryPageList(HmPageListVO pageListVO){
......
haoban-manage3-web/src/main/webapp/WEB-INF/spring-servlet.xml
......@@ -30,6 +30,7 @@
<mvc:annotation-driven>
<!-- 设置不使用默认的消息转换器 -->
<mvc:message-converters register-defaults="false">
<bean class="com.gic.haoban.manage.web.config.LongHttpMessageConverter"/>
<bean class="com.gic.haoban.common.ext.MappingJackson2HttpMessagePropertyViewConverter"/>
<bean class="org.springframework.http.converter.StringHttpMessageConverter">
<property name="supportedMediaTypes">
......
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