验收修改
This commit is contained in:
parent
312a170edf
commit
80d7f57e66
@ -15,6 +15,7 @@ import com.zhgd.xmgl.modules.wisdom.mapper.AttendanceDevMapper;
|
||||
import com.zhgd.xmgl.modules.wisdom.mapper.WorkerInfoMapper;
|
||||
import com.zhgd.xmgl.modules.wisdom.service.IAttendanceDevSyncService;
|
||||
import com.zhgd.xmgl.util.HttpUtil;
|
||||
import com.zhgd.xmgl.util.HttpsUtils;
|
||||
import com.zhgd.xmgl.util.ParamEnum;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
@ -155,7 +156,7 @@ public class AsyncAttendance {
|
||||
JSONObject jsonObject = JSONObject.parseObject(JSON.toJSONString(systemUserSyncVo));
|
||||
log.info("开始数据同步====" + jsonObject);
|
||||
// 推送同步信息
|
||||
String result = HttpUtil.doPost(requestUrl, jsonObject.toString());
|
||||
String result = HttpsUtils.doPost(requestUrl, jsonObject.toString());
|
||||
return result;
|
||||
}catch (Exception e){
|
||||
e.printStackTrace();
|
||||
|
||||
@ -126,6 +126,19 @@ public class FileController {
|
||||
// fileStorageService.download(fileInfo).outputStream(response.getOutputStream());
|
||||
// }
|
||||
|
||||
/**
|
||||
* 下载文件
|
||||
*/
|
||||
@OperLog(operModul = "文件管理", operType = "文件下载", operDesc = "文件下载")
|
||||
@ApiOperation(value = "文件下载", notes = "文件下载", httpMethod="POST")
|
||||
@ApiImplicitParam(name = "fileUrl", value = "文件路径", paramType = "body", dataType = "String")
|
||||
@PostMapping("/download")
|
||||
public void download(@ApiIgnore @RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
|
||||
// 获取文件信息
|
||||
String fileUrl = MapUtils.getString(map, "fileUrl");
|
||||
fileDetailService.download(fileUrl, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取预览文件流
|
||||
*/
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user