1、各个插入操作添加事务注解

xjs-business/xjs-business-openapi/src/main/java/com/xjs/aword/factory/impl/TianXingAWordFactory.java

@@ -14,6 +14,7 @@ import com.xjs.config.TianXingProperties;
 import com.xjs.exception.ApiException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -34,6 +35,7 @@ public class TianXingAWordFactory implements AWordFactory {
     private ApiAWordMapper apiAWordMapper;
 
     @Override
+    @Transactional
     public ApiAWord productApiAWord(RequestBody requestBody) {
         requestBody.setKey(tianXingProperties.getKey());
         JSONObject jsonObject = tianXingMMYJFeignClient.aWordApi(requestBody);

xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/client/api/tianxing/TianXingQWRSFeignClient.java

@@ -3,11 +3,12 @@ package com.xjs.common.client.api.tianxing;
 import com.alibaba.fastjson.JSONObject;
 import com.xjs.common.aop.ApiLog;
 import com.xjs.common.client.factory.TianXingQWRSFeignFactory;
-import com.xjs.copywriting.domain.RequestBody;
-import feign.Param;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.Map;
 
 import static com.xjs.consts.ApiConst.*;
 
@@ -21,9 +22,9 @@ import static com.xjs.consts.ApiConst.*;
 public interface TianXingQWRSFeignClient {
 
     @GetMapping
-    @ApiLog(name = TIANXING_TOPSEARCHALLNETWORK_URL,
+    @ApiLog(name = TIANXING_TOPSEARCHALLNETWORK,
-            url = TIANXING_PYQ_URL,
+            url = TIANXING_TOPSEARCHALLNETWORK_URL,
             method = "Get")
-    JSONObject topSearchApi(@Param("key") String key);
+    JSONObject topSearchApi(@RequestParam("key") String key);
 
 }

xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/impl/RollMMYJCopyWritingFactory.java

@@ -14,6 +14,7 @@ import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -34,6 +35,7 @@ public class RollMMYJCopyWritingFactory implements CopyWritingFactory {
     private CopyWritingService copyWritingService;
 
     @Override
+    @Transactional
     public CopyWriting productCopyWriting(RequestBody requestBody) {
         requestBody.setCount(20);
         requestBody.setApp_id(rollProperties.getApp_id());

xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/impl/TianXingJDTCCopyWritingFactory.java

@@ -13,6 +13,7 @@ import com.xjs.copywriting.factory.CopyWritingFactory;
 import com.xjs.copywriting.mapper.CopyWritingMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 
@@ -31,6 +32,7 @@ public class TianXingJDTCCopyWritingFactory implements CopyWritingFactory {
     private CopyWritingMapper copyWritingMapper;
 
     @Override
+    @Transactional
     public CopyWriting productCopyWriting(RequestBody requestBody) {
         requestBody.setKey(tianXingProperties.getKey());
         JSONObject jsonObject = tianXingJDTCFeignClient.copyWritingApi(requestBody);

xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/impl/TianXingMMMYCopyWritingFactory.java

@@ -13,6 +13,7 @@ import com.xjs.copywriting.factory.CopyWritingFactory;
 import com.xjs.copywriting.mapper.CopyWritingMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 
@@ -31,6 +32,7 @@ public class TianXingMMMYCopyWritingFactory implements CopyWritingFactory {
     private CopyWritingMapper copyWritingMapper;
 
     @Override
+    @Transactional
     public CopyWriting productCopyWriting(RequestBody requestBody) {
         requestBody.setKey(tianXingProperties.getKey());
         JSONObject jsonObject = tianXingMMMYeignClient.copyWritingApi(requestBody);

xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/impl/TianXingPYQCopyWritingFactory.java

@@ -13,6 +13,7 @@ import com.xjs.copywriting.factory.CopyWritingFactory;
 import com.xjs.copywriting.mapper.CopyWritingMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 
@@ -32,6 +33,7 @@ public class TianXingPYQCopyWritingFactory implements CopyWritingFactory {
     private CopyWritingMapper copyWritingMapper;
 
     @Override
+    @Transactional
     public CopyWriting productCopyWriting(RequestBody requestBody) {
         requestBody.setKey(tianXingProperties.getKey());
         JSONObject jsonObject = tianXingPYQFeignClient.copyWritingApi(requestBody);

xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/impl/TianXingWYYCopyWritingFactory.java

@@ -13,6 +13,7 @@ import com.xjs.copywriting.factory.CopyWritingFactory;
 import com.xjs.copywriting.mapper.CopyWritingMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 
@@ -32,6 +33,7 @@ public class TianXingWYYCopyWritingFactory implements CopyWritingFactory {
     private CopyWritingMapper copyWritingMapper;
 
     @Override
+    @Transactional
     public CopyWriting productCopyWriting(RequestBody requestBody) {
         requestBody.setKey(tianXingProperties.getKey());
         JSONObject jsonObject = tianXingWYYFeignClient.copyWritingApi(requestBody);

xjs-business/xjs-business-openapi/src/main/java/com/xjs/oneenglish/controller/ApiEnglishController.java

@@ -11,6 +11,8 @@ import com.xjs.oneenglish.domain.ApiEnglish;
 import com.xjs.oneenglish.domain.RequestBody;
 import com.xjs.oneenglish.factory.OneEnglishFactory;
 import com.xjs.oneenglish.service.IApiEnglishService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -25,6 +27,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/oneenglish")
+@Api(tags = "业务模块-英语一言")
 public class ApiEnglishController extends BaseController {
     @Autowired
     private IApiEnglishService apiEnglishService;
@@ -33,6 +36,7 @@ public class ApiEnglishController extends BaseController {
 
     @RequiresPermissions("openapi:oneenglish:list")
     @GetMapping("/getOneEnglish")
+    @ApiOperation("英语一言接口")
     public AjaxResult getOneEnglish() {
         ApiEnglish oneEnglish = tianXingOneEnglishFactory.getOneEnglish(new RequestBody());
         return AjaxResult.success(oneEnglish);
@@ -47,6 +51,7 @@ public class ApiEnglishController extends BaseController {
      */
     @RequiresPermissions("openapi:oneenglish:list")
     @GetMapping("/list")
+    @ApiOperation("查询英语一言列表")
     public TableDataInfo list(ApiEnglish apiEnglish) {
         startPage();
         List<ApiEnglish> list = apiEnglishService.selectApiEnglishList(apiEnglish);
@@ -58,6 +63,7 @@ public class ApiEnglishController extends BaseController {
      */
     @RequiresPermissions("openapi:oneenglish:export")
     @Log(title = "英语一言", businessType = BusinessType.EXPORT)
+    @ApiOperation("导出英语一言列表")
     @PostMapping("/export")
     public void export(HttpServletResponse response, ApiEnglish apiEnglish) {
         List<ApiEnglish> list = apiEnglishService.selectApiEnglishList(apiEnglish);
@@ -69,6 +75,7 @@ public class ApiEnglishController extends BaseController {
      * 获取英语一言详细信息
      */
     @RequiresPermissions("openapi:oneenglish:query")
+    @ApiOperation("获取英语一言详细信息")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(apiEnglishService.selectApiEnglishById(id));
@@ -80,6 +87,7 @@ public class ApiEnglishController extends BaseController {
     @RequiresPermissions("openapi:oneenglish:remove")
     @Log(title = "英语一言", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
+    @ApiOperation("删除英语一言")
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(apiEnglishService.deleteApiEnglishByIds(ids));
     }

xjs-business/xjs-business-openapi/src/main/java/com/xjs/oneenglish/factory/TianXingOneEnglishFactory.java

@@ -12,6 +12,7 @@ import com.xjs.oneenglish.domain.RequestBody;
 import com.xjs.oneenglish.mapper.ApiEnglishMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -39,6 +40,7 @@ public class TianXingOneEnglishFactory implements OneEnglishFactory {
     private RedisService redisService;
 
     @Override
+    @Transactional
     public ApiEnglish getOneEnglish(RequestBody requestBody) {
         ApiEnglish apiEnglish = new ApiEnglish();
         //redis中有值直接返回

xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/controller/ApiTopSearchController.java

@@ -8,12 +8,15 @@ import com.xjs.topsearch.factory.TopserachFactory;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 热搜榜控制器
@@ -45,7 +48,11 @@ public class ApiTopSearchController {
 
         //获取百度热搜
 
-        return AjaxResult.success();
+
+        Map<String, List> listHashMap = new HashMap<>();
+        listHashMap.put("allnetworkList", allnetworkList);
+
+        return AjaxResult.success(listHashMap);
     }
 
 

xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/factory/impl/TianXingTopsearchAllnetworkFactory.java

@@ -1,5 +1,6 @@
 package com.xjs.topsearch.factory.impl;
 
+import cn.hutool.core.map.MapUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.common.core.constant.HttpStatus;
@@ -12,9 +13,11 @@ import com.xjs.topsearch.service.ApiTopsearchAllnetworkService;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -36,9 +39,11 @@ public class TianXingTopsearchAllnetworkFactory implements TopserachFactory<ApiT
 
 
     @Override
+    @Transactional
     public List<ApiTopsearchAllnetwork> topSearchApi() {
-
+        String key = tianXingProperties.getKey();
-        JSONObject jsonObject = tianXingQWRSFeignClient.topSearchApi(tianXingProperties.getKey());
+        Map<Object, Object> map = MapUtil.builder().put("key", key).map();
+        JSONObject jsonObject = tianXingQWRSFeignClient.topSearchApi(key);
         if (!jsonObject.containsKey("error")) {
             if (jsonObject.getInteger("code") == HttpStatus.SUCCESS) {
                 JSONArray newslist = jsonObject.getJSONArray("newslist");