diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/aword/controller/ApiAWordController.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/aword/controller/ApiAWordController.java index 2216f2bc..b2c5156a 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/aword/controller/ApiAWordController.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/aword/controller/ApiAWordController.java @@ -1,17 +1,42 @@ package com.xjs.aword.controller; import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.log.annotation.Log; +import com.ruoyi.common.security.annotation.RequiresLogin; +import com.xjs.aword.domain.ApiAWord; +import com.xjs.aword.domain.RequestBody; +import com.xjs.aword.factory.AWordFactory; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.Optional; + /** * api每日一句控制器 * @author xiejs * @since 2022-01-08 + * */ @RequestMapping("aword") @RestController @Api(tags = "业务模块-每日一句") public class ApiAWordController extends BaseController { + @Autowired + private AWordFactory tianXingAWordFactory; + + @GetMapping + @ApiOperation("每日一句接口") + @Log(title = "获取每日一句") + @RequiresLogin + public AjaxResult getApiAWord(@Validated RequestBody requestBody) { + requestBody = Optional.ofNullable(requestBody).orElseGet(RequestBody::new); + ApiAWord apiAWord = tianXingAWordFactory.productApiAWord(requestBody); + return AjaxResult.success(apiAWord); + } } diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/aword/factory/impl/TianXingAWordFactory.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/aword/factory/impl/TianXingAWordFactory.java index 1e6b7188..18894c69 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/aword/factory/impl/TianXingAWordFactory.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/aword/factory/impl/TianXingAWordFactory.java @@ -31,7 +31,6 @@ public class TianXingAWordFactory implements AWordFactory { @Override public ApiAWord productApiAWord(RequestBody requestBody) { - requestBody.setRand(1); requestBody.setKey(tianXingProperties.getKey()); JSONObject jsonObject = tianXingMMYJFeignClient.aWordApi(requestBody); if (jsonObject.containsKey("error")) { diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/impl/RollMMYJCopyWritingFactory.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/impl/RollMMYJCopyWritingFactory.java index ca0844dd..a1915bb0 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/impl/RollMMYJCopyWritingFactory.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/impl/RollMMYJCopyWritingFactory.java @@ -11,6 +11,7 @@ import com.xjs.copywriting.factory.CopyWritingFactory; import com.xjs.copywriting.service.CopyWritingService; import com.xjs.exception.ApiException; import lombok.extern.log4j.Log4j2; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -48,6 +49,9 @@ public class RollMMYJCopyWritingFactory implements CopyWritingFactory { copyWriting.setContent(toJSON.getString("content")); copyWriting.setSource(toJSON.getString("author")); copyWriting.setType(TianXingConst.MRYJ); + if (StringUtils.isBlank(copyWriting.getSource())) { + copyWriting.setSource("匿名"); + } return copyWriting; }).collect(Collectors.toList()); log.info("批量插入成功了嘛---"+copyWritingService.saveBatch(collect));