查询标签名

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/WxApplicationMapper.java

@@ -4,12 +4,9 @@ import com.gic.haoban.manage.service.entity.TabHaobanWxApplication;
 import org.apache.ibatis.annotations.Param;
 
 public interface WxApplicationMapper {
-    int deleteByPrimaryKey(String wxApplicationId);
 
     int insertSelective(TabHaobanWxApplication record);
 
-    TabHaobanWxApplication selectByPrimaryKey(String wxApplicationId);
-
     int updateByPrimaryKeySelective(TabHaobanWxApplication record);
 
     TabHaobanWxApplication selectBySiteIdAndWxEnterpriseId(@Param("siteId") String siteId, @Param("wxEnterpriseId") String wxEnterpriseId);

haoban-manage3-service/src/main/resources/mapper/WxApplicationMapper.xml

@@ -21,19 +21,6 @@
     wx_enterprise_id, status_flag, create_time, update_time,is_customized_app
     </sql>
 
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String">
-        select
-        <include refid="Base_Column_List"/>
-        from tab_haoban_wx_application
-        where wx_application_id = #{wxApplicationId,jdbcType=VARCHAR}
-    </select>
-
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-        delete
-        from tab_haoban_wx_application
-        where wx_application_id = #{wxApplicationId,jdbcType=VARCHAR}
-    </delete>
-
    <insert id="insertSelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanWxApplication">
         insert into tab_haoban_wx_application
         <trim prefix="(" suffix=")" suffixOverrides=",">

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.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.BasePageInfo;
 import com.gic.api.base.commons.Page;
@@ -11,7 +29,11 @@ import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
 import com.gic.haoban.common.utils.AuthWebRequestUtil;
 import com.gic.haoban.manage.api.constants.StatisticsApolloKeyConstant;
-import com.gic.haoban.manage.api.dto.hm.*;
+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.hm.HmLinkStoreSettingDTO;
+import com.gic.haoban.manage.api.dto.hm.HmPageDTO;
+import com.gic.haoban.manage.api.dto.hm.WxUserAddLogDTO;
 import com.gic.haoban.manage.api.dto.qdto.hm.HmLinkSearchQDTO;
 import com.gic.haoban.manage.api.dto.qdto.hm.WxUserAddLogSearchQDTO;
 import com.gic.haoban.manage.api.dto.statistics.StatisticsDTO;
@@ -30,20 +52,9 @@ import com.gic.log.record.service.LogRecordUserService;
 import com.gic.log.record.util.GicLogRecordCategoryEnum;
 import com.gic.log.record.util.GicLogRecordEvaluationContext;
 import com.gic.log.record.util.GicLogRecordOptTypeEnum;
+import com.gic.member.tag.api.dto.MemberTagDTO;
 import com.gic.member.tag.api.dto.MemberTagItemDTO;
 import com.gic.member.tag.api.service.MemberTagApiService;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * 
@@ -567,10 +578,12 @@ public class HmLinkController {
         HmLinkVO linkVO = EntityUtil.changeEntityByJSON(HmLinkVO.class, link);
         String memberLabelId = link.getMemberLabelId();
         if (StringUtils.isNotBlank(memberLabelId)) {
-            MemberTagItemDTO tag = this.memberTagApiService.findMemberTagItem(memberLabelId);
-            if (null != tag) {
-                linkVO.setMemberLabelName(tag.getTagName() + "-" + tag.getTagItemName());
-                linkVO.setMemberLabelStatus(tag.getStatus());
+            MemberTagItemDTO tagItem = this.memberTagApiService.findMemberTagItem(memberLabelId);
+            if (null != tagItem) {
+                String tagId = tagItem.getTagId() ;
+                MemberTagDTO tag = this.memberTagApiService.getMemberTagById(tagId) ;
+                linkVO.setMemberLabelName(tag.getTagName() + "-" + tagItem.getTagItemName());
+                linkVO.setMemberLabelStatus(tagItem.getStatus());
             }
         }
         ServiceResponse<String> urlResp = this.hmLinkApiService.getHmLinkUrl();