From e7257650302fdf30d685bfae8df3cc0405bb51f6 Mon Sep 17 00:00:00 2001 From: XMnhwj_BackTechnologyDevelopment <3512363680@qq.com> Date: Fri, 12 May 2023 14:28:29 +0800 Subject: [PATCH] =?UTF-8?q?2023-05-12=2011:23:36=20=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86=E7=9A=84=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E3=80=81=E6=A8=A1=E6=9D=BF=E4=B8=8B=E8=BD=BD=E3=80=81=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E6=8E=A5=E5=8F=A3!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/psdc/PsdcApplication.java | 8 +++---- .../com/psdc/service/IPsdcDeviceService.java | 2 +- .../service/impl/PsdcDeviceServiceImpl.java | 20 +++++++++++++++--- .../manager/PsdcDeviceController.java | 7 ++++-- .../resources/template/AllDevicesData.xlsx | Bin 9113 -> 9027 bytes 5 files changed, 27 insertions(+), 10 deletions(-) diff --git a/psdc-admin/src/main/java/com/psdc/PsdcApplication.java b/psdc-admin/src/main/java/com/psdc/PsdcApplication.java index 099e06d..3071f21 100644 --- a/psdc-admin/src/main/java/com/psdc/PsdcApplication.java +++ b/psdc-admin/src/main/java/com/psdc/PsdcApplication.java @@ -2,13 +2,13 @@ package com.psdc; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.transaction.annotation.EnableTransactionManagement; @SpringBootApplication() -public class PsdcApplication -{ - public static void main(String[] args) - { +@EnableTransactionManagement +public class PsdcApplication { + public static void main(String[] args) { SpringApplication.run(PsdcApplication.class, args); System.out.println("《= = = 系统启动成功 = = =》"); } diff --git a/psdc-business/src/main/java/com/psdc/service/IPsdcDeviceService.java b/psdc-business/src/main/java/com/psdc/service/IPsdcDeviceService.java index fee64de..322f809 100644 --- a/psdc-business/src/main/java/com/psdc/service/IPsdcDeviceService.java +++ b/psdc-business/src/main/java/com/psdc/service/IPsdcDeviceService.java @@ -64,7 +64,7 @@ public interface IPsdcDeviceService { */ boolean deleteById(Long[] deviceIds); - boolean daoruDevicesData(MultipartFile file); + boolean daoruDevicesData(MultipartFile file, String cjr); /** * 更新设备状态 diff --git a/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java b/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java index 264b392..cfa3086 100644 --- a/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java +++ b/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java @@ -9,6 +9,7 @@ import com.psdc.mapper.PsdcControlLogMapper; import com.psdc.mapper.PsdcDeviceMapper; import com.psdc.service.IPsdcDeviceService; import com.psdc.utils.SecurityUtils; +import com.psdc.utils.poi.ExcelUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -17,6 +18,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import java.io.InputStream; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -114,11 +116,23 @@ public class PsdcDeviceServiceImpl implements IPsdcDeviceService { @Override @Transactional(propagation = REQUIRES_NEW) - public boolean daoruDevicesData(MultipartFile file) { + public boolean daoruDevicesData(MultipartFile file, String cjr) { try { - //需要将上传文件转成Stream流 + // 需要将上传文件转成Stream流 InputStream in = file.getInputStream(); - // EasyExcel.read(in, PsdcDevice.class, new DevicesDataListener(psdcDeviceMapper)).sheet().sheetNo(0).doRead(); + ExcelUtil util = new ExcelUtil<>(PsdcDevice.class); + List devices = util.importExcel(in); + for (PsdcDevice pd : devices){ + pd.setCreateBy(cjr); + pd.setCreateTime(new Date()); + pd.setDeviceType(Integer.parseInt(pd.getDevType())); + // 新导入的设备默认状态为: 未激活 + // 新导入的设备默认启动时间为null,请在设备激活后手动修改! + pd.setDeviceStatus(1); + // 新导入的设备默认运行状态为: 关闭 + pd.setDeviceRunstatus(2); + } + psdcDeviceMapper.saveDevicesData(devices); return true; } catch (Exception e) { e.printStackTrace(); diff --git a/psdc-web/src/main/java/com/psdc/controller/manager/PsdcDeviceController.java b/psdc-web/src/main/java/com/psdc/controller/manager/PsdcDeviceController.java index 6fa3511..45cdd03 100644 --- a/psdc-web/src/main/java/com/psdc/controller/manager/PsdcDeviceController.java +++ b/psdc-web/src/main/java/com/psdc/controller/manager/PsdcDeviceController.java @@ -162,10 +162,13 @@ public class PsdcDeviceController extends BaseController { excel文件的读取 */ @RequestMapping("/daoruDevData") - @PreAuthorize("hasAuthority('addevice')") + @PreAuthorize("@ss.hasPermi('manager:device:list')") + @Log(title = "设备管理", businessType = BusinessType.IMPORT) @Transactional(rollbackFor = Exception.class) public AjaxResult daoruDevData(@RequestPart("file") MultipartFile file) { - return toAjax(psdcDeviceService.daoruDevicesData(file)); + long userId = SecurityUtils.getUserId(); + String cjr = sysUserService.selectUserById(userId).getUserName(); + return toAjax(psdcDeviceService.daoruDevicesData(file, cjr)); } } diff --git a/psdc-web/src/main/resources/template/AllDevicesData.xlsx b/psdc-web/src/main/resources/template/AllDevicesData.xlsx index 71c6db9475b3985b6c78d2822492982d820bfa9c..7f033176e082e58fe64ea5b37d591fa18d79000f 100644 GIT binary patch delta 3950 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 delta 4051 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