Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-data-cloud into developer

gic-data-cloud-api/src/main/java/com/gic/cloud/service/EnterprisePortraitRelApiService.java

@@ -73,4 +73,14 @@ public interface EnterprisePortraitRelApiService {
      * @return  com.gic.api.base.commons.ServiceResponse<java.lang.Void>

     
*/
     ServiceResponse<Void> updateStatus(Integer enterpriseId, String fieldCode, Integer dataType, Integer status);
+
+    /**
+     * 主键删除
+     * @Title: delete

+     * @Description:
+    
* @author guojuxing
+     * @param portraitRelationId

+     * @return  com.gic.api.base.commons.ServiceResponse<java.lang.Void>

+    
*/
+    ServiceResponse<Void> delete(Integer portraitRelationId);
 }

gic-data-cloud-service/src/main/java/com/gic/cloud/service/outer/impl/EnterprisePortraitRelApiServiceImpl.java

@@ -136,6 +136,14 @@ public class EnterprisePortraitRelApiServiceImpl implements EnterprisePortraitRe
         return null;
     }
 
+    @Override
+    public ServiceResponse<Void> delete(Integer portraitRelationId) {
+        enterprisePortraitRelMapper.updateByPrimaryKeySelective(new TabGicEnterprisePortraitRel()
+                .setPortraitRelationId(portraitRelationId)
+                .setStatus(0));
+        return ServiceResponse.success();
+    }
+
     private void updateSort(Integer sort, Integer id) {
         enterprisePortraitRelMapper.updateByPrimaryKeySelective(new TabGicEnterprisePortraitRel()
                 .setPortraitRelationId(id)

gic-data-cloud-service/src/main/java/com/gic/cloud/service/outer/impl/IndexDescApiServiceImpl.java

@@ -113,7 +113,7 @@ public class IndexDescApiServiceImpl implements IndexDescApiService {
     public ServiceResponse<List<IndexDescDTO>> listAllUnRel(String moduleIds) {
         List<String> relModuleIdList = indexModuleRelService.listRelModuleId(LogAndUpdateTipsTypeEnum.INDEX.getCode());
         List<Integer> notInIndexDescIdList = Optional.of(relModuleIdList).orElse(Collections.emptyList())
-                .stream().map(Integer::valueOf).collect(Collectors.toList());
+                .stream().filter(StringUtils::isNotBlank).map(Integer::valueOf).collect(Collectors.toList());
 
         List<TabIndexDesc> indexDescList = this.indexDescService.listAllUnRel(notInIndexDescIdList);
 

gic-data-cloud-service/src/main/resources/mapper/TabIndexDescMapper.xml

@@ -234,10 +234,11 @@
   <select id="getIndexDescByIndexCode" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />
-    from tab_index_desc where status = 1 and module_id = #{moduleId} and index_code = #{indexCode}
+    from tab_index_desc where module_id = #{moduleId} and index_code = #{indexCode}
     <if test="indexGroupName != null and indexGroupName != '' ">
         and index_group_name = #{indexGroupName}
     </if>
+    order by create_time
     limit 1
   </select>
 </mapper>
\ No newline at end of file

gic-data-cloud-service/src/main/resources/mapper/TabIndexModuleRelMapper.xml

@@ -183,7 +183,7 @@
   <select id="listModuleIdByBusinessIds" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />
-    from tab_index_module_rel where status = 1 and type = #{type}
+    from tab_index_module_rel where type = #{type}
     <if test="null != ids and ids.size > 0">
       and business_id in
       <foreach collection="ids" index="index" item="item" open="(" separator="," close=")">

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/MemberCloudDataController.java

@@ -3,6 +3,8 @@ package com.gic.cloud.web.controller;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.logging.log4j.LogManager;
@@ -214,20 +216,33 @@ public class MemberCloudDataController {
     @RequestMapping("get-member-custom-portrait-field")
     public RestResponse getMemberCustomPortraitField(MemberCustomPortraitQoAbstract params) {
         log.info("会员自定义画像-字段筛选参数：{}", JSON.toJSONString(params));
-        params.setOnlineStoreIdList(new ArrayList<>());
         Integer enterpriseId = params.getEnterpriseId();
-        params.setStoreInfoIdList(storeSearchUtils.storeSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()));
-        params.setMemberCardIdList(dataAuthUtils.getMbrAreaId(params.getUserId(), params.getEnterpriseId()));
-        goDownComponent.setValueTotal(params);
         ServiceResponse<List<MemberCustomPortraitDTO>> fieldListRes = memberCloudDataApiService.listCustomField(params);
         if (fieldListRes.isSuccess()) {
             List<MemberCustomPortraitDTO> fieldList = fieldListRes.getResult();
             if (CollectionUtils.isNotEmpty(fieldList)) {
+                //最新的字段列表
+                Set<String> lastFieldSet = fieldList.stream().map(e -> e.getFieldCode()).collect(Collectors.toSet());
                 for (MemberCustomPortraitDTO temp : fieldList) {
                     enterprisePortraitRelApiService.savePortraitField(enterpriseId, temp.getFieldCode(), temp.getFieldName(), 2);
                 }
                 ServiceResponse<List<EnterprisePortraitRelDTO>> portraitFieldRes = enterprisePortraitRelApiService.listPortraitField(enterpriseId,  2, params.getDataStatus());
-                return ResultControllerUtils.commonResult(portraitFieldRes);
+                //同步删除
+                if (portraitFieldRes.isSuccess()) {
+                    List<EnterprisePortraitRelDTO> currentPortraitFieldList = portraitFieldRes.getResult();
+                    if (CollectionUtils.isNotEmpty(currentPortraitFieldList)) {
+                        currentPortraitFieldList.forEach(e -> {
+                            boolean hasNotExist = !lastFieldSet.contains(e.getPortraitCode());
+                            if (hasNotExist) {
+                                //删除
+                                enterprisePortraitRelApiService.delete(e.getPortraitRelationId());
+                            }
+                        });
+                    }
+                    return RestResponse.success(currentPortraitFieldList.stream().filter(e -> lastFieldSet.contains(e.getPortraitCode())).collect(Collectors.toList()));
+                } else {
+                    return RestResponse.failure(portraitFieldRes.getCode(), portraitFieldRes.getMessage());
+                }
             }
         }
         return RestResponse.failure(fieldListRes.getCode(), fieldListRes.getMessage());