安全带接入

src/main/java/com/zhgd/xmgl/modules/safetyhat/controller/SafetyHatDevController.java

@@ -178,8 +178,8 @@ public class SafetyHatDevController {
             OutputStream out = response.getOutputStream();
             response.setCharacterEncoding("UTF-8");
             response.setContentType("application/vnd.ms-excel;charset=gb2312");
-            response.setHeader("Content-disposition", "attachment;filename=" + URLEncoder.encode("安全帽设备导入模板.xlsx", "UTF-8"));
-            InputStream fis = new ClassPathResource("excel/安全帽设备导入模板.xlsx").getInputStream();
+            response.setHeader("Content-disposition", "attachment;filename=" + URLEncoder.encode("安全带设备导入模板.xlsx", "UTF-8"));
+            InputStream fis = new ClassPathResource("excel/安全带设备导入模板.xlsx").getInputStream();
             IOUtils.copy(fis, out);
             out.flush();
             out.close();

src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDevServiceImpl.java

@@ -176,14 +176,14 @@ public class SafetyHatDevServiceImpl extends ServiceImpl<SafetyHatDevMapper, Saf
             if (oneDev != null) {
                 oneDev.setWorkerInfoId(workerInfo.getId());
                 oneDev.setProjectSn(projectSn);
-                oneDev.setFenceId(String.valueOf(fenceId));
+                oneDev.setFenceId(fenceId == null ? "" : String.valueOf(fenceId));
                 baseMapper.updateById(oneDev);
             } else {
                 SafetyHatDev dev = new SafetyHatDev();
                 dev.setWorkerInfoId(workerInfo.getId());
                 dev.setDevSn(devSn);
                 dev.setProjectSn(projectSn);
-                dev.setFenceId(String.valueOf(fenceId));
+                dev.setFenceId(fenceId == null ? "" : String.valueOf(fenceId));
                 dev.setType(type);
                 baseMapper.insert(dev);
             }