Merge branch '20250408-wyp-contentPlatform' into test

api-module/src/main/java/com/tzld/piaoquan/api/controller/contentplatform/ContentPlatformAccountController.java

@@ -1,16 +1,19 @@
 package com.tzld.piaoquan.api.controller.contentplatform;
 
-import com.tzld.piaoquan.api.model.param.contentplatform.AccountLoginParam;
-import com.tzld.piaoquan.api.model.param.contentplatform.AccountSendMessageParam;
+import com.alibaba.fastjson.JSON;
+import com.tzld.piaoquan.api.annotation.JwtIgnore;
+import com.tzld.piaoquan.api.model.param.IdParam;
+import com.tzld.piaoquan.api.model.param.contentplatform.*;
 import com.tzld.piaoquan.api.model.vo.contentplatform.AccountLoginVO;
+import com.tzld.piaoquan.api.model.vo.contentplatform.AccountVO;
 import com.tzld.piaoquan.api.service.contentplatform.ContentPlatformAccountService;
 import com.tzld.piaoquan.growth.common.common.base.CommonResponse;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 @RestController
 @RequestMapping("/contentPlatform/account")
@@ -21,14 +24,39 @@ public class ContentPlatformAccountController {
 
     @ApiOperation(value = "手机号登录")
     @PostMapping("/login")
+    @JwtIgnore
     public CommonResponse<AccountLoginVO> login(@RequestBody AccountLoginParam param) {
         return CommonResponse.success(accountService.login(param));
     }
 
     @ApiOperation(value = "发送短信验证码")
     @PostMapping("/sendMessageVerifyCode")
+    @JwtIgnore
     public CommonResponse<Void> sendMessageVerifyCode(@RequestBody AccountSendMessageParam param) {
         accountService.sendMessageVerifyCode(param);
         return CommonResponse.success();
     }
+
+    @ApiOperation(value = "分页获取账户")
+    @PostMapping(value = "/list")
+    @JwtIgnore
+    public CommonResponse<List<AccountVO>> pageAccount(@RequestBody AccountListParam param) {
+        return CommonResponse.success(accountService.pageAccount(param));
+    }
+
+    @ApiOperation(value = "账户封禁")
+    @PostMapping(value = "/forbidden")
+    @JwtIgnore
+    public CommonResponse<Void> accountForbidden(@RequestBody AccountForbiddenParam param) {
+        accountService.accountForbidden(param);
+        return CommonResponse.success();
+    }
+
+    @ApiOperation(value = "账户创建/更新")
+    @PostMapping(value = "/save")
+    @JwtIgnore
+    public CommonResponse<Void> saveAccount(@RequestBody AccountSaveParam param) {
+        accountService.saveAccount(param);
+        return CommonResponse.success();
+    }
 }

api-module/src/main/java/com/tzld/piaoquan/api/model/param/contentplatform/AccountForbiddenParam.java

@@ -0,0 +1,14 @@
+package com.tzld.piaoquan.api.model.param.contentplatform;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AccountForbiddenParam {
+
+    @ApiModelProperty(value = "ID")
+    private Long id;
+
+    @ApiModelProperty(value = "操作人")
+    private String operator;
+}

api-module/src/main/java/com/tzld/piaoquan/api/model/param/contentplatform/AccountListParam.java

@@ -0,0 +1,8 @@
+package com.tzld.piaoquan.api.model.param.contentplatform;
+
+import com.tzld.piaoquan.api.model.param.PageParam;
+import lombok.Data;
+
+@Data
+public class AccountListParam extends PageParam {
+}

api-module/src/main/java/com/tzld/piaoquan/api/model/param/contentplatform/AccountSaveParam.java

@@ -0,0 +1,27 @@
+package com.tzld.piaoquan.api.model.param.contentplatform;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AccountSaveParam {
+
+    @ApiModelProperty(value = "ID")
+    private Long id;
+    @ApiModelProperty(value = "公司主体名称")
+    private String name;
+    @ApiModelProperty(value = "身份（0-代理商 1-流量主）")
+    private Integer identity;
+    @ApiModelProperty(value = "渠道")
+    private String channel;
+    @ApiModelProperty(value = "联系人姓名")
+    private String contactName;
+    @ApiModelProperty(value = "手机号")
+    private String telNum;
+    @ApiModelProperty(value = "密码")
+    private String password;
+
+    @ApiModelProperty(value = "操作人")
+    private String operator;
+
+}

api-module/src/main/java/com/tzld/piaoquan/api/model/vo/contentplatform/AccountVO.java

@@ -0,0 +1,26 @@
+package com.tzld.piaoquan.api.model.vo.contentplatform;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AccountVO {
+
+	@ApiModelProperty(value = "ID")
+	private Long id;
+	@ApiModelProperty(value = "公司主体名称")
+	private String name;
+	@ApiModelProperty(value = "身份（0-代理商 1-流量主）")
+	private Integer identity;
+	@ApiModelProperty(value = "渠道")
+	private String channel;
+	@ApiModelProperty(value = "联系人姓名")
+	private String contactName;
+	@ApiModelProperty(value = "手机号")
+	private String telNum;
+	@ApiModelProperty(value = "密码")
+	private String password;
+	@ApiModelProperty(value = "创建时间")
+	private Long createTimestamp;
+
+}

api-module/src/main/java/com/tzld/piaoquan/api/service/contentplatform/ContentPlatformAccountService.java

@@ -1,11 +1,19 @@
 package com.tzld.piaoquan.api.service.contentplatform;
 
-import com.tzld.piaoquan.api.model.param.contentplatform.AccountLoginParam;
-import com.tzld.piaoquan.api.model.param.contentplatform.AccountSendMessageParam;
+import com.tzld.piaoquan.api.model.param.contentplatform.*;
 import com.tzld.piaoquan.api.model.vo.contentplatform.AccountLoginVO;
+import com.tzld.piaoquan.api.model.vo.contentplatform.AccountVO;
+
+import java.util.List;
 
 public interface ContentPlatformAccountService {
     AccountLoginVO login(AccountLoginParam param);
 
     void sendMessageVerifyCode(AccountSendMessageParam param);
+
+    List<AccountVO> pageAccount(AccountListParam param);
+
+    void accountForbidden(AccountForbiddenParam param);
+
+    void saveAccount(AccountSaveParam param);
 }

api-module/src/main/java/com/tzld/piaoquan/api/service/contentplatform/impl/ContentPlatformAccountServiceImpl.java

@@ -1,11 +1,13 @@
 package com.tzld.piaoquan.api.service.contentplatform.impl;
 
-import com.tzld.piaoquan.api.model.param.contentplatform.AccountLoginParam;
-import com.tzld.piaoquan.api.model.param.contentplatform.AccountSendMessageParam;
+import com.tzld.piaoquan.api.model.param.contentplatform.*;
 import com.tzld.piaoquan.api.model.vo.contentplatform.AccountLoginVO;
+import com.tzld.piaoquan.api.model.vo.contentplatform.AccountVO;
 import com.tzld.piaoquan.api.service.contentplatform.ContentPlatformAccountService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public class ContentPlatformAccountServiceImpl implements ContentPlatformAccountService {
     @Override
@@ -17,4 +19,19 @@ public class ContentPlatformAccountServiceImpl implements ContentPlatformAccount
     public void sendMessageVerifyCode(AccountSendMessageParam param) {
 
     }
+
+    @Override
+    public List<AccountVO> pageAccount(AccountListParam param) {
+        return null;
+    }
+
+    @Override
+    public void accountForbidden(AccountForbiddenParam param) {
+
+    }
+
+    @Override
+    public void saveAccount(AccountSaveParam param) {
+
+    }
 }

api-module/src/main/resources/application.properties

@@ -55,6 +55,7 @@ author.interceptor.excludePaths[3]=/account/
 author.interceptor.excludePaths[4]=/cgi/
 author.interceptor.excludePaths[5]=/wecom/
 author.interceptor.excludePaths[6]=/3rdParty/
+author.interceptor.excludePaths[7]=/contentPlatform/account/
 author.interceptor.excludeUris[0]=/login
 author.interceptor.excludeUris[1]=/api-docs
 author.interceptor.excludeUris[2]=/swagger-ui.html