Skip to content

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

链接

parent d02766c6
Showing with 69 additions and 28 deletions
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/KeyDataApiService.java
package com.gic.haoban.manage.api.service;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.haoban.manage.api.dto.KeyDataDTO;
import com.gic.haoban.manage.api.enums.KeyDataEnum;
public interface KeyDataApiService {
public KeyDataDTO saveData(String data, KeyDataEnum dataEnum);
public ServiceResponse<KeyDataDTO> saveData(String data, KeyDataEnum dataEnum);
public String getDataByKey(String key, KeyDataEnum dataEnum);
public ServiceResponse<String> getDataByKey(String key, KeyDataEnum dataEnum);
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/hm/HmLinkApiService.java
......@@ -4,6 +4,7 @@ import java.util.List;
import com.gic.api.base.commons.BasePageInfo;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.haoban.manage.api.dto.hm.HmLinkDTO;
import com.gic.haoban.manage.api.dto.qdto.hm.HmLinkSearchQDTO;
......@@ -17,7 +18,7 @@ import com.gic.haoban.manage.api.dto.qdto.hm.HmLinkSearchQDTO;
*/
public interface HmLinkApiService {
public HmLinkDTO getByLinkId(String wxEnterpriseId, String enterprieId,Long linkId);
public ServiceResponse<HmLinkDTO> getByLinkId(String wxEnterpriseId, String enterprieId, Long linkId);
/**
*
......@@ -30,9 +31,9 @@ public interface HmLinkApiService {
* @return
* @throws
*/
public List<HmLinkDTO> listForSms(String wxEnterpriseId, String enterprieId, String linkName);
public ServiceResponse<List<HmLinkDTO>> listForSms(String wxEnterpriseId, String enterprieId, String linkName);
public Page<HmLinkDTO> listPage(HmLinkSearchQDTO qdto, BasePageInfo basePageInfo);
public ServiceResponse<Page<HmLinkDTO>> listPage(HmLinkSearchQDTO qdto, BasePageInfo basePageInfo);
public HmLinkDTO save(HmLinkDTO dto);
public ServiceResponse<HmLinkDTO> save(HmLinkDTO dto);
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/hm/HmLinkVisitLogApiService.java
package com.gic.haoban.manage.api.service.hm;
import com.gic.api.base.commons.ServiceResponse;
public interface HmLinkVisitLogApiService {
public void save(String unionid, Long linkId);
public ServiceResponse<Void> save(String unionid, Long linkId);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/errorcode/HaoBanErrCode.java
......@@ -7,6 +7,7 @@ public enum HaoBanErrCode {
ERR_0001("10100001", "参数没有传"),
ERR_10012("10012","企业微信不存在"),
ERR_OTHER("9999","业务异常"),
;
private String code;
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/KeyDataApiServiceImpl.java
......@@ -3,9 +3,11 @@ package com.gic.haoban.manage.service.service.out.impl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.haoban.manage.api.dto.KeyDataDTO;
import com.gic.haoban.manage.api.enums.KeyDataEnum;
import com.gic.haoban.manage.api.service.KeyDataApiService;
import com.gic.haoban.manage.service.errorcode.HaoBanErrCode;
import com.gic.haoban.manage.service.service.KeyDataService;
@Service("keyDataApiService")
......@@ -15,17 +17,17 @@ public class KeyDataApiServiceImpl implements KeyDataApiService {
private KeyDataService keyDataService;
@Override
public KeyDataDTO saveData(String data, KeyDataEnum dataEnum) {
return this.keyDataService.saveData(data, dataEnum);
public ServiceResponse<KeyDataDTO> saveData(String data, KeyDataEnum dataEnum) {
return ServiceResponse.success(this.keyDataService.saveData(data, dataEnum));
}
@Override
public String getDataByKey(String key, KeyDataEnum dataEnum) {
public ServiceResponse<String> getDataByKey(String key, KeyDataEnum dataEnum) {
KeyDataDTO data = this.keyDataService.getDataByKey(key, dataEnum);
if (null != data) {
return data.getData();
return ServiceResponse.success(data.getData());
}
return null;
return ServiceResponse.failure(HaoBanErrCode.ERR_OTHER.getCode(), "数据不存在");
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/hm/HmLinkApiServiceImpl.java
......@@ -7,12 +7,14 @@ import org.springframework.stereotype.Service;
import com.gic.api.base.commons.BasePageInfo;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.commons.util.EntityUtil;
import com.gic.haoban.manage.api.dto.hm.HmLinkDTO;
import com.gic.haoban.manage.api.dto.hm.HmLinkStoreDTO;
import com.gic.haoban.manage.api.dto.qdto.hm.HmLinkSearchQDTO;
import com.gic.haoban.manage.api.service.hm.HmLinkApiService;
import com.gic.haoban.manage.service.entity.hm.TabHmLink;
import com.gic.haoban.manage.service.errorcode.HaoBanErrCode;
import com.gic.haoban.manage.service.service.hm.HmLinkService;
import com.gic.haoban.manage.service.service.hm.HmLinkStoreService;
......@@ -25,31 +27,31 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
private HmLinkStoreService hmLinkStoreService;
@Override
public HmLinkDTO getByLinkId(String wxEnterpriseId, String enterpriseId, Long linkId) {
public ServiceResponse<HmLinkDTO> getByLinkId(String wxEnterpriseId, String enterpriseId, Long linkId) {
TabHmLink link = this.hmLinkService.getByLinkId(wxEnterpriseId, enterpriseId, linkId);
if (null != link) {
HmLinkDTO dto = EntityUtil.changeEntityByJSON(HmLinkDTO.class, link);
List<HmLinkStoreDTO> storeList = this.hmLinkStoreService.listByLinkId(dto.getWxEnterpriseId(),
dto.getEnterpriseId(), linkId);
dto.setStoreList(storeList);
return dto;
return ServiceResponse.success(dto);
}
return null;
return ServiceResponse.failure(HaoBanErrCode.ERR_OTHER.getCode(), "链接不存在");
}
@Override
public List<HmLinkDTO> listForSms(String wxEnterpriseId, String enterprieId, String linkName) {
return this.hmLinkService.listForSms(wxEnterpriseId, enterprieId, linkName);
public ServiceResponse<List<HmLinkDTO>> listForSms(String wxEnterpriseId, String enterprieId, String linkName) {
return ServiceResponse.success(this.hmLinkService.listForSms(wxEnterpriseId, enterprieId, linkName));
}
@Override
public HmLinkDTO save(HmLinkDTO dto) {
return this.hmLinkService.saveLink(dto, dto.getStoreList());
public ServiceResponse<HmLinkDTO> save(HmLinkDTO dto) {
return ServiceResponse.success(this.hmLinkService.saveLink(dto, dto.getStoreList()));
}
@Override
public Page<HmLinkDTO> listPage(HmLinkSearchQDTO qdto, BasePageInfo basePageInfo) {
return this.hmLinkService.listPage(qdto, basePageInfo);
public ServiceResponse<Page<HmLinkDTO>> listPage(HmLinkSearchQDTO qdto, BasePageInfo basePageInfo) {
return ServiceResponse.success(this.hmLinkService.listPage(qdto, basePageInfo));
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/hm/HmLinkVisitLogApiServiceImpl.java
......@@ -3,6 +3,7 @@ package com.gic.haoban.manage.service.service.out.impl.hm;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.haoban.manage.api.dto.hm.HmLinkVisitLogDTO;
import com.gic.haoban.manage.api.service.hm.HmLinkVisitLogApiService;
import com.gic.haoban.manage.service.service.hm.HmLinkVisitLogService;
......@@ -14,10 +15,11 @@ public class HmLinkVisitLogApiServiceImpl implements HmLinkVisitLogApiService {
private HmLinkVisitLogService hmLinkVisitLogService;
@Override
public void save(String unionid, Long linkId) {
public ServiceResponse<Void> save(String unionid, Long linkId) {
HmLinkVisitLogDTO dto = new HmLinkVisitLogDTO();
dto.setLinkId(linkId);
dto.setUnionId(unionid);
this.hmLinkVisitLogService.save(dto);
return ServiceResponse.success();
}
}
haoban-manage3-service/src/main/resources/mapper/hm/HmLinkMapper.xml
......@@ -131,7 +131,7 @@
and create_time <![CDATA[<=]]> #{endDate}
</if>
<if test="null != searchParams">
and ( link_code = #{searchParams} or creator_name like '%${searchParams}%' or name like '%${searchParams}%' )
and ( link_code like '%${searchParams}%' or creator_name like '%${searchParams}%' or name like '%${searchParams}%' )
</if>
<if test="null != linkType">
and link_type = #{linkType}
......
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/hm/HmLinkController.java
package com.gic.haoban.manage.web.controller.hm;
import java.util.HashMap;
import java.util.Map;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.alibaba.dubbo.common.utils.LogUtil;
import com.gic.api.base.commons.BasePageInfo;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
import com.gic.haoban.common.utils.AuthWebRequestUtil;
import com.gic.haoban.common.utils.HaobanResponse;
import com.gic.haoban.manage.api.dto.hm.HmLinkDTO;
import com.gic.haoban.manage.api.dto.qdto.hm.HmLinkSearchQDTO;
import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeDetailDTO;
import com.gic.haoban.manage.api.service.hm.HmLinkApiService;
import com.gic.haoban.manage.api.service.hm.HmPageTemplateApiService;
import com.gic.haoban.manage.api.service.out.WelcomeApiService;
import com.gic.haoban.manage.web.controller.WebBaseController;
/**
......@@ -29,6 +36,10 @@ public class HmLinkController extends WebBaseController {
@Autowired
private HmLinkApiService hmLinkApiService;
@Autowired
private HmPageTemplateApiService hmPageTemplateApiService;
@Autowired
private WelcomeApiService welcomeApiService;
@RequestMapping("add")
public HaobanResponse save(HmLinkDTO dto) {
......@@ -57,8 +68,8 @@ public class HmLinkController extends WebBaseController {
WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
qdto.setWxEnterpriseId(loginUser.getWxEnterpriseId());
qdto.setEnterpriseId(loginUser.getEnterpriseId());
Page<HmLinkDTO> page = this.hmLinkApiService.listPage(qdto, basePageInfo);
return this.success(page);
ServiceResponse<Page<HmLinkDTO>> page = this.hmLinkApiService.listPage(qdto, basePageInfo);
return this.success(page.getResult());
}
@RequestMapping("detail")
......@@ -66,8 +77,27 @@ public class HmLinkController extends WebBaseController {
WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
String wxEnterpriseId = loginUser.getWxEnterpriseId();
String enterpriseId = loginUser.getEnterpriseId();
HmLinkDTO dto = this.hmLinkApiService.getByLinkId(wxEnterpriseId, enterpriseId, linkId);
return this.success(dto);
ServiceResponse<HmLinkDTO> linkResp = this.hmLinkApiService.getByLinkId(wxEnterpriseId, enterpriseId, linkId);
if (!linkResp.isSuccess()) {
return this.fail("链接不存在");
}
HmLinkDTO link = linkResp.getResult();
Map<String, Object> retMap = new HashMap<>();
retMap.put("link", link);
// 落地页
Long pageId = link.getPageId();
if (null != pageId) {
// this.hmPageTemplateApiService.s
}
// 查询欢迎语
String welcomeId = link.getWelcomeId();
if(StringUtils.isNotBlank(welcomeId)) {
ServiceResponse<WelcomeDetailDTO> resp = this.welcomeApiService.getWelcome(welcomeId, enterpriseId);
if(resp.isSuccess() && null != resp.getResult()) {
retMap.put("welcome", resp.getResult()) ;
}
}
return this.success(retMap);
}
}
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