安全带接入
This commit is contained in:
parent
9f995931c2
commit
eb3a5ed001
@ -178,8 +178,8 @@ public class SafetyHatDevController {
|
|||||||
OutputStream out = response.getOutputStream();
|
OutputStream out = response.getOutputStream();
|
||||||
response.setCharacterEncoding("UTF-8");
|
response.setCharacterEncoding("UTF-8");
|
||||||
response.setContentType("application/vnd.ms-excel;charset=gb2312");
|
response.setContentType("application/vnd.ms-excel;charset=gb2312");
|
||||||
response.setHeader("Content-disposition", "attachment;filename=" + URLEncoder.encode("安全帽设备导入模板.xlsx", "UTF-8"));
|
response.setHeader("Content-disposition", "attachment;filename=" + URLEncoder.encode("安全带设备导入模板.xlsx", "UTF-8"));
|
||||||
InputStream fis = new ClassPathResource("excel/安全帽设备导入模板.xlsx").getInputStream();
|
InputStream fis = new ClassPathResource("excel/安全带设备导入模板.xlsx").getInputStream();
|
||||||
IOUtils.copy(fis, out);
|
IOUtils.copy(fis, out);
|
||||||
out.flush();
|
out.flush();
|
||||||
out.close();
|
out.close();
|
||||||
|
|||||||
@ -176,14 +176,14 @@ public class SafetyHatDevServiceImpl extends ServiceImpl<SafetyHatDevMapper, Saf
|
|||||||
if (oneDev != null) {
|
if (oneDev != null) {
|
||||||
oneDev.setWorkerInfoId(workerInfo.getId());
|
oneDev.setWorkerInfoId(workerInfo.getId());
|
||||||
oneDev.setProjectSn(projectSn);
|
oneDev.setProjectSn(projectSn);
|
||||||
oneDev.setFenceId(String.valueOf(fenceId));
|
oneDev.setFenceId(fenceId == null ? "" : String.valueOf(fenceId));
|
||||||
baseMapper.updateById(oneDev);
|
baseMapper.updateById(oneDev);
|
||||||
} else {
|
} else {
|
||||||
SafetyHatDev dev = new SafetyHatDev();
|
SafetyHatDev dev = new SafetyHatDev();
|
||||||
dev.setWorkerInfoId(workerInfo.getId());
|
dev.setWorkerInfoId(workerInfo.getId());
|
||||||
dev.setDevSn(devSn);
|
dev.setDevSn(devSn);
|
||||||
dev.setProjectSn(projectSn);
|
dev.setProjectSn(projectSn);
|
||||||
dev.setFenceId(String.valueOf(fenceId));
|
dev.setFenceId(fenceId == null ? "" : String.valueOf(fenceId));
|
||||||
dev.setType(type);
|
dev.setType(type);
|
||||||
baseMapper.insert(dev);
|
baseMapper.insert(dev);
|
||||||
}
|
}
|
||||||
|
|||||||
BIN
src/main/resources/excel/安全带设备导入模板.xlsx
Normal file
BIN
src/main/resources/excel/安全带设备导入模板.xlsx
Normal file
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user