admin/wisdomisitezw_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

验收修改

Browse Source
This commit is contained in:
pengjie 2024-05-21 18:51:03 +08:00
parent 312a170edf
commit 80d7f57e66
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/zhgd/xmgl/async/AsyncAttendance.java
View File

@ -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.mapper.WorkerInfoMapper;
import com.zhgd.xmgl.modules.wisdom.service.IAttendanceDevSyncService; import com.zhgd.xmgl.modules.wisdom.service.IAttendanceDevSyncService;
import com.zhgd.xmgl.util.HttpUtil; import com.zhgd.xmgl.util.HttpUtil;
import com.zhgd.xmgl.util.HttpsUtils;
import com.zhgd.xmgl.util.ParamEnum; import com.zhgd.xmgl.util.ParamEnum;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
@ -155,7 +156,7 @@ public class AsyncAttendance {
JSONObject jsonObject = JSONObject.parseObject(JSON.toJSONString(systemUserSyncVo)); JSONObject jsonObject = JSONObject.parseObject(JSON.toJSONString(systemUserSyncVo));
log.info("开始数据同步====" + jsonObject); log.info("开始数据同步====" + jsonObject);
// 推送同步信息 // 推送同步信息
String result = HttpUtil.doPost(requestUrl, jsonObject.toString()); String result = HttpsUtils.doPost(requestUrl, jsonObject.toString());
return result; return result;
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();

13
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/FileController.java
View File

@ -126,6 +126,19 @@ public class FileController {
// fileStorageService.download(fileInfo).outputStream(response.getOutputStream()); // 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);
}
/** /**
* 获取预览文件流 * 获取预览文件流
*/ */