Merge branch 'master' of http://47.115.223.229:8888/yangjun/dbsd_kczx_java
This commit is contained in:
commit
45b6b8d48b
|
@ -1,38 +1,18 @@
|
||||||
package org.jeecg.modules.httpinterface.controller;
|
package org.jeecg.modules.httpinterface.controller;
|
||||||
|
|
||||||
import cn.hutool.core.convert.Convert;
|
|
||||||
import cn.hutool.core.net.url.UrlBuilder;
|
|
||||||
import cn.hutool.core.util.CharsetUtil;
|
|
||||||
import cn.hutool.crypto.SecureUtil;
|
|
||||||
import cn.hutool.http.HttpUtil;
|
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
||||||
import com.google.common.collect.Maps;
|
|
||||||
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.apache.commons.compress.utils.Lists;
|
|
||||||
import org.apache.commons.lang.StringUtils;
|
|
||||||
import org.jeecg.common.api.vo.Result;
|
import org.jeecg.common.api.vo.Result;
|
||||||
import org.jeecg.common.aspect.annotation.AutoLog;
|
import org.jeecg.common.aspect.annotation.AutoLog;
|
||||||
import org.jeecg.common.system.base.controller.JeecgController;
|
import org.jeecg.common.system.base.controller.JeecgController;
|
||||||
import org.jeecg.modules.kc.grab.exports.entity.TBks;
|
import org.jeecg.modules.kc.grab.exports.entity.TBks;
|
||||||
import org.jeecg.modules.kc.grab.exports.service.ITBksService;
|
import org.jeecg.modules.kc.grab.exports.service.ITBksService;
|
||||||
import org.jeecg.modules.kc.jiaoshi.entity.KcZhihuijiaoshi;
|
|
||||||
import org.jeecg.modules.kc.jiaoshi.entity.KcZhihuijiaoshiMonitorLog;
|
|
||||||
import org.jeecg.modules.kc.jiaoshi.entity.KcZhihuijiaoshiOperateLog;
|
|
||||||
import org.jeecg.modules.kc.jiaoshi.service.IKcZhihuijiaoshiMonitorLogService;
|
|
||||||
import org.jeecg.modules.kc.jiaoshi.service.IKcZhihuijiaoshiOperateLogService;
|
|
||||||
import org.jeecg.modules.kc.jiaoshi.service.IKcZhihuijiaoshiService;
|
|
||||||
import org.jeecg.modules.tools.office.pdf.PDFUtil;
|
import org.jeecg.modules.tools.office.pdf.PDFUtil;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Description: 对外部访问接口
|
* @Description: 对外部访问接口
|
||||||
* @Author: jeecg-boot
|
* @Author: jeecg-boot
|
||||||
|
@ -41,7 +21,7 @@ import java.util.Map;
|
||||||
*/
|
*/
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@Api(tags="对外部访问接口")
|
@Api(tags="对外部访问接口")
|
||||||
//@RestController
|
@RestController
|
||||||
@RequestMapping("/temp")
|
@RequestMapping("/temp")
|
||||||
public class testController extends JeecgController<TBks, ITBksService> {
|
public class testController extends JeecgController<TBks, ITBksService> {
|
||||||
|
|
||||||
|
@ -49,7 +29,7 @@ public class testController extends JeecgController<TBks, ITBksService> {
|
||||||
@ApiOperation(value="T_BKS-抓取-通过id查询", notes="T_BKS-抓取-通过id查询")
|
@ApiOperation(value="T_BKS-抓取-通过id查询", notes="T_BKS-抓取-通过id查询")
|
||||||
@GetMapping(value = "/testPDF")
|
@GetMapping(value = "/testPDF")
|
||||||
public Result<?> runAvyApiByIds(String ids,String type){
|
public Result<?> runAvyApiByIds(String ids,String type){
|
||||||
PDFUtil.office2PDF("F:\\temp\\test\\a.docx","F:\\temp\\test\\a.pdf");
|
PDFUtil.office2PDF("F:\\temp\\test\\a.docx","F:\\temp\\test\\b.pdf");
|
||||||
return Result.OK();
|
return Result.OK();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue