Skip to content

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

链接

parent 2c400c28
Showing with 59 additions and 70 deletions
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/hm/HmLinkMapper.java
......@@ -2,6 +2,8 @@ package com.gic.haoban.manage.service.dao.mapper.hm;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.gic.haoban.manage.service.entity.hm.TabHmLink;
/**
......@@ -15,12 +17,6 @@ import com.gic.haoban.manage.service.entity.hm.TabHmLink;
*/
public interface HmLinkMapper {
/**
* 新增
* @Title: insert
* @Description: TODO
* @Param @param TabHaobanHmLink
*/
public int insert(TabHmLink link);
/**
......@@ -30,7 +26,7 @@ public interface HmLinkMapper {
* @Param @param TabHaobanHmLink
* @Throws
*/
public int updateByPrimaryKey(TabHmLink tabHaobanHmLink);
public int update(TabHmLink link);
/**
* 通过主键查询
......@@ -43,14 +39,6 @@ public interface HmLinkMapper {
*/
public TabHmLink selectById(Long linkId);
/**
* 通过条件查询
* @Title: listAll
* @Description: TODO
* @Param @param TabHaobanHmLink
* @Param @return
* @Return List
* @Throws
*/
public List<TabHmLink> listAll(TabHmLink tabHaobanHmLink);
public List<TabHmLink> listForSms(@Param("wxEnterpriseId") String wxEnterpriseId,
@Param("enterpriseId") String enterpriseId, @Param("linkName") String linkName);
}
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/HmLinkService.java
......@@ -9,9 +9,9 @@ import com.gic.haoban.manage.service.entity.hm.TabHmLink;
public interface HmLinkService {
public TabHmLink getByLinkId(Long linkId);
public List<HmLinkDTO> listForSms(String wxEnterpriseId, String enterprieId) ;
public HmLinkDTO saveLink(HmLinkDTO dto , List<HmLinkStoreDTO> stoerList);
public List<HmLinkDTO> listForSms(String wxEnterpriseId, String enterprieId, String linkName);
public HmLinkDTO saveLink(HmLinkDTO dto, List<HmLinkStoreDTO> stoerList);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/HmLinkServiceImpl.java
package com.gic.haoban.manage.service.service.hm.impl;
import java.util.Date;
import java.util.List;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
......@@ -22,7 +20,6 @@ public class HmLinkServiceImpl implements HmLinkService {
@Autowired
private HmLinkMapper linkMapper;
@Autowired
private HmLinkStoreService hmLinkStoreService;
......@@ -30,11 +27,11 @@ public class HmLinkServiceImpl implements HmLinkService {
public TabHmLink getByLinkId(Long linkId) {
return this.linkMapper.selectById(linkId);
}
@Override
public List<HmLinkDTO> listForSms(String wxEnterpriseId, String enterprieId) {
// TODO Auto-generated method stub
return null;
public List<HmLinkDTO> listForSms(String wxEnterpriseId, String enterpriseId, String linkName) {
List<TabHmLink> list = this.linkMapper.listForSms(wxEnterpriseId, enterpriseId, linkName);
return EntityUtil.changeEntityListByJSON(HmLinkDTO.class, list);
}
@Override
......@@ -42,19 +39,16 @@ public class HmLinkServiceImpl implements HmLinkService {
public HmLinkDTO saveLink(HmLinkDTO dto, List<HmLinkStoreDTO> storeList) {
// 新增
Long linkId = dto.getLinkId();
TabHmLink entity = EntityUtil.changeEntityByJSON(TabHmLink.class, dto);
if (null == linkId) {
linkId = UniqueIdUtils.uniqueLong();
dto.setLinkId(linkId);
StringBuilder sb = new StringBuilder("LJ").append("0").append(dto.getLinkType()).append(linkId);
dto.setLinkId(linkId);
dto.setLinkCode(sb.toString());
dto.setStatusFlag(1);
Date now = new Date();
dto.setCreateTime(now);
dto.setUpdateTime(now);
TabHmLink entity = EntityUtil.changeEntityByJSON(TabHmLink.class, dto);
this.linkMapper.insert(entity);
} else {
this.linkMapper.update(entity);
}
this.hmLinkStoreService.saveStore(linkId, storeList);
return dto;
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/HmLinkStoreServiceImpl.java
package com.gic.haoban.manage.service.service.hm.impl;
import java.util.ArrayList;
import java.util.List;import java.util.stream.Collector;
import java.util.List;
import java.util.stream.Collectors;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.gic.commons.util.EntityUtil;
import com.gic.commons.util.UniqueIdUtils;
......@@ -32,6 +33,7 @@ public class HmLinkStoreServiceImpl implements HmLinkStoreService {
}
@Override
@Transactional
public int saveStore(Long linkId, List<HmLinkStoreDTO> thisList) {
if (CollectionUtils.isEmpty(thisList)) {
this.hmLinkStoreMapper.deleteByLinkId(linkId);
......@@ -51,13 +53,13 @@ public class HmLinkStoreServiceImpl implements HmLinkStoreService {
addList.add(EntityUtil.changeEntityByJSON(TabHmLinkStore.class, dto));
}
}
List<String> thisStoreIdList = thisList.stream().map(dto->dto.getStoreId()).collect(Collectors.toList()) ;
for(TabHmLinkStore item : oldList) {
if(!thisStoreIdList.contains(item.getStoreId())) {
delIdList.add(item.getId()) ;
List<String> thisStoreIdList = thisList.stream().map(dto -> dto.getStoreId()).collect(Collectors.toList());
for (TabHmLinkStore item : oldList) {
if (!thisStoreIdList.contains(item.getStoreId())) {
delIdList.add(item.getId());
}
}
if(CollectionUtils.isNotEmpty(addList)) {
if (CollectionUtils.isNotEmpty(addList)) {
for (TabHmLinkStore item : addList) {
item.setId(UniqueIdUtils.uniqueLong());
item.setLinkId(linkId);
......@@ -66,8 +68,8 @@ public class HmLinkStoreServiceImpl implements HmLinkStoreService {
}
this.hmLinkStoreMapper.insertBatch(addList);
}
if(CollectionUtils.isNotEmpty(delIdList)) {
this.hmLinkStoreMapper.deleteById(delIdList) ;
if (CollectionUtils.isNotEmpty(delIdList)) {
this.hmLinkStoreMapper.deleteById(delIdList);
}
return count;
}
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/hm/HmLinkApiServiceImpl.java
......@@ -29,7 +29,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
@Override
public List<HmLinkDTO> listForSms(String wxEnterpriseId, String enterprieId, String linkName) {
return null;
return this.hmLinkService.listForSms(wxEnterpriseId, enterprieId,linkName);
}
@Override
......
haoban-manage3-service/src/main/resources/mapper/hm/HmLinkMapper.xml
......@@ -80,8 +80,8 @@
#{creatorName,jdbcType=VARCHAR},
#{modifierId,jdbcType=VARCHAR},
#{modifierName,jdbcType=VARCHAR},
#{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP},
now(),
now(),
#{storeRuleJson,jdbcType=VARCHAR},
#{customRuleJson,jdbcType=VARCHAR},
#{memberLabelId,jdbcType=VARCHAR},
......@@ -91,30 +91,21 @@
</insert>
<!-- ==================更新 ========== -->
<update id="updateByPrimaryKey" parameterType="com.gic.haoban.manage.service.entity.hm.TabHmLink">
<![CDATA[
UPDATE tab_haoban_hm_link SET
link_id=#{linkId,jdbcType=BIGINT},
link_code=#{linkCode,jdbcType=VARCHAR},
link_type=#{linkType,jdbcType=INTEGER},
wx_enterprise_id=#{wxEnterpriseId,jdbcType=CHAR},
enterprise_id=#{enterpriseId,jdbcType=CHAR},
name=#{name,jdbcType=VARCHAR},
remark=#{remark,jdbcType=VARCHAR},
welcome_id=#{welcomeId,jdbcType=VARCHAR},
page_id=#{pageId,jdbcType=BIGINT},
creator_id=#{creatorId,jdbcType=VARCHAR},
creator_name=#{creatorName,jdbcType=VARCHAR},
modifier_id=#{modifierId,jdbcType=VARCHAR},
modifier_name=#{modifierName,jdbcType=VARCHAR},
create_time=#{createTime,jdbcType=TIMESTAMP},
update_time=#{updateTime,jdbcType=TIMESTAMP},
store_rule_json=#{storeRuleJson,jdbcType=VARCHAR},
custom_rule_json=#{customRuleJson,jdbcType=VARCHAR},
member_label_id=#{memberLabelId,jdbcType=VARCHAR},
status_flag=#{statusFlag,jdbcType=INTEGER}
link_id = #{linkId}
]]>
<update id="update" parameterType="com.gic.haoban.manage.service.entity.hm.TabHmLink">
<![CDATA[
UPDATE tab_haoban_hm_link SET
name=#{name,jdbcType=VARCHAR},
remark=#{remark,jdbcType=VARCHAR},
welcome_id=#{welcomeId,jdbcType=VARCHAR},
page_id=#{pageId,jdbcType=BIGINT},
modifier_id=#{modifierId,jdbcType=VARCHAR},
modifier_name=#{modifierName,jdbcType=VARCHAR},
update_time=now(),
store_rule_json=#{storeRuleJson,jdbcType=VARCHAR},
custom_rule_json=#{customRuleJson,jdbcType=VARCHAR},
member_label_id=#{memberLabelId,jdbcType=VARCHAR}
WHERE link_id = #{linkId}
]]>
</update>
<!-- ============ 查询=============-->
......@@ -122,4 +113,13 @@
SELECT * FROM tab_haoban_hm_link WHERE link_id = #{linkId}
</select>
<select id="listForSms" resultMap="result-map-tabHaobanHmLink">
select <include refid="Base_Column_List" /> from tab_haoban_hm_link where wx_enterprise_id=#{wxEnterpriseId} and enterprise_id=#{enterpriseId}
<if test="null != linkName">
and name like '%${linkName}%'
</if>
and status_flag = 1
limit 20
</select>
</mapper>
\ No newline at end of file
haoban-manage3-service/src/main/resources/mapper/hm/HmLinkStoreMapper.xml
......@@ -62,7 +62,7 @@
id in <foreach collection="list" item="item" separator="," open="(" close=")" >
#{item}
</foreach>
status_flag = 1
and status_flag = 1
</delete>
......
haoban-manage3-service/src/test/java/HmLinkTest.java
......@@ -54,8 +54,9 @@ public class HmLinkTest {
@Test
public void saveLink() {
HmLinkDTO dto = new HmLinkDTO() ;
dto.setLinkId(417044789037756417L);
dto.setLinkType(1);
dto.setName("打的费");
dto.setName("打的费2");
dto.setCreatorId("creatorid");
dto.setCreatorName("创建人");
dto.setModifierId("xiugren");
......@@ -69,6 +70,8 @@ public class HmLinkTest {
dto.setStoreRuleJson("{}");
dto.setMemberLabelId("MEML");
this.hmLinkApiService.save(dto,null) ;
System.out.println(this.hmLinkApiService.listForSms("111", "2222", "打的费")); ;
}
......
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