clunt
/
RuoYi-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、补齐某些类的注释 

2、继续开发检查API可用性功能
3、前端英语单词排序字段新增根据查看次数排序
This commit is contained in:
xjs 2022-02-22 21:46:35 +08:00
parent 7268d7dbfc
commit e1d7a2e593
5 changed files with 189 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ruoyi-ui/src/views/business/english/word/index.vue
View File

@ -107,7 +107,12 @@
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="英语单词" align="center" prop="englishWord" :show-overflow-tooltip="true"/>
<el-table-column label="中文" align="center" prop="chineseWord" :show-overflow-tooltip="true"/>
<el-table-column label="排序" align="center" prop="sort" :show-overflow-tooltip="true"/>
<el-table-column label="排序"
align="center"
prop="sort"
sortable="custom"
:sort-orders="['descending', 'ascending']"
:show-overflow-tooltip="true"/>
<el-table-column label="收藏" align="center" prop="isCollect">
<template slot-scope="scope">
<dict-tag :options="dict.type.english_collect" :value="scope.row.isCollect"/>
@ -118,7 +123,12 @@
<dict-tag :options="dict.type.english_top" :value="scope.row.top"/>
</template>
</el-table-column>
<el-table-column label="查看次数" align="center" prop="lookCount" :show-overflow-tooltip="true"/>
<el-table-column label="查看次数"
align="center"
prop="lookCount"
sortable="custom"
:sort-orders="['descending', 'ascending']"
:show-overflow-tooltip="true"/>
<el-table-column label="创建时间"
align="center"
prop="createTime"
@ -449,13 +459,13 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
this.resetSort()
this.resetSort()//重置排序
this.daterangeCreateTime = [];
this.queryParams.createTime = null
this.queryParams.endCreateTime = null
this.sortStatus=false
this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)//拿到默认排序
this.sortStatus=true
this.resetForm("queryForm");

4
ruoyi-ui/src/views/business/openapi/aword/index.vue
View File

@ -64,7 +64,7 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="awordList" @selection-change="handleSelectionChange">
<el-table v-loading="loading" border height="585" :data="awordList" @selection-change="handleSelectionChange">
<el-table-column type="expand">
<template slot-scope="props">
<el-form label-position="left" inline class="">
@ -150,7 +150,7 @@ export default {
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 7,
pageSize: 10,
content: null,
source: null,
note: null,

1
xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/client/factory/LqDogDiaryFeignFactory.java
View File

@ -6,6 +6,7 @@ import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;
/**
* 零七平台舔狗日记api降级
* @author xiejs
* @since 2022-02-14
*/

1
xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/client/factory/LqPoisonChickenFeignFactory.java
View File

@ -6,6 +6,7 @@ import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;
/**
* 零七平台 毒鸡汤 feign降级
* @author xiejs
* @since 2022-02-14
*/

177
xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/task/CheckApiStatusTask.java
View File

@ -10,18 +10,30 @@ import com.xjs.business.warning.RemoteWarningCRUDFeign;
import com.xjs.business.warning.domain.ApiRecord;
import com.xjs.common.client.api.alapi.AlapiJokeAllFeignClient;
import com.xjs.common.client.api.baidu.BaiduFeignClient;
import com.xjs.common.client.api.gaode.GaodeWeatherFeignClient;
import com.xjs.common.client.api.lq.LqAWordFeignClient;
import com.xjs.common.client.api.lq.LqDogDiaryFeignClient;
import com.xjs.common.client.api.lq.LqPoisonChickenFeignClient;
import com.xjs.common.client.api.roll.RollBeautyPictureFeignClient;
import com.xjs.common.client.api.roll.RollChineseDictFeignClient;
import com.xjs.properties.AlApiProperties;
import com.xjs.properties.BaiduProperties;
import com.xjs.properties.GaodeProperties;
import com.xjs.properties.RollProperties;
import com.xjs.translation.domain.qo.translation.BaiDuTranslationQo;
import com.xjs.weather.domain.IPInfoVo;
import com.xjs.weather.domain.RequestBody;
import com.xjs.weather.service.IPService;
import lombok.extern.log4j.Log4j2;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.lang.reflect.Method;
import java.util.List;
import static com.xjs.consts.ApiConst.DEMOTE_ERROR;
import static com.xjs.consts.ApiConst.GAODE_EXTENSIONS_BASE;
import static com.xjs.consts.ReqConst.ERROR;
/**
@ -38,29 +50,69 @@ public class CheckApiStatusTask {
*/
public static final String content = "test";
/**
* 城市编码
*/
public static final String cityId = "360100";
@Autowired
private RemoteWarningCRUDFeign remoteWarningCRUDFeign;
@Autowired
private IPService ipService;
@Autowired
private AlApiProperties alApiProperties;
@Autowired
private BaiduProperties baiduProperties;
@Autowired
private GaodeProperties gaodeProperties;
@Autowired
private RollProperties rollProperties;
@Resource
@Autowired
private AlapiJokeAllFeignClient alapiJokeAllFeignClient;
@Resource
@Autowired
private BaiduFeignClient baiduFeignClient;
@Autowired
private GaodeWeatherFeignClient gaodeWeatherFeignClient;
@Autowired
private LqAWordFeignClient lqAWordFeignClient;
@Autowired
private LqDogDiaryFeignClient lqDogDiaryFeignClient;
@Autowired
private LqPoisonChickenFeignClient lqPoisonChickenFeignClient;
@Autowired
private RollBeautyPictureFeignClient rollBeautyPictureFeignClient;
@Autowired
private RollChineseDictFeignClient rollChineseDictFeignClient;
/**
* 检查api状态 <br>
* 后续实现新API需要在这新增检查项
*/
public void checkApiStatus() {
this.checkAlapiJoke();
try {
this.checkAlapiJoke();
this.checkBaiduTranslation();
this.checkGaodeWeather();
this.checkLqAWord();
this.checkLqDogDiary();
this.checkRollBeautyPicture();
} catch (Exception e) {
e.printStackTrace();
}
this.checkBaiduTranslation();
// todo 还剩20多个api检查没写
@ -111,6 +163,119 @@ public class CheckApiStatusTask {
log.error("检查发现百度平台翻译API异常");
}
/**
* 检查高德平台天气API
*/
private void checkGaodeWeather() {
//构建请求参数
RequestBody requestBody = new RequestBody();
//获取城市编码
IPInfoVo ipApiData = null;
try {
ipApiData = ipService.getIPApiData();
} catch (Exception e) {
ipApiData = new IPInfoVo();
ipApiData.setCityId(cityId);
}
requestBody.setKey(gaodeProperties.getKey())
.setCity(ipApiData.getCityId())
.setExtensions(GAODE_EXTENSIONS_BASE);
JSONObject jsonObject = gaodeWeatherFeignClient.WeatherApi(requestBody);
if (!jsonObject.containsKey(DEMOTE_ERROR)) {
return;
}
String[] info = this.getAnnotationInfo(GaodeWeatherFeignClient.class);
this.selectAndUpdate(info);
log.error("检查发现高德平台天气API异常");
}
/**
* 检查零七平台 一言API
*/
private void checkLqAWord() {
String data = lqAWordFeignClient.aWordApi();
if (!StringUtils.isEmpty(data)) {
return;
}
String[] info = this.getAnnotationInfo(GaodeWeatherFeignClient.class);
this.selectAndUpdate(info);
log.error("检查发现零七平台 一言API异常");
}
/**
* 检查零七平台舔狗日记API
*/
private void checkLqDogDiary() {
String data = lqDogDiaryFeignClient.dogDiaryApi();
if (!StringUtils.isEmpty(data)) {
return;
}
String[] info = this.getAnnotationInfo(GaodeWeatherFeignClient.class);
this.selectAndUpdate(info);
log.error("检查发现零七平台 舔狗日记API异常");
}
/**
* 检查零七平台毒鸡汤API
*/
private void checkLqPoisonChicken() {
String data = lqPoisonChickenFeignClient.poisonChickenApi();
if (!StringUtils.isEmpty(data)) {
return;
}
String[] info = this.getAnnotationInfo(GaodeWeatherFeignClient.class);
this.selectAndUpdate(info);
log.error("检查发现零七平台 毒鸡汤API异常");
}
/**
* 检查ROLL平台 美女图片API
*/
private void checkRollBeautyPicture() {
com.xjs.apitools.domain.RequestBody requestBody = new com.xjs.apitools.domain.RequestBody();
requestBody.setApp_secret(rollProperties.getApp_secret());
requestBody.setApp_id(rollProperties.getApp_id());
JSONObject jsonObject = rollBeautyPictureFeignClient.beautyPictureApi(requestBody);
if (!jsonObject.containsKey(DEMOTE_ERROR)) {
return;
}
String[] info = this.getAnnotationInfo(GaodeWeatherFeignClient.class);
this.selectAndUpdate(info);
log.error("检查发现ROLL平台 美女图片API异常");
}
/**
* 反射获取注解信息