Compare commits

...

3 Commits
master ... dev

  1. 101
      ant-design-vue-jeecg/src/views/py/PyAddProject.vue
  2. 29
      jeecg-boot/jeecg-boot-module-cms/pom.xml
  3. 145
      jeecg-boot/jeecg-boot-module-cms/src/main/java/org/jeecg/modules/cms/spack/JacobSpeakController.java
  4. 4
      jeecg-boot/jeecg-boot-module-cms/src/main/java/org/jeecg/modules/cms/webmagic/controller/NewsWebMagicController.java
  5. BIN
      jeecg-boot/jeecg-boot-module-system/src/main/resources/static/jacob-1.18-x64.rar
  6. 24
      jeecg-boot/package-lock.json
  7. 5
      jeecg-boot/package.json
  8. BIN
      jeecg-boot/text.wav

@ -1,19 +1,21 @@
<template> <template>
<a-card>
<el-page-header @back="goBack" cellpadding="30px" style="margin-bottom: 30px;"> </el-page-header>
<a-spin :spinning="confirmLoading"> <a-spin :spinning="confirmLoading">
<el-page-header @back="goBack" cellpadding="30px"> </el-page-header> <!-- <el-page-header @back="goBack" cellpadding="30px"> </el-page-header> -->
<a-form :form="form" cellpadding="30px"> <a-form :form="form" cellpadding="30px" style="width: 80%; margin: 0 auto;">
<a-row> <a-row>
<a-col :span="24"> <a-col :span="8">
<a-form-item label="专业代号" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="专业代号" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input placeholder="专业代号" readonly v-model="code"></a-input> <a-input placeholder="专业代号" readonly v-model="code"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="8">
<a-form-item label="所属学院" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="所属学院" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-select-depart v-decorator="['collegeId', validatorRules.collegeId]"/> <j-select-depart v-decorator="['collegeId', validatorRules.collegeId]"/>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="8">
<a-form-item label="所属专业" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="所属专业" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag <j-dict-select-tag
type="list" type="list"
@ -25,12 +27,12 @@
/> />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="8">
<a-form-item label="版本" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="版本" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['version', validatorRules.version]" placeholder="请输入版本"></a-input> <a-input v-decorator="['version', validatorRules.version]" placeholder="请输入版本"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="8">
<a-form-item label="主干学科" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="主干学科" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input <a-input
v-decorator="['mainSubject', validatorRules.mainSubject]" v-decorator="['mainSubject', validatorRules.mainSubject]"
@ -38,7 +40,7 @@
></a-input> ></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="8">
<a-form-item label="专业方向" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="专业方向" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input <a-input
v-decorator="['majorDirection', validatorRules.majorDirection]" v-decorator="['majorDirection', validatorRules.majorDirection]"
@ -46,7 +48,7 @@
></a-input> ></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24"> <!-- <a-col :span="24">
<a-form-item label="核心课程" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="核心课程" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-textarea <a-textarea
v-decorator="['coreCourse', validatorRules.coreCourse]" v-decorator="['coreCourse', validatorRules.coreCourse]"
@ -63,8 +65,8 @@
placeholder="请输入实践性教学环节" placeholder="请输入实践性教学环节"
/> />
</a-form-item> </a-form-item>
</a-col> </a-col> -->
<a-col :span="24"> <a-col :span="8">
<a-form-item label="学制" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="学制" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag type="list" v-decorator="['eduTime', validatorRules.eduTime]" dictCode="eduTime" <j-dict-select-tag type="list" v-decorator="['eduTime', validatorRules.eduTime]" dictCode="eduTime"
placeholder="请选择学制"/> placeholder="请选择学制"/>
@ -84,7 +86,7 @@
</a-select>--> </a-select>-->
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="8">
<a-form-item label="学位" :labelCol="labelCol" :wrapperCol="wrapperCol" > <a-form-item label="学位" :labelCol="labelCol" :wrapperCol="wrapperCol" >
<j-dict-select-tag <j-dict-select-tag
type="list" type="list"
@ -95,12 +97,12 @@
/> />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="8">
<a-form-item label="学分" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="学分" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['credit', {}]" placeholder="请输入学分" oninput="if (value.length>100){value=value.slice(0,100);alert('最大输入长度100位')}"></a-input> <a-input v-decorator="['credit', {}]" placeholder="请输入学分" oninput="if (value.length>100){value=value.slice(0,100);alert('最大输入长度100位')}"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="8">
<a-form-item label="修学年限" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="修学年限" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag <j-dict-select-tag
type="list" type="list"
@ -124,8 +126,28 @@
</a-select>--> </a-select>-->
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row>
<a-row>
<a-col :span="24">
<a-form-item label="核心课程" :labelCol="labelCol1" :wrapperCol="wrapperCol1">
<a-textarea
v-decorator="['coreCourse', validatorRules.coreCourse]"
rows="4"
placeholder="请输入核心课程"
/>
</a-form-item>
</a-col>
<a-col :span="24"> <a-col :span="24">
<a-form-item label="教学进程安排表" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="实践教学" :labelCol="labelCol1" :wrapperCol="wrapperCol1">
<a-textarea
v-decorator="['practiceTeach', validatorRules.practiceTeach]"
rows="4"
placeholder="请输入实践性教学环节"
/>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="教学进程安排表" :labelCol="labelCol2" :wrapperCol="wrapperCol2">
<!-- <j-markdown-editor v-decorator="['fulltt']" id="fulltt"></j-markdown-editor>--> <!-- <j-markdown-editor v-decorator="['fulltt']" id="fulltt"></j-markdown-editor>-->
<j-editor style="width: 100%" v-decorator="['fulltt',{trigger:'input'}]"/> <j-editor style="width: 100%" v-decorator="['fulltt',{trigger:'input'}]"/>
</a-form-item> </a-form-item>
@ -135,12 +157,13 @@
<!-- 修改 --> <!-- 修改 -->
<!-- modify by zhc 10.27 --> <!-- modify by zhc 10.27 -->
<div> <div class="centerbox">
<el-button type="primary" size="small" @click="handleOk" class="el-right">确定</el-button> <el-button type="primary" size="small" @click="handleOk" class="el-right">确定</el-button>
<el-button type="primary" size="small" @click="handleOk" class="el-right">暂存</el-button> <el-button type="primary" size="small" @click="handleOk" class="el-right">暂存</el-button>
<el-button type="danger" @click="open" size="small" class="el-right">关闭</el-button> <el-button type="danger" @click="open" size="small" class="el-right">关闭</el-button>
</div> </div>
</a-spin> </a-spin>
</a-card>
</template> </template>
@ -170,15 +193,38 @@ export default {
width: 1200, width: 1200,
visible: false, visible: false,
model: {}, model: {},
// labelCol: {
// xs: {span: 24},
// sm: {span: 5}
// },
// wrapperCol: {
// xs: {span: 24},
// sm: {span: 16}
// },
labelCol: { labelCol: {
xs: {span: 24}, xs: {span: 24},
sm: {span: 5} sm: {span: 6,offset:3 }
}, },
wrapperCol: { wrapperCol: {
xs: {span: 24}, xs: {span: 24},
sm: {span: 16} sm: {span: 15}
},
labelCol1: {
xs: {span: 24},
sm: {span: 2,offset:1 }
},
wrapperCol1: {
xs: {span: 24},
sm: {span: 21}
},
labelCol2: {
xs: {span: 24},
sm: {span: 3}
},
wrapperCol2: {
xs: {span: 24},
sm: {span: 21}
}, },
confirmLoading: false, confirmLoading: false,
validatorRules: { validatorRules: {
majorCode: { majorCode: {
@ -434,12 +480,15 @@ export default {
// .button-container { // .button-container {
// margin-left: 100px; // margin-left: 100px;
// } // }
.el-left{ // .el-left{
float: right; // float: right;
margin:10px // margin:10px
} // }
.el-right{ // .el-right{
float: right; // float: right;
margin:10px // margin:10px
// }
.centerbox{
text-align: center;
} }
</style> </style>

@ -36,6 +36,33 @@
<!-- </exclusion>--> <!-- </exclusion>-->
<!-- </exclusions>--> <!-- </exclusions>-->
</dependency> </dependency>
</dependencies>
<!-- https://mvnrepository.com/artifact/com.jacob/jacob 文字转语音 -->
<dependency>
<groupId>com.hynnet</groupId>
<artifactId>jacob</artifactId>
<version>1.18</version>
</dependency>
<!-- 播放MP3音乐 -->
<dependency>
<groupId>com.googlecode.soundlibs</groupId>
<artifactId>mp3spi</artifactId>
<version>1.9.5.4</version>
</dependency>
<!-- 如果需要解码播放flac文件则引入这个jar包 -->
<dependency>
<groupId>org.jflac</groupId>
<artifactId>jflac-codec</artifactId>
<version>1.5.2</version>
</dependency>
<!--播放音乐 使用第三方解决方案 (jaudiotagger.jar)-->
<dependency>
<groupId>org</groupId>
<artifactId>jaudiotagger</artifactId>
<version>2.0.3</version>
</dependency>
</dependencies>
</project> </project>

@ -0,0 +1,145 @@
package org.jeecg.modules.cms.spack;
import com.jacob.activeX.ActiveXComponent;
import com.jacob.com.Dispatch;
import com.jacob.com.Variant;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
/**
* @ClassName -> JacobTest
* @Description
* @Author 龙岭
* @Date 2021-01-08 11:44
* @Version 1.0
* @MONTH 01
*/
@Api(tags = "文本转语言-语音合成")
@RestController
@RequestMapping("/tts")
@Slf4j
public class JacobSpeakController {
@ApiOperation(value = "语音合成", notes = "语音合成")
@GetMapping(value = "/speak")
public Result speak(@RequestParam(name = "text") String text) {
ActiveXComponent ax = null;
try {
ax = new ActiveXComponent("Sapi.SpVoice");
// 运行时输出语音内容
Dispatch spVoice = ax.getObject();
// 音量 0-100
ax.setProperty("Volume", new Variant(100));
// 语音朗读速度 -10 到 +10
ax.setProperty("Rate", new Variant(-2));
// 执行朗读
Dispatch.call(spVoice, "Speak", new Variant(text));
// 下面是构建文件流把生成语音文件
ax = new ActiveXComponent("Sapi.SpFileStream");
Dispatch spFileStream = ax.getObject();
ax = new ActiveXComponent("Sapi.SpAudioFormat");
Dispatch spAudioFormat = ax.getObject();
// 设置音频流格式
Dispatch.put(spAudioFormat, "Type", new Variant(22));
// 设置文件输出流格式
Dispatch.putRef(spFileStream, "Format", spAudioFormat);
// 调用输出 文件流打开方法,创建一个.wav文件
Dispatch.call(spFileStream, "Open", new Variant("./text.wav"), new Variant(3), new Variant(true));
// 设置声音对象的音频输出流为输出文件对象
Dispatch.putRef(spVoice, "AudioOutputStream", spFileStream);
// 设置音量 0到100
Dispatch.put(spVoice, "Volume", new Variant(100));
// 设置朗读速度
Dispatch.put(spVoice, "Rate", new Variant(-2));
// 开始朗读
Dispatch.call(spVoice, "Speak", new Variant(text));
// 关闭输出文件
Dispatch.call(spFileStream, "Close");
Dispatch.putRef(spVoice, "AudioOutputStream", null);
spAudioFormat.safeRelease();
spFileStream.safeRelease();
spVoice.safeRelease();
ax.safeRelease();
} catch (Exception e) {
e.printStackTrace();
}
return Result.OK();
}
/**
* 语音转文字并播放
*
* @param text
*/
public static void textToSpeech(String text) {
ActiveXComponent ax = null;
try {
ax = new ActiveXComponent("Sapi.SpVoice");
// 运行时输出语音内容
Dispatch spVoice = ax.getObject();
// 音量 0-100
ax.setProperty("Volume", new Variant(100));
// 语音朗读速度 -10 到 +10
ax.setProperty("Rate", new Variant(-2));
// 执行朗读
Dispatch.call(spVoice, "Speak", new Variant(text));
// 下面是构建文件流把生成语音文件
ax = new ActiveXComponent("Sapi.SpFileStream");
Dispatch spFileStream = ax.getObject();
ax = new ActiveXComponent("Sapi.SpAudioFormat");
Dispatch spAudioFormat = ax.getObject();
// 设置音频流格式
Dispatch.put(spAudioFormat, "Type", new Variant(22));
// 设置文件输出流格式
Dispatch.putRef(spFileStream, "Format", spAudioFormat);
// 调用输出 文件流打开方法,创建一个.wav文件
Dispatch.call(spFileStream, "Open", new Variant("./text.wav"), new Variant(3), new Variant(true));
// 设置声音对象的音频输出流为输出文件对象
Dispatch.putRef(spVoice, "AudioOutputStream", spFileStream);
// 设置音量 0到100
Dispatch.put(spVoice, "Volume", new Variant(100));
// 设置朗读速度
Dispatch.put(spVoice, "Rate", new Variant(-2));
// 开始朗读
Dispatch.call(spVoice, "Speak", new Variant(text));
// 关闭输出文件
Dispatch.call(spFileStream, "Close");
Dispatch.putRef(spVoice, "AudioOutputStream", null);
spAudioFormat.safeRelease();
spFileStream.safeRelease();
spVoice.safeRelease();
ax.safeRelease();
} catch (Exception e) {
e.printStackTrace();
}
}
public static void main(String[] args) {
textToSpeech("测试语音测试语音测试语音");
}
}

@ -3,6 +3,7 @@ package org.jeecg.modules.cms.webmagic.controller;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.cms.webmagic.service.NewsPageProcessor; import org.jeecg.modules.cms.webmagic.service.NewsPageProcessor;
import org.jeecg.modules.cms.webmagic.service.NewsPipeline; import org.jeecg.modules.cms.webmagic.service.NewsPipeline;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -25,7 +26,7 @@ public class NewsWebMagicController {
@ApiOperation(value = "国际学院-新联动态爬虫", notes = "国际学院-新联动态爬虫") @ApiOperation(value = "国际学院-新联动态爬虫", notes = "国际学院-新联动态爬虫")
@GetMapping(value = "/crawl") @GetMapping(value = "/crawl")
public void crawl() { public Result crawl() {
String page1 = "http://sie.huanghuai.edu.cn/index.php/item-list-category-13151.shtml"; String page1 = "http://sie.huanghuai.edu.cn/index.php/item-list-category-13151.shtml";
String pageOther = "http://sie.huanghuai.edu.cn/index.php/item-list-category-13151-page-"; String pageOther = "http://sie.huanghuai.edu.cn/index.php/item-list-category-13151-page-";
String url = ""; String url = "";
@ -63,5 +64,6 @@ public class NewsWebMagicController {
// log.error("定时抓取数据线程执行异常", ex); // log.error("定时抓取数据线程执行异常", ex);
// } // }
// } // }
return Result.OK();
} }
} }

@ -0,0 +1,24 @@
{
"name": "jeecg-boot",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"dependencies": {
"speak-tts": "^2.0.8"
}
},
"node_modules/speak-tts": {
"version": "2.0.8",
"resolved": "https://registry.npmmirror.com/speak-tts/-/speak-tts-2.0.8.tgz",
"integrity": "sha512-VY6Q6mRjdou6bF+x0LspvM7GJhBxHx8CLyGPTNQQ7jrztiGutyI4QNZn0cA17c4uk0FnFbA4PaMI3skeZ6PiFg=="
}
},
"dependencies": {
"speak-tts": {
"version": "2.0.8",
"resolved": "https://registry.npmmirror.com/speak-tts/-/speak-tts-2.0.8.tgz",
"integrity": "sha512-VY6Q6mRjdou6bF+x0LspvM7GJhBxHx8CLyGPTNQQ7jrztiGutyI4QNZn0cA17c4uk0FnFbA4PaMI3skeZ6PiFg=="
}
}
}

@ -0,0 +1,5 @@
{
"dependencies": {
"speak-tts": "^2.0.8"
}
}

Binary file not shown.
Loading…
Cancel
Save