crm保存信息

yudao-server/src/main/java/cn/iocoder/yudao/server/controller/admin/vo/crm/CrmPersonPageReqVO.java

@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.server.controller.admin.vo.crm;
+
+import lombok.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - crm人员分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class CrmPersonPageReqVO extends PageParam {
+
+    @Schema(description = "crm用户id", example = "17966")
+    private String crmUserId;
+
+    @Schema(description = "crm用户名称", example = "芋艿")
+    private String crmUserName;
+
+    @Schema(description = "crm unionid", example = "31455")
+    private String crmUserUnionid;
+
+    @Schema(description = "crm用户电话")
+    private String crmUserPhone;
+
+    @Schema(description = "crm邮箱")
+    private String crmUserMail;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}

yudao-server/src/main/java/cn/iocoder/yudao/server/controller/admin/vo/crm/CrmPersonRespVO.java

@@ -0,0 +1,42 @@
+package cn.iocoder.yudao.server.controller.admin.vo.crm;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - crm人员 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class CrmPersonRespVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "14264")
+    @ExcelProperty("主键id")
+    private Long id;
+
+    @Schema(description = "crm用户id", requiredMode = Schema.RequiredMode.REQUIRED, example = "17966")
+    @ExcelProperty("crm用户id")
+    private String crmUserId;
+
+    @Schema(description = "crm用户名称", example = "芋艿")
+    @ExcelProperty("crm用户名称")
+    private String crmUserName;
+
+    @Schema(description = "crm unionid", example = "31455")
+    @ExcelProperty("crm unionid")
+    private String crmUserUnionid;
+
+    @Schema(description = "crm用户电话")
+    @ExcelProperty("crm用户电话")
+    private String crmUserPhone;
+
+    @Schema(description = "crm邮箱")
+    @ExcelProperty("crm邮箱")
+    private String crmUserMail;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}

yudao-server/src/main/java/cn/iocoder/yudao/server/controller/admin/vo/crm/CrmPersonSaveReqVO.java

@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.server.controller.admin.vo.crm;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import jakarta.validation.constraints.*;
+
+@Schema(description = "管理后台 - crm人员新增/修改 Request VO")
+@Data
+public class CrmPersonSaveReqVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "14264")
+    private Long id;
+
+    @Schema(description = "crm用户id", requiredMode = Schema.RequiredMode.REQUIRED, example = "17966")
+    @NotEmpty(message = "crm用户id不能为空")
+    private String crmUserId;
+
+    @Schema(description = "crm用户名称", example = "芋艿")
+    private String crmUserName;
+
+    @Schema(description = "crm unionid", example = "31455")
+    private String crmUserUnionid;
+
+    @Schema(description = "crm用户电话")
+    private String crmUserPhone;
+
+    @Schema(description = "crm邮箱")
+    private String crmUserMail;
+
+}

yudao-server/src/main/java/cn/iocoder/yudao/server/dal/dataobject/CrmPersonDO.java

@@ -0,0 +1,51 @@
+package cn.iocoder.yudao.server.dal.dataobject;
+
+import lombok.*;
+import java.util.*;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+
+/**
+ * crm人员 DO
+ *
+ * @author 超级管理员
+ */
+@TableName("rq_iot_crm_person")
+@KeySequence("rq_iot_crm_person_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class CrmPersonDO extends BaseDO {
+
+    /**
+     * 主键id
+     */
+    @TableId
+    private Long id;
+    /**
+     * crm用户id
+     */
+    private String crmUserId;
+    /**
+     * crm用户名称
+     */
+    private String crmUserName;
+    /**
+     * crm unionid
+     */
+    private String crmUserUnionid;
+    /**
+     * crm用户电话
+     */
+    private String crmUserPhone;
+    /**
+     * crm邮箱
+     */
+    private String crmUserMail;
+
+}

yudao-server/src/main/java/cn/iocoder/yudao/server/dal/mysql/CrmPersonMapper.java

@@ -0,0 +1,31 @@
+package cn.iocoder.yudao.server.dal.mysql;
+
+import java.util.*;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.server.controller.admin.vo.crm.CrmPersonPageReqVO;
+import cn.iocoder.yudao.server.dal.dataobject.CrmPersonDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * crm人员 Mapper
+ *
+ * @author 超级管理员
+ */
+@Mapper
+public interface CrmPersonMapper extends BaseMapperX<CrmPersonDO> {
+
+    default PageResult<CrmPersonDO> selectPage(CrmPersonPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<CrmPersonDO>()
+                .eqIfPresent(CrmPersonDO::getCrmUserId, reqVO.getCrmUserId())
+                .likeIfPresent(CrmPersonDO::getCrmUserName, reqVO.getCrmUserName())
+                .eqIfPresent(CrmPersonDO::getCrmUserUnionid, reqVO.getCrmUserUnionid())
+                .eqIfPresent(CrmPersonDO::getCrmUserPhone, reqVO.getCrmUserPhone())
+                .eqIfPresent(CrmPersonDO::getCrmUserMail, reqVO.getCrmUserMail())
+                .betweenIfPresent(CrmPersonDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(CrmPersonDO::getId));
+    }
+
+}

yudao-server/src/main/java/cn/iocoder/yudao/server/rest/CrmRest.java

@@ -5,7 +5,9 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.system.oa.SslSkippingRestTemplate;
 import cn.iocoder.yudao.server.controller.admin.vo.crm.CrmTodoVo;
 import cn.iocoder.yudao.server.dal.dataobject.CrmNoticeDO;
+import cn.iocoder.yudao.server.dal.dataobject.CrmPersonDO;
 import cn.iocoder.yudao.server.dal.mysql.CrmNoticeMapper;
+import cn.iocoder.yudao.server.dal.mysql.CrmPersonMapper;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -22,6 +24,7 @@ import org.springframework.web.client.RestTemplate;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
@@ -32,9 +35,11 @@ public class CrmRest {
     private static final String CLIENT_SECRET = "d38fcf6dcb0f754cece55862b1ae77b3";
     private static final String REDIRECT_URI = "https://api-tencent.xiaoshouyi.com/";
     private final CrmNoticeMapper crmNoticeMapper;
+    private final CrmPersonMapper crmPersonMapper;
 
-    public CrmRest(CrmNoticeMapper crmNoticeMapper) {
+    public CrmRest(CrmNoticeMapper crmNoticeMapper, CrmPersonMapper crmPersonMapper) {
         this.crmNoticeMapper = crmNoticeMapper;
+        this.crmPersonMapper = crmPersonMapper;
     }
 
     /**
@@ -74,6 +79,28 @@ public class CrmRest {
         String records = JSON.parseObject(result).getJSONArray("records").toJSONString();
 
         List<CrmUser> crmUsers = JSON.parseArray(records, CrmUser.class);
+        List<CrmPersonDO> crmPersonDOS = crmPersonMapper.selectList();
+        Set<String> existIds = crmPersonDOS.stream()
+                .map(CrmPersonDO::getCrmUserId)
+                .collect(Collectors.toSet());
+
+
+        //插入自己的数据库，保存crm人员信息
+        List<CrmUser> needInsertUsers = crmUsers.stream()
+                .filter(user -> !existIds.contains(user.getId()))
+                .collect(Collectors.toList());
+        List<CrmPersonDO> collect = needInsertUsers.stream().map(e -> {
+            CrmPersonDO crmPersonDO = new CrmPersonDO();
+            crmPersonDO.setCrmUserId(e.getId());
+            crmPersonDO.setCrmUserName(e.getName());
+            crmPersonDO.setCrmUserPhone(e.getPhone());
+            crmPersonDO.setCrmUserMail(e.getPersonalEmail());
+            crmPersonDO.setCrmUserUnionid(e.getUnionId());
+            crmPersonDO.setDeleted(false);
+            return crmPersonDO;
+        }).collect(Collectors.toList());
+        crmPersonMapper.insertBatch(collect);
+
         AtomicReference<String> userId = new AtomicReference<>("");
         if (crmUsers != null) {
             crmUsers.stream().filter(e -> e.getUnionId().equals(dingUserId)).findAny().ifPresent(f ->{
@@ -88,14 +115,16 @@ public class CrmRest {
         headers.add("Authorization", token);
         HttpEntity<MultiValueMap<String, String>> requestEntity = new HttpEntity<>(headers);
         RestTemplate restTemplate = SslSkippingRestTemplate.createRestTemplate();
-        ResponseEntity<String> exchange = restTemplate.exchange("https://api-tencent.xiaoshouyi.com/rest/data/v2.0/creekflow/task/filter?assigneeIds="+crmUserId+"&status=pending&pageNo=1&pageSize=1000",
+        ResponseEntity<String> exchange = restTemplate.exchange("https://api-tencent.xiaoshouyi.com/rest/data/v2.0/creekflow/task/filter?status=approved&pageNo=1&pageSize=1000",
                 HttpMethod.GET, requestEntity, String.class);
         String body = exchange.getBody();
         String data = JSON.parseObject(body).getString("data");
         String records = JSON.parseObject(data).getJSONArray("records").toJSONString();
         List<CrmTodoVo> crmTodoVos = JSON.parseArray(records, CrmTodoVo.class);
         Integer dataCount = JSON.parseObject(data).getInteger("dataCount");
+        crmTodoVos.forEach(e ->{
 
+        });
         return ImmutableMap.of("todoCount", dataCount,"todoList", crmTodoVos);
     }
 

yudao-server/src/main/java/cn/iocoder/yudao/server/service/PortalOaFlow.java

@@ -68,9 +68,9 @@ public class PortalOaFlow {
     }
 
     public String getToken() throws Exception{
-        if (StringUtils.isBlank(spk) || StringUtils.isBlank(secret)) {
+//        if (StringUtils.isBlank(spk) || StringUtils.isBlank(secret)) {
             register();
-        }
+//        }
         String secretEn = E9ApiTokenUtil.encryptString(spk, secret);
         HttpHeaders headers = new HttpHeaders();
         headers.add("appid", appid);