diff --git a/ruoyi-ui/src/views/business/tools/apitools/index.vue b/ruoyi-ui/src/views/business/tools/apitools/index.vue index aca3c342..ebdb56d9 100644 --- a/ruoyi-ui/src/views/business/tools/apitools/index.vue +++ b/ruoyi-ui/src/views/business/tools/apitools/index.vue @@ -299,23 +299,72 @@
- - - + + + - 搜索 + +
+ + 简体：{{ simpleComplexData.originContent }} + + + 繁体：{{ simpleComplexData.convertContent }} + +
+ + 搜索 + +
- - - + + + - 搜索 + +
+ + 原内容：{{ chineseDictData.word }} + + + 繁体：{{ chineseDictData.traditional }} + + + 拼音：{{ chineseDictData.pinyin }} + + + 笔画数：{{ chineseDictData.strokes }} + + + 偏旁部首：{{ chineseDictData.radicals }} + + + 汉字释义：{{ chineseDictData.explanation }} + +
+ + + 搜索 + +
@@ -371,7 +420,6 @@ export default { simpleComplexData: {}, chineseDictData: {}, - //-------------input框数据------------------- idCardForm: { idCard: '' @@ -395,7 +443,6 @@ export default { content: '' }, - //------------控制弹出显示隐藏----------------- holidayVisible: false, beautyPictureVisible: false, @@ -408,7 +455,6 @@ export default { simpleComplexVisible: false, chineseDictVisible: false, - //----------------遮罩层------------------- loading1: false, loading2: false, @@ -421,7 +467,6 @@ export default { loading9: false, loading10: false, - //---------------校验规则-------------------- rules: { idCard: [ @@ -438,21 +483,63 @@ export default { name: [ {required: true, message: '请输入垃圾名称！！！', trigger: 'blur'}, ], + dict: [ + {required: true, message: '请输入简体中文！！！', trigger: 'blur'}, + {min: 1, max: 1, message: '长度在 1 个字符', trigger: 'blur'} + ], }, - //----------------其他参数------------------- weather, } }, created() { - } , methods: { + //获取汉语字典信息 + getChineseDict(chineseDictForm) { + this.$refs[chineseDictForm].validate((valid) => { + this.chineseDictData = {} + if (valid) { + this.loading10 = true + getChineseDict(this.chineseDictForm.dict).then(res => { + this.loading10 = false + this.chineseDictVisible = true + this.chineseDictData = res.data + }).catch(err => { + this.loading10 = false + }) + } else { + return false + } + }) + }, + + + //获取简繁转换信息 + getSimpleComplex(simpleComplexForm) { + this.$refs[simpleComplexForm].validate((valid) => { + this.simpleComplexData = {} + if (valid) { + this.loading9 = true + getSimpleComplex(this.simpleComplexForm.content).then(res => { + this.loading9 = false + this.simpleComplexVisible = true + this.simpleComplexData = res.data + }).catch(err => { + this.loading9 = false + }) + } else { + return false + } + }) + } + , + //获取垃圾分类信息 getGarbageSorting(garbageSortingForm) { this.$refs[garbageSortingForm].validate((valid) => { diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/controller/ApiToolsController.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/controller/ApiToolsController.java index 6c81dcaa..2e4244c6 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/controller/ApiToolsController.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/controller/ApiToolsController.java @@ -6,11 +6,16 @@ import com.ruoyi.common.security.annotation.RequiresPermissions; import com.xjs.apitools.domain.*; import com.xjs.apitools.service.ApiToolsService; import com.xjs.utils.ChineseUtils; +import com.xjs.weather.domain.IPInfoVo; +import com.xjs.weather.service.IPService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.List; import java.util.regex.Pattern; @@ -32,6 +37,8 @@ public class ApiToolsController { @Autowired private ApiToolsService apiToolsService; + @Autowired + private IPService ipService; @GetMapping("holiday") @@ -135,7 +142,14 @@ public class ApiToolsController { return R.ok(apiToolsService.getIdcardQuery(idcard)); } return R.fail("请输入正确的身份证号！！！"); + } + @GetMapping("ipinfo/{ip}") + @ApiOperation("获取IP信息") + @Log(title = "获取IP") + @RequiresPermissions("open:apitools:ipinfo") + public R getIPApiData(@PathVariable("ip")String ip) { + return R.ok(ipService.getIPApiData()); } } diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollChineseDictFactory.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollChineseDictFactory.java index 2945ab1b..8db6cbcb 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollChineseDictFactory.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollChineseDictFactory.java @@ -7,12 +7,12 @@ import com.xjs.apitools.domain.RequestBody; import com.xjs.apitools.factory.ApiToolsFactory; import com.xjs.common.client.api.roll.RollChineseDictFeignClient; import com.xjs.config.RollProperties; +import com.xjs.exception.ApiException; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import static com.xjs.consts.ApiConst.DEMOTE_ERROR; -import static com.xjs.consts.ApiConst.ROLL_CODE_SUCCESS; +import static com.xjs.consts.ApiConst.*; /** * roll平台获取汉语字典api工厂实现 @@ -39,6 +39,8 @@ public class RollChineseDictFactory implements ApiToolsFactory getIPApiData() { - return R.ok(ipService.getIPApiData()); - } + }