导入修改2

fiveep-controller/src/main/java/com/bizmatics/controller/web/DeviceAnalogVariableListController.java

@@ -140,7 +140,7 @@ public class DeviceAnalogVariableListController {
      * @throws Exception
      */
     @PostMapping("/variableListImport")
-    public ApiResult<Void> variableListImport(@RequestParam("file") MultipartFile file) throws Exception {
+    public ApiResult<Void> variableListImport(@RequestParam("file") MultipartFile file){
         deviceAnalogVariableListService.variableListImport(file);
         return ApiResult.success();
     }

fiveep-controller/src/main/java/com/bizmatics/controller/web/DeviceAttributeController.java

@@ -57,10 +57,10 @@ public class DeviceAttributeController {
      * @return
      */
     @GetMapping("deviceNewsList")
-    public ApiResult<CommonPage<DeviceAttribute>> deviceNewsList(@RequestParam int siteId,
-                                                                 @RequestParam(value = "id", required = false, defaultValue = "0") int id,
-                                                                 @RequestParam(value = "size", required = false, defaultValue = "15") int size,
-                                                                 @RequestParam(value = "current", required = false, defaultValue = "1") int current
+    public ApiResult<CommonPage<DeviceAttribute>> deviceNewsList(@RequestParam Integer siteId,
+                                                                 @RequestParam(value = "id", required = false, defaultValue = "0") Integer id,
+                                                                 @RequestParam(value = "size", required = false, defaultValue = "15") Integer size,
+                                                                 @RequestParam(value = "current", required = false, defaultValue = "1") Integer current
     ) {
         return ApiResult.success(deviceAttributeService.deviceNewsList(id, siteId, size, current));
     }
@@ -72,7 +72,7 @@ public class DeviceAttributeController {
      * @return
      */
     @GetMapping("deviceNewsDel")
-    public ApiResult<Void> deviceNewsDel(@RequestParam int id) {
+    public ApiResult<Void> deviceNewsDel(@RequestParam Integer id) {
         deviceAttributeService.deviceNewsDel(id);
         return ApiResult.success();
     }
@@ -85,8 +85,8 @@ public class DeviceAttributeController {
      */
     @GetMapping("monitorDeviceList")
     public ApiResult<CommonPage<MonitorDeviceListVO>> monitorDeviceList(@RequestParam(required = false) String siteName,
-                                                                        @RequestParam(value = "size", required = false, defaultValue = "15") int size,
-                                                                        @RequestParam(value = "current", required = false, defaultValue = "1") int current) {
+                                                                        @RequestParam(value = "size", required = false, defaultValue = "15") Integer size,
+                                                                        @RequestParam(value = "current", required = false, defaultValue = "1") Integer current) {
         return ApiResult.success(deviceAttributeService.monitorDeviceList(siteName, size, current));
     }
 
@@ -98,21 +98,21 @@ public class DeviceAttributeController {
      * @return
      */
     @GetMapping("deviceAttributeExport")
-    public ApiResult<String> deviceAttributeExport(@RequestParam int siteId,
-                                                   @RequestParam(value = "id", required = false, defaultValue = "0") int id
+    public ApiResult<String> deviceAttributeExport(@RequestParam Integer siteId,
+                                                   @RequestParam(value = "id", required = false, defaultValue = "0") Integer id
     ) {
         return ApiResult.success(deviceAttributeService.deviceAttributeExport(id, siteId));
     }
 
     /**
      * 监控设备-导入
-     * @param multipartFile 导入文件
+     * @param file 导入文件
      * @return
      * @throws Exception
      */
     @PostMapping("/deviceAttributeImport")
-    public ApiResult<Void> deviceAttributeImport(@RequestParam("file") MultipartFile multipartFile) throws Exception {
-        deviceAttributeService.deviceAttributeImport(multipartFile);
+    public ApiResult<Void> deviceAttributeImport(@RequestParam("file") MultipartFile file) {
+        deviceAttributeService.deviceAttributeImport(file);
         return ApiResult.success();
     }
 

fiveep-controller/src/main/java/com/bizmatics/controller/web/DeviceController.java

@@ -228,13 +228,13 @@ public class DeviceController {
     /**
      * 通信设备-导入
      *
-     * @param multipartFile 导入文件
+     * @param file 导入文件
      * @return
      * @throws Exception
      */
     @PostMapping("/deviceImport")
-    public ApiResult<Void> deviceImport(@RequestParam("file") MultipartFile multipartFile){
-        deviceService.deviceImport(multipartFile);
+    public ApiResult<Void> deviceImport(@RequestParam("file") MultipartFile file){
+        deviceService.deviceImport(file);
         return ApiResult.success();
     }
 }

fiveep-service/src/main/java/com/bizmatics/service/DeviceAnalogVariableListService.java

@@ -32,7 +32,7 @@ public interface DeviceAnalogVariableListService extends CrudService<DeviceAnalo
 
     String variableListExport(Integer siteId, String variableName, Integer dataArea);
 
-    void variableListImport(MultipartFile multipartFile) throws Exception;
+    void variableListImport(MultipartFile multipartFile);
 
 
 }

fiveep-service/src/main/java/com/bizmatics/service/DeviceAttributeService.java

@@ -29,5 +29,5 @@ public interface DeviceAttributeService extends CrudService<DeviceAttribute> {
 
     String deviceAttributeExport(Integer id, Integer siteId);
 
-    void deviceAttributeImport(MultipartFile multipartFile) throws Exception;
+    void deviceAttributeImport(MultipartFile multipartFile);
 }

fiveep-service/src/main/java/com/bizmatics/service/impl/DeviceAnalogVariableListServiceImpl.java

@@ -6,6 +6,7 @@ import cn.afterturn.easypoi.excel.entity.ExportParams;
 import cn.afterturn.easypoi.excel.entity.ImportParams;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bizmatics.common.core.bean.CommonPage;
@@ -23,10 +24,7 @@ import com.bizmatics.model.vo.DeviceAnalogVariableListVo;
 import com.bizmatics.persistence.mapper.DeviceAnalogVariableListMapper;
 import com.bizmatics.service.DeviceAnalogVariableListService;
 import com.bizmatics.service.util.SecurityUtils;
-import com.bizmatics.service.vo.DeviceAnalogVariableListExportVO;
-import com.bizmatics.service.vo.DeviceAnalogVariableListImport;
-import com.bizmatics.service.vo.DeviceAttributeExportVO;
-import com.bizmatics.service.vo.DeviceAttributeImportVo;
+import com.bizmatics.service.vo.*;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
@@ -157,30 +155,27 @@ public class DeviceAnalogVariableListServiceImpl extends AbstractCrudService<Dev
     }
 
     @Override
-    public void variableListImport(MultipartFile multipartFile) throws Exception {
+    public void variableListImport(MultipartFile multipartFile){
         SysUser user = SecurityUtils.getLoginUser().getUser();
         ImportParams params = new ImportParams();
         params.setHeadRows(1);
-        List<DeviceAnalogVariableListImport> result = ExcelImportUtil.importExcel(multipartFile.getInputStream(),
-                DeviceAnalogVariableListImport.class, params);
-        if (result.size()>0){
-            for (int i = 0; i < result.size(); i++) {
-                DeviceAnalogVariableList deviceAnalogVariableList = new DeviceAnalogVariableList();
-                deviceAnalogVariableList.setDeviceCode(result.get(i).getDeviceCode());
-                deviceAnalogVariableList.setVariableName(result.get(i).getVariableName());
-                deviceAnalogVariableList.setVariableCoding(result.get(i).getDeviceCode()+"_"+result.get(i).getVariableCoding());
-                deviceAnalogVariableList.setMonitoringEquipment(result.get(i).getMonitoringEquipment());
-                deviceAnalogVariableList.setCommunicationEquipment(result.get(i).getCommunicationEquipment());
-                deviceAnalogVariableList.setDataType(result.get(i).getDataType());
-                deviceAnalogVariableList.setCoefficient(result.get(i).getCoefficient());
-                deviceAnalogVariableList.setSaveCycle(result.get(i).getSaveCycle());
-                deviceAnalogVariableList.setDataArea(result.get(i).getDataArea());
-                deviceAnalogVariableList.setDataAddress(result.get(i).getDataAddress());
-                deviceAnalogVariableList.setStatus(1);
-                deviceAnalogVariableList.setCreator(user.getUserName());
-                deviceAnalogVariableList.setCreateTime(new Date());
-                this.save(deviceAnalogVariableList);
+        try {
+            List<DeviceAnalogVariableListImport> deviceAnalogVariableListImportList = ExcelImportUtil.importExcel(multipartFile.getInputStream(),
+                    DeviceAnalogVariableListImport.class, params);
+            if (CollectionUtils.isNotEmpty(deviceAnalogVariableListImportList)){
+                for (DeviceAnalogVariableListImport deviceAnalogVariableListImportLists:deviceAnalogVariableListImportList) {
+                    DeviceAnalogVariableList deviceAnalogVariableList = BeanMapperUtils.map(deviceAnalogVariableListImportLists, DeviceAnalogVariableList.class);
+                    deviceAnalogVariableList.setVariableCoding(deviceAnalogVariableListImportLists.getDeviceCode()+"_"+deviceAnalogVariableListImportLists.getVariableCoding());
+                    deviceAnalogVariableList.setStatus(1);
+                    deviceAnalogVariableList.setCreator(user.getUserName());
+                    deviceAnalogVariableList.setCreateTime(new Date());
+                    this.save(deviceAnalogVariableList);
+                }
+            }else {
+                throw new BusinessException("文件不能为空");
             }
+        }catch (Exception e){
+            throw  new BusinessException("文件导入失败"+e.getMessage());
         }
     }
 

fiveep-service/src/main/java/com/bizmatics/service/impl/DeviceAttributeServiceImpl.java

@@ -6,6 +6,7 @@ import cn.afterturn.easypoi.excel.entity.ExportParams;
 import cn.afterturn.easypoi.excel.entity.ImportParams;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bizmatics.common.core.bean.CommonPage;
@@ -14,6 +15,7 @@ import com.bizmatics.common.core.util.BeanMapperUtils;
 import com.bizmatics.common.core.util.FileUtils;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.common.spring.util.GlobalUtils;
+import com.bizmatics.model.Device;
 import com.bizmatics.model.DeviceAttribute;
 import com.bizmatics.model.system.SysUser;
 import com.bizmatics.model.vo.MonitorDeviceListVO;
@@ -23,6 +25,7 @@ import com.bizmatics.service.DeviceService;
 import com.bizmatics.service.util.SecurityUtils;
 import com.bizmatics.service.vo.DeviceAttributeExportVO;
 import com.bizmatics.service.vo.DeviceAttributeImportVo;
+import com.bizmatics.service.vo.DeviceImportVo;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -142,29 +145,27 @@ public class DeviceAttributeServiceImpl extends AbstractCrudService<DeviceAttrib
 
 
     @Override
-    public void deviceAttributeImport(MultipartFile multipartFile) throws Exception {
+    public void deviceAttributeImport(MultipartFile multipartFile){
         SysUser user = SecurityUtils.getLoginUser().getUser();
         ImportParams params = new ImportParams();
         params.setHeadRows(1);
-        List<DeviceAttributeImportVo> result = ExcelImportUtil.importExcel(multipartFile.getInputStream(),
-                DeviceAttributeImportVo.class, params);
-        if (result.size()>0){
-            for (int i = 0; i < result.size(); i++) {
-                DeviceAttribute deviceAttribute = new DeviceAttribute();
-                deviceAttribute.setMonitorDeviceCode(result.get(i).getMonitorDeviceCode());
-                deviceAttribute.setMonitorDeviceName(result.get(i).getMonitorDeviceName());
-                deviceAttribute.setLoopMeterAddress(result.get(i).getLoopMeterAddress());
-                deviceAttribute.setRatedCurrent(result.get(i).getRatedCurrent());
-                deviceAttribute.setCurrentLoadRate(result.get(i).getCurrentLoadRate());
-                deviceAttribute.setSiteId(result.get(i).getSiteId());
-                deviceAttribute.setVariableListId(0);
-                deviceAttribute.setQualityAnalysis(result.get(i).getQualityAnalysis());
-                deviceAttribute.setStatus(1);
-                deviceAttribute.setCreator(user.getUserName());
-                deviceAttribute.setCreateTime(new Date());
-                this.save(deviceAttribute);
+        try {
+            List<DeviceAttributeImportVo> deviceAttributeImportVoList = ExcelImportUtil.importExcel(multipartFile.getInputStream(),
+                    DeviceAttributeImportVo.class, params);
+            if (CollectionUtils.isNotEmpty(deviceAttributeImportVoList)){
+                for (DeviceAttributeImportVo deviceAttributeImportVos:deviceAttributeImportVoList) {
+                    DeviceAttribute deviceAttribute = BeanMapperUtils.map(deviceAttributeImportVos, DeviceAttribute.class);
+                    deviceAttribute.setVariableListId(0);
+                    deviceAttribute.setStatus(1);
+                    deviceAttribute.setCreator(user.getUserName());
+                    deviceAttribute.setCreateTime(new Date());
+                    this.save(deviceAttribute);
+                }
+            }else {
+                throw new BusinessException("文件不能为空");
             }
+        }catch (Exception e){
+            throw  new BusinessException("文件导入失败"+e.getMessage());
         }
     }
-
 }

fiveep-service/src/main/java/com/bizmatics/service/impl/DeviceServiceImpl.java

@@ -239,7 +239,7 @@ public class DeviceServiceImpl extends AbstractCrudService<DeviceMapper, Device>
             queryWrapperFour.eq(Device::getEnable, 1).eq(Device::getDeviceCode, newDeviceCode);
             List<Device> deviceListrFour = this.list(queryWrapper);
             if (deviceListrFour.size()>0){
-                throw new BusinessException("设备编号重复");
+                throw new BusinessException(newDeviceCode+"设备编号重复");
             }else {
                 //设备表新增
                 Device device = new Device();