fix 1.开心中文报名相关接口返回修改 2.游客登陆默认id赋值修改

edu-travel-common/edu-travel-common-datasource/src/main/java/edu/travel/config/FieldMetaObjectHandler.java

@@ -31,12 +31,18 @@ public class FieldMetaObjectHandler implements MetaObjectHandler {
     public void insertFill(MetaObject metaObject) {
         HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest();
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-        if (authentication == null) return;
         Object principal = authentication.getPrincipal();
-        String jsonString = JSON.toJSONString(principal);
-        JSONObject jsonObject = JSON.parseObject(jsonString);
+        Long userId = null;
+
+        if (!(principal instanceof String && "anonymousUser".equals(principal))) {
+            //走登录用户
+            String jsonString = JSON.toJSONString(principal);
+            JSONObject jsonObject = JSON.parseObject(jsonString);
+            userId = jsonObject.getLong("id");
+        }
+
         if (metaObject.hasSetter(CREATE_USER_ID)) {
-            this.strictInsertFill(metaObject, CREATE_USER_ID, String.class, jsonObject.getLong("id").toString());
+            this.strictInsertFill(metaObject, CREATE_USER_ID, String.class, userId != null ? userId.toString() : "");
         }
         if (metaObject.hasSetter(CREATE_TIME)) {
             this.strictInsertFill(metaObject, CREATE_TIME, Date.class, new Date());

edu-travel-common/edu-travel-common-resp/src/main/java/edu/travel/rpc/RPCBaseResponse.java

@@ -14,7 +14,8 @@ public class RPCBaseResponse<T> implements Serializable {
     private String msg;
     private T data;
 
-
+    public <T> RPCBaseResponse(int i, String message, T data, int total, int currentPage, int pageSize) {
+    }
     public static <T> RPCBaseResponse<T> success(T data) {
         return new RPCBaseResponse<>(200, "success", data);
     }

edu-travel-common/edu-travel-common-resp/src/main/java/edu/travel/rpc/RPCPageResponse.java

@@ -4,6 +4,8 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
@@ -11,4 +13,21 @@ public class RPCPageResponse<T> extends RPCBaseResponse<T> {
     private int total;
     private int  currentPage;
     private int pageSize;
+
+    public <T> RPCPageResponse(int i, String message, T data, int total, int currentPage, int pageSize) {
+    }
+
+    public static <T> RPCBaseResponse<T> success(T data) {
+        return null;
+    }
+    public static <T> RPCBaseResponse<T> success() {
+        return new RPCBaseResponse<>(200, "success",null);
+    }
+    public static <T> RPCBaseResponse<T> success(String message) {
+        return new RPCBaseResponse<>(200, message, null);
+    }
+    public static <T> RPCPageResponse<T> success(String message,T data,int total,int currentPage,int pageSize) {
+        return new RPCPageResponse<>(200, message, data,total,currentPage,pageSize);
+    }
+
 }

edu-travel-service/edu-travel-service-education/src/main/java/edu/travel/education/web/HappyEntryController.java

@@ -8,6 +8,8 @@ import edu.travel.education.service.impl.HappyEntryServiceImpl;
 import edu.travel.education.vo.HappyEntryVo;
 import edu.travel.resp.BaseResponse;
 import edu.travel.resp.PageResponse;
+import edu.travel.rpc.RPCBaseResponse;
+import edu.travel.rpc.RPCPageResponse;
 import edu.travel.web.BaseController;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -35,10 +37,10 @@ public class HappyEntryController extends BaseController<HappyEntry> {
      * @return
      */
     @PostMapping("/addHappyEntry")
-//    @PreAuthorize("permitAll()")
-    public BaseResponse<HappyEntryVo> addHappyEntry(@RequestBody AddHappyEntryDto happyEntryDto){
+    @PreAuthorize("permitAll()")
+    public RPCBaseResponse<HappyEntryVo> addHappyEntry(@RequestBody AddHappyEntryDto happyEntryDto){
         HappyEntryVo vo = happyEntryService.addHappyEntry(happyEntryDto);
-        return new BaseResponse<>(200,"success",vo);
+        return new RPCBaseResponse<>(200,"success",vo);
     }
 
     /**
@@ -48,9 +50,9 @@ public class HappyEntryController extends BaseController<HappyEntry> {
      */
    @GetMapping("/getHappyEntryById")
    @PreAuthorize("hasRole('超级管理员')")
-    public BaseResponse<HappyEntryVo> getHappyEntryById(Long id){
+    public RPCBaseResponse<HappyEntryVo> getHappyEntryById(Long id){
         HappyEntryVo vo = happyEntryService.getHappyEntryById(id);
-        return new BaseResponse<>(200,"success",vo);
+        return new RPCBaseResponse<>(200,"success",vo);
     }
 
     /**
@@ -60,9 +62,9 @@ public class HappyEntryController extends BaseController<HappyEntry> {
      */
     @PostMapping("/UpdateHappyEntryById")
     @PreAuthorize("hasRole('超级管理员')")
-    public BaseResponse<HappyEntryVo> UpdateHappyEntryById(@RequestBody HappyEntryDto happyEntryDto){
+    public RPCBaseResponse<HappyEntryVo> UpdateHappyEntryById(@RequestBody HappyEntryDto happyEntryDto){
         HappyEntryVo vo = happyEntryService.UpdateHappyEntryById(happyEntryDto);
-        return new BaseResponse<>(200,"success",vo);
+        return new RPCBaseResponse<>(200,"success",vo);
     }
 
     /**
@@ -72,11 +74,11 @@ public class HappyEntryController extends BaseController<HappyEntry> {
      */
     @PostMapping("/deleteHappyEntryById")
     @PreAuthorize("hasRole('超级管理员')")
-    public BaseResponse<HappyEntryVo> deleteHappyEntryById(@RequestParam Long id){
+    public RPCBaseResponse<HappyEntryVo> deleteHappyEntryById(@RequestParam Long id){
         Set<Long> set = new HashSet<>();
         set.add(id);
         happyEntryService.deleteHappyEntryByIds(set);
-        return new BaseResponse<>(200,"success",null);
+        return new RPCBaseResponse<>(200,"success",null);
     }
 
     /**
@@ -86,10 +88,10 @@ public class HappyEntryController extends BaseController<HappyEntry> {
      */
     @PostMapping("/deleteHappyEntryByIds")
     @PreAuthorize("hasRole('超级管理员')")
-    public BaseResponse<HappyEntryVo> deleteHappyEntryById(@RequestBody List<Long> ids){
+    public RPCBaseResponse<HappyEntryVo> deleteHappyEntryById(@RequestBody List<Long> ids){
         Set<Long> set = new HashSet<Long>(ids);
         happyEntryService.deleteHappyEntryByIds(set);
-        return new BaseResponse<>(200,"success",null);
+        return new RPCBaseResponse<>(200,"success",null);
     }
 
     /**
@@ -98,10 +100,10 @@ public class HappyEntryController extends BaseController<HappyEntry> {
      */
     @GetMapping("/listPageHappyEntry")
     @PreAuthorize("hasRole('超级管理员')")
-    public BaseResponse<List<HappyEntryVo>> listPageHappyEntry( HappyEntryDto happyEntryDto){
+    public RPCPageResponse<List<HappyEntryVo>> listPageHappyEntry(HappyEntryDto happyEntryDto){
         IPage<HappyEntry> page = happyEntryService.listPageHappyEntry(happyEntryDto);
         List<HappyEntryVo> happyEntryVos = BeanUtil.copyToList(page.getRecords(), HappyEntryVo.class);
-        return  PageResponse.out(200,"success",happyEntryVos,(int) page.getTotal(),(int)page.getSize());
+        return  RPCPageResponse.success("200",happyEntryVos,(int) page.getTotal(),(int)page.getSize(),(int)page.getCurrent());
     }
 
 }