孙永军 1 год назад
Родитель
Сommit
c487ffebd7

+ 2 - 2
src/main/java/com/smcic/api/conference/controller/UserThirdController.java

@@ -2,7 +2,7 @@ package com.smcic.api.conference.controller;
 
 
 import com.google.common.collect.ImmutableMap;
-import com.smcic.api.conference.entity.UserThird;
+import com.smcic.api.conference.entity.ConferenceUserThird;
 import com.smcic.api.conference.service.impl.UserThirdServiceImpl;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,7 +31,7 @@ public class UserThirdController {
     }
 
     @PostMapping("create")
-    public void create(@RequestBody UserThird userThird) {
+    public void create(@RequestBody ConferenceUserThird userThird) {
         userThird.setCreateTime(LocalDateTime.now());
         userThirdService.save(userThird);
     }

+ 4 - 2
src/main/java/com/smcic/api/conference/entity/UserThird.java → src/main/java/com/smcic/api/conference/entity/ConferenceUserThird.java

@@ -1,6 +1,5 @@
 package com.smcic.api.conference.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
@@ -21,10 +20,13 @@ import lombok.Setter;
 @Getter
 @Setter
 @TableName("user_third")
-public class UserThird implements Serializable {
+public class ConferenceUserThird implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @TableId(value = "conference_id")
+    private Long conferenceId;
+
     private String openId;
 
     /**

+ 2 - 2
src/main/java/com/smcic/api/conference/mapper/UserThirdMapper.java

@@ -1,6 +1,6 @@
 package com.smcic.api.conference.mapper;
 
-import com.smcic.api.conference.entity.UserThird;
+import com.smcic.api.conference.entity.ConferenceUserThird;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author syj
  * @since 2024-03-27
  */
-public interface UserThirdMapper extends BaseMapper<UserThird> {
+public interface UserThirdMapper extends BaseMapper<ConferenceUserThird> {
 
 }

+ 2 - 2
src/main/java/com/smcic/api/conference/service/IUserThirdService.java

@@ -1,6 +1,6 @@
 package com.smcic.api.conference.service;
 
-import com.smcic.api.conference.entity.UserThird;
+import com.smcic.api.conference.entity.ConferenceUserThird;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author syj
  * @since 2024-03-27
  */
-public interface IUserThirdService extends IService<UserThird> {
+public interface IUserThirdService extends IService<ConferenceUserThird> {
 
 }

+ 2 - 3
src/main/java/com/smcic/api/conference/service/impl/UserThirdServiceImpl.java

@@ -7,10 +7,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.ImmutableMap;
 import com.smcic.api.conference.dto.WxPhoneDTO;
 import com.smcic.api.conference.entity.ConferenceWxAccount;
-import com.smcic.api.conference.entity.UserThird;
+import com.smcic.api.conference.entity.ConferenceUserThird;
 import com.smcic.api.conference.mapper.UserThirdMapper;
 import com.smcic.api.conference.service.IUserThirdService;
-import com.smcic.api.operate.entity.KeysConst;
 import com.smcic.core.advice.APIException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.util.TextUtils;
@@ -31,7 +30,7 @@ import java.util.concurrent.ConcurrentHashMap;
  */
 @Service
 @Slf4j
-public class UserThirdServiceImpl extends ServiceImpl<UserThirdMapper, UserThird> implements IUserThirdService {
+public class UserThirdServiceImpl extends ServiceImpl<UserThirdMapper, ConferenceUserThird> implements IUserThirdService {
 
     private Map<Long, String> access_token = new ConcurrentHashMap<>();
 

+ 26 - 8
src/test/java/conference.http

@@ -104,20 +104,20 @@ Content-Type: application/json
 
 {
   "conferenceId": 1066,
-  "cover": "http://cxzx.smcic.net/operate/cenference/1066/20240402/0.png",
-  "title": "世界互联网大会数字丝路发展论坛能给陕西带来什么?",
-  "summary": "世界互联网大会数字丝路发展论坛能给陕西带来什么?",
+  "cover": "http://cxzx.smcic.net/operate/cenference/1066/20240402/70637aea795b4beaa352b18f7e5c74ba.png",
+  "title": "世界互联网大会数字丝路发展论坛缘何落地陕西?",
+  "summary": "世界互联网大会数字丝路发展论坛缘何落地陕西?",
   "content": "<div>中国日报网3月30日 3月27日,世界互联网大会数字丝路发展论坛发布会在北京举行。陕西省委常委、宣传部部长孙大光在接受中国日报网记者采访时表示,论坛将有助于推动陕西抢占数字经济的新蓝海,更好地融入一带一路大格局,展现开放包容的新形象。他提到,世界互联网大会数字丝路发展论坛既是一场在古丝绸之路起点,拥抱世界,畅想未来的深邃思考,同时也是一场跨越文明跨越国界的碰撞交流。</div>",
-  "author": "马芮",
-  "source": "来源:中国日报网",
-  "publishTime": "2024-03-30 10:31:22",
-  "isTop": 99,
+  "author": "西部网",
+  "source": "西部网",
+  "publishTime": "2024-03-28 17:31:22",
+  "isTop": 100,
   "type": 1
 }
 
 
 ### 新闻分页
-GET {{ip}}/conference/news/list/1066?page=1&pageSize=20
+GET {{ip}}/conference/news/list/1066?page=1&pageSize=20&category=
 
 ### 新闻详情
 GET {{ip}}/conference/news/info/1
@@ -242,6 +242,24 @@ GET {{ip}}/conference/photo-sse/1066
 ### 获取手机号
 GET {{ip}}/conference/user-third/getPhone/1066?code=xxx
 
+
+### 补充用户信息
+POST {{ip}}/conference/user-third/create
+Content-Type: application/json
+
+{
+  "conferenceId": 1066,
+  "openId": "微信open_id",
+  "source": "微信",
+  "userName": "李勇利",
+  "photo": "http://cxzx.smcic.net/operate/cenference/1066/20240402/0.png",
+  "phone": "手机号",
+  "email": "xxx",
+  "company": "公司",
+  "department": "部门",
+  "position": "职位"
+}
+
 ### 订阅, status: 1 订阅, 2 取消订阅
 POST {{ip}}/conference/subscription/create?code=xxx
 Content-Type: application/json