1、初始化修改报表信息

src/main/java/com/link/report/domain/entity/CustomerReportGroup.java

@@ -9,7 +9,7 @@ import java.util.Date;
 public class CustomerReportGroup {
     private String id;
     private String reportId;
-    private String categoryName;
+//    private String categoryName;
     private Integer reportType;
     private String groupId;
     private String createBy;

src/main/java/com/link/report/domain/wq/CustomerGroupQueryWq.java

@@ -9,5 +9,6 @@ public class CustomerGroupQueryWq {
     private String categoryName;
     private List<String> groupIds;
     private Long createUserId;
+    private String name;
 
 }

src/main/java/com/link/report/pojo/request/CustomerGroupAddVo.java

@@ -9,6 +9,7 @@ import lombok.Data;
  */
 @Data
 public class CustomerGroupAddVo {
+    private String id;
     private String groupId;
     private String groupName;
     private String previewUrl;

src/main/java/com/link/report/service/impl/CustomerGroupServiceImpl.java

 package com.link.report.service.impl;
 
+import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.link.report.domain.dao.CustomerGroupDao;
 import com.link.report.domain.dao.CustomerReportGroupDao;
@@ -12,10 +13,11 @@ import com.sfa.common.core.constant.SecurityConstants;
 import com.sfa.common.core.domain.R;
 import com.sfa.common.security.utils.SecurityUtils;
 import com.sfa.system.api.RemoteUserService;
-import com.sfa.system.api.model.LoginUser;
+import com.sfa.system.api.domain.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -72,21 +74,42 @@ public class CustomerGroupServiceImpl implements CustomerGroupService {
             // groupDtos中找到匹配的数据
             CustomerGroupDto customerGroupDto = dtoMap.get(groupId);
             if (ObjectUtil.isNotEmpty(customerGroupDto)) {
+
+
                 // 匹配到了
                 CustomerGroupAddVo groupAddVo = new CustomerGroupAddVo();
                 // 分组
-                groupAddVo.setCategoryName(customerReportGroup.getCategoryName());
+                groupAddVo.setCategoryName(customerGroupDto.getCategoryName());
                 groupAddVo.setGroupName(customerGroupDto.getGroupName());
-                groupAddVo.setCreateBy(customerReportGroup.getCreateBy());
-                groupAddVo.setUpdateBy(customerReportGroup.getUpdateBy());
-                R<LoginUser> userResult =remoteUserService.getUserInfo(customerReportGroup.getCreateBy(), SecurityConstants.INNER) ;
+                R<SysUser> userResult =remoteUserService.getUserInfoById(Long.valueOf(customerReportGroup.getCreateBy()), SecurityConstants.INNER) ;
+
+                Long userid = userResult.getData().getUserId();
+                String  userName = userResult.getData().getUserName();
+
+                CustomerGroupQueryWq groupQueryWq = new CustomerGroupQueryWq();
+                groupQueryWq.setCreateUserId(userid);
+                groupQueryWq.setName(customerGroupDto.getGroupName());
+                List<CustomerGroupDto> existGroupDtos = groupDao.queryList(groupQueryWq);
+                if (ObjectUtil.isEmpty(existGroupDtos)) {
+                    groupAddVo.setGroupId(IdUtil.getSnowflakeNextIdStr());
+                    groupAddVo.setCreateUserId(userid);
+                    groupAddVo.setUpdateUserId(userid);
+                    groupAddVo.setCreateBy(userName);
+                    groupAddVo.setUpdateBy(userName);
+                    groupDao.insert(groupAddVo);
+                    customerReportGroup.setGroupId(groupAddVo.getGroupId());
+
+                }else{
+                    CustomerGroupDto existGroupDto = existGroupDtos.get(0);
+                    customerReportGroup.setGroupId(existGroupDto.getGroupId());
+                }
 
-                Long userid = userResult.getData().getSysUser().getUserId();
-                groupAddVo.setCreateUserId(userid);
-                groupAddVo.setUpdateUserId(userid);
-                groupDao.insert(groupAddVo);
                 // 修改数据
-                customerReportGroup.setGroupId(groupAddVo.getGroupId());
+                customerReportGroup.setCreateBy(userName);
+                customerReportGroup.setUpdateBy(userName);
+                customerReportGroup.setCreateUserId(userid);
+                customerReportGroup.setUpdateUserId(userid);
+                customerReportGroup.setUpdateTime(new Date());
                 // 更新 分组id
                 reportGroupDao.update(customerReportGroup);
             }