版本更新

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/service/impl/DeviceServiceImpl.java

@@ -1,10 +1,10 @@
 package com.zcxk.rmcp.web.service.impl;
-import java.time.LocalDateTime;
 
 import com.alibaba.fastjson.JSON;
 import com.github.pagehelper.PageHelper;
 import com.zcxk.core.common.enums.StatusEnum;
 import com.zcxk.core.common.exception.BusinessException;
+import com.zcxk.core.common.pojo.ResultMessage;
 import com.zcxk.core.common.pojo.UserCondition;
 import com.zcxk.core.common.util.BeanCopyUtils;
 import com.zcxk.core.common.util.SnowflakeIdWorker;
@@ -21,18 +21,20 @@ import com.zcxk.rmcp.api.query.CommonQueryCondition;
 import com.zcxk.rmcp.api.vo.*;
 import com.zcxk.rmcp.core.dao.DeviceMapper;
 import com.zcxk.rmcp.core.entity.Device;
-import com.zcxk.rmcp.web.excel.download.WaterDownloadExcelService;
 import com.zcxk.rmcp.web.excel.download.WaterDownloadExcelTemplate;
+import com.zcxk.rmcp.web.excel.download.service.WaterDownloadExcelService;
+import com.zcxk.rmcp.web.excel.model.DeviceImportData;
 import com.zcxk.rmcp.web.excel.model.DownloadExcelData;
+import com.zcxk.rmcp.web.excel.model.ExcelData;
+import com.zcxk.rmcp.web.service.DeviceService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-
-import com.zcxk.rmcp.web.service.DeviceService;
 import org.springframework.util.CollectionUtils;
 
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -195,6 +197,16 @@ public class DeviceServiceImpl implements DeviceService{
         return result;
     }
 
+    @Override
+    public ResultMessage saveExcelData(DeviceImportData data, ExcelData excelData) {
+        return null;
+    }
+
+    @Override
+    public void getDeviceListExcel(CommonQueryCondition condition, HttpServletResponse httpServletResponse) {
+
+    }
+
 
     /**
      * @author Andy

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/service/impl/ImportFileServiceImpl.java

@@ -1,7 +1,9 @@
 package com.zcxk.rmcp.web.service.impl;
 
-import com.zcxk.core.common.pojo.LoginUser;
-import com.zcxk.core.common.util.UserUtil;
+import com.zcxk.core.oauth2.pojo.LoginUser;
+import com.zcxk.core.oauth2.util.UserUtil;
+import com.zcxk.rmcp.core.dao.ImportFileMapper;
+import com.zcxk.rmcp.core.entity.ImportFile;
 import com.zcxk.rmcp.web.service.AsyncTaskImportService;
 import com.zcxk.rmcp.web.service.CommonService;
 import com.zcxk.rmcp.web.service.ImportFileService;
@@ -9,14 +11,11 @@ import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
 import javax.annotation.Resource;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
-
-import com.zcxk.rmcp.core.entity.ImportFile;
-import com.zcxk.rmcp.core.dao.ImportFileMapper;
-import org.springframework.web.multipart.MultipartFile;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;