修改设备导入功能

device-manager-ui/admin/src/assets/utils/index.js

 import Qs from 'qs';
-import {post, get, upload} from './ajax';
+import { post, get, upload } from './ajax';
 import queue from './queue';
 import axios from 'axios';
 import cookie from './cookie';
@@ -41,7 +41,7 @@ export const query = () => {
  * @returns string
  */
 export const encodeURI = (data) => {
-  return Qs.stringify(data, {arrayFormat: 'repeat', allowDots: true});
+  return Qs.stringify(data, { arrayFormat: 'repeat', allowDots: true });
 }
 
 /**
@@ -51,15 +51,15 @@ export const encodeURI = (data) => {
  * @returns {string} val 解析后的结果
  */
 export function formatterDate(time) {
-  if(!time) return '';
+  if (!time) return '';
   let date = new Date(Number(time));
   let Y = date.getFullYear() + '-';
-  let M = (date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1) : date.getMonth()+1) + '-';
+  let M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
   let D = panLeft(date.getDate()) + ' ';
   let h = panLeft(date.getHours()) + ':';
   let m = panLeft(date.getMinutes()) + ':';
   let s = panLeft(date.getSeconds());
-  return Y+M+D+h+m+s;
+  return Y + M + D + h + m + s;
 };
 /**
  * formatterDate
@@ -68,53 +68,53 @@ export function formatterDate(time) {
  * @returns {string} val 解析后的结果 yyyy-MM-dd
  */
 export function formatterDateDay(datetime) {
-    if (!datetime) return "";
-    if (datetime instanceof Date) {
-        let Y = datetime.getFullYear() + "-";
-        let M =
-            (datetime.getMonth() + 1 < 10
-                ? "0" + (datetime.getMonth() + 1)
-                : datetime.getMonth() + 1) + "-";
-        let D = panLeft(datetime.getDate());
-        return Y + M + D;
-    } else {
-        let transformDate = new Date(Number(datetime));
-        let Y = transformDate.getFullYear() + "-";
-        let M =
-            (transformDate.getMonth() + 1 < 10
-                ? "0" + (transformDate.getMonth() + 1)
-                : transformDate.getMonth() + 1) + "-";
-        let D = panLeft(transformDate.getDate());
-        return Y + M + D;
-    }
-    return datetime;
+  if (!datetime) return "";
+  if (datetime instanceof Date) {
+    let Y = datetime.getFullYear() + "-";
+    let M =
+      (datetime.getMonth() + 1 < 10
+        ? "0" + (datetime.getMonth() + 1)
+        : datetime.getMonth() + 1) + "-";
+    let D = panLeft(datetime.getDate());
+    return Y + M + D;
+  } else {
+    let transformDate = new Date(Number(datetime));
+    let Y = transformDate.getFullYear() + "-";
+    let M =
+      (transformDate.getMonth() + 1 < 10
+        ? "0" + (transformDate.getMonth() + 1)
+        : transformDate.getMonth() + 1) + "-";
+    let D = panLeft(transformDate.getDate());
+    return Y + M + D;
+  }
+  return datetime;
 };
 /**
  * 当前日期加天数后得到的相应日期
  * @param {*} day 
  */
-export function getAddDay(day){
+export function getAddDay(day) {
   var today = new Date();
-  var targetday_milliseconds=today.getTime() + 1000*60*60*24*day;
-  today.setTime(targetday_milliseconds); 
+  var targetday_milliseconds = today.getTime() + 1000 * 60 * 60 * 24 * day;
+  today.setTime(targetday_milliseconds);
   var tYear = today.getFullYear();
   var tMonth = today.getMonth();
   var tDate = today.getDate();
   tMonth = doHandleMonth(tMonth + 1);
   tDate = doHandleMonth(tDate);
-  return tYear+""+tMonth+""+tDate;
+  return tYear + "" + tMonth + "" + tDate;
 }
 
-function doHandleMonth(month){
+function doHandleMonth(month) {
   var m = month;
-  if(month.toString().length == 1){
+  if (month.toString().length == 1) {
     m = "0" + month;
   }
   return m;
 }
 
-function panLeft(num){
-  return num < 10 ? '0'+num : num;
+function panLeft(num) {
+  return num < 10 ? '0' + num : num;
 }
 
 
@@ -128,10 +128,10 @@ function panLeft(num){
  * @returns {Promise} axios请求
  */
 const call = (callMethod, url, formData, config = {}) => {
-  return new Promise((resolve, reject)=>{
-    callMethod(url, formData, config).then( res =>{
-      const {code, msg, data} = res;
-      if(code !== 1){
+  return new Promise((resolve, reject) => {
+    callMethod(url, formData, config).then(res => {
+      const { code, msg, data } = res;
+      if (code !== 1) {
         reject({
           message: msg || ''
         });
@@ -139,12 +139,12 @@ const call = (callMethod, url, formData, config = {}) => {
       }
       resolve(res);
     })
-    .catch(error=>{
-      if(error.status === 403) {
-        window.location.href = '/#/login'
-      }
-      reject(error);
-    })
+      .catch(error => {
+        if (error.status === 403) {
+          window.location.href = '/#/login'
+        }
+        reject(error);
+      })
   })
 };
 
@@ -168,14 +168,14 @@ export const normalCallPost = (url, formData, config = {}) => {
  * @param {Object} [config] 配置
  * @returns 科里化后的call方法
  */
-export const normalCallGet = (url, formData, config= {}) => {
+export const normalCallGet = (url, formData, config = {}) => {
   return call(get, url, formData, config);
 };
 
 const mimeMap = {
   xlsx: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
   zip: 'application/zip',
-  doc:'application/msword'
+  doc: 'application/msword'
 }
 
 /**
@@ -186,35 +186,39 @@ const mimeMap = {
  * @param {Object} [config] 配置
  * @returns {Promise<blob>}
  */
-export const download = (url, formData, config= {}) => {
-  return new Promise(async (resolve, reject)=>{
+export const download = (url, formData, config = {}) => {
+  return new Promise(async (resolve, reject) => {
     const option = Object.assign({}, config, {
-      responseType:'blob'
+      responseType: 'blob'
     })
     try {
       const data = await post(url, formData, option)
       const link = document.createElement('a')
       let blob
       let extName
-      if(option.type=="zip"){
-         blob = new Blob([data], { type: mimeMap.zip })
-         extName="zip"
-      }else if(option.type=="excel"){
+      if (option.type == "zip") {
+        blob = new Blob([data], { type: mimeMap.zip })
+        extName = "zip"
+      } else if (option.type == "excel") {
         blob = new Blob([data], { type: mimeMap.xlsx })
-        extName="xlsx"
-      }else if(option.type=="doc"){
+        extName = "xlsx"
+      } else if (option.type == "doc") {
         blob = new Blob([data], { type: mimeMap.doc })
-        extName="doc"
-      }else{
-        extName="xlsx"
+        extName = "doc"
+      } else {
+        extName = "xlsx"
+      }
+
+      let fileName = "导出"
+      if (option.fileName) {
+        fileName = option.fileName
       }
 
       link.href = URL.createObjectURL(blob)
-      link.setAttribute('download', `${url.substr(1).replace(/\//g, '_')}_${new Date().getTime()}.${extName}`) // 设置下载文件名称
+      link.setAttribute('download', `${fileName}.${extName}`) // 设置下载文件名称
       document.body.appendChild(link)
       link.click()
       document.body.appendChild(link)
-
       resolve();
     } catch (error) {
       reject(error);
@@ -223,10 +227,10 @@ export const download = (url, formData, config= {}) => {
 };
 
 
-export const downloadWithCustName = (url, formData, config= {}) => {
-  return new Promise(async (resolve, reject)=>{
+export const downloadWithCustName = (url, formData, config = {}) => {
+  return new Promise(async (resolve, reject) => {
     const option = Object.assign({}, config, {
-      responseType:'blob',
+      responseType: 'blob',
       baseURL: '/m',
       headers: {
         post: {
@@ -235,36 +239,36 @@ export const downloadWithCustName = (url, formData, config= {}) => {
       }
     })
     try {
-    	const params = Object.assign({}, formData, {
-    	    __mortals_token__: cookie.getItem('__mortals_token__'),
-    	})
-    	var requestData = Qs.stringify(params, {arrayFormat: 'repeat', allowDots: true});
-		axios.post(url, requestData, option)
-	    .then(response => {
-	    	if (response.data.type == 'application/json'){
-	    		var reader = new FileReader();
-	    		reader.onload = function(event) {
-	    			var content = reader.result;
-	    			reject(content);
-	    		};
-	    		reader.readAsText(response.data);
-	    		return;
-	    	}
-	    	const filename = decodeURI(response.headers['content-disposition'].split(';')[1].split('=')[1]) || `${url.substr(1).replace(/\//g, '_')}_${new Date().getTime()}.xls`
-	        let downloadUrl = window.URL.createObjectURL(new Blob([response.data]))
-	        let link = document.createElement('a')
-	        link.style.display ='none';
-	        link.href = downloadUrl;
-	        link.setAttribute('download', filename);
-	        document.body.appendChild(link);
-	        link.click();
-	        document.body.removeChild(link);
-	        resolve();
-	    }, err => {
-	        reject(err);
-	    }).catch((error) => {
-	        reject(error)
-	    })
+      const params = Object.assign({}, formData, {
+        __mortals_token__: cookie.getItem('__mortals_token__'),
+      })
+      var requestData = Qs.stringify(params, { arrayFormat: 'repeat', allowDots: true });
+      axios.post(url, requestData, option)
+        .then(response => {
+          if (response.data.type == 'application/json') {
+            var reader = new FileReader();
+            reader.onload = function (event) {
+              var content = reader.result;
+              reject(content);
+            };
+            reader.readAsText(response.data);
+            return;
+          }
+          const filename = decodeURI(response.headers['content-disposition'].split(';')[1].split('=')[1]) || `${url.substr(1).replace(/\//g, '_')}_${new Date().getTime()}.xls`
+          let downloadUrl = window.URL.createObjectURL(new Blob([response.data]))
+          let link = document.createElement('a')
+          link.style.display = 'none';
+          link.href = downloadUrl;
+          link.setAttribute('download', filename);
+          document.body.appendChild(link);
+          link.click();
+          document.body.removeChild(link);
+          resolve();
+        }, err => {
+          reject(err);
+        }).catch((error) => {
+          reject(error)
+        })
     } catch (error) {
       reject(error);
     }
@@ -279,7 +283,7 @@ export const downloadWithCustName = (url, formData, config= {}) => {
  * @param {Object} [config] 配置
  * @returns 科里化后的call方法
  */
-export const normalCallUpload = (url, formData, config= {}) => {
+export const normalCallUpload = (url, formData, config = {}) => {
   return call(upload, url, formData, config);
 };
 
@@ -299,17 +303,17 @@ export const queueCall = (url, formData, config = {}) => {
  * 根据条件查询用户列表
  */
 export async function getUserListByQuery(query) {
-    try {
-       /* //下拉只获取正常状态数据：status{0: "停用", 1: "正常", 2: "冻结", 3: "销户", 4: "离职"}
-        query["query.status"] = 1;*/
-        const data = await normalCallPost('/user/list', query);
-        const list = data.data.data.map(({id,loginName, realName,mobile})=>{
-            return {id,loginName, realName,mobile}
-        });
-        return list;
-    } catch (error) {
-        return [];
-    }
+  try {
+    /* //下拉只获取正常状态数据：status{0: "停用", 1: "正常", 2: "冻结", 3: "销户", 4: "离职"}
+     query["query.status"] = 1;*/
+    const data = await normalCallPost('/user/list', query);
+    const list = data.data.result.map(({ id, loginName, realName, mobile }) => {
+      return { id, loginName, realName, mobile }
+    });
+    return list;
+  } catch (error) {
+    return [];
+  }
 };
 
 
@@ -321,27 +325,130 @@ export async function getUserListByQuery(query) {
  * @param {*} children 孩子节点字段 默认 'children'
  * @param {*} rootId 根Id 默认 0
  */
- export function handleTree(data, id, parentId, children, rootId) {
-   console.log("00000000")
-	id = id || 'id'
-	parentId = parentId || 'parentId'
-	children = children || 'children'
-	rootId = rootId || Math.min.apply(Math, data.map(item => { return item[parentId] })) || 0
-	//对源数据深度克隆
-	const cloneData = JSON.parse(JSON.stringify(data))
-	//循环所有项
-  console.log("11111",cloneData)
-	const treeData = cloneData.filter(father => {
-		let branchArr = cloneData.filter(child => {
-			//返回每一项的子级数组
-			return father[id] === child[parentId]
-		});
-		branchArr.length > 0 ? father.children = branchArr : '';
-		//返回第一层
-		return father[parentId] === rootId;
-	});
-  console.log("treeData",treeData)
-	return treeData != '' ? treeData : data;
+export function handleTree(data, id, parentId, children, rootId) {
+  id = id || 'id'
+  parentId = parentId || 'parentId'
+  children = children || 'children'
+  rootId = rootId || Math.min.apply(Math, data.map(item => { return item[parentId] })) || 0
+  //对源数据深度克隆
+  const cloneData = JSON.parse(JSON.stringify(data))
+  //循环所有项
+  console.log("11111", cloneData)
+  const treeData = cloneData.filter(father => {
+    let branchArr = cloneData.filter(child => {
+      //返回每一项的子级数组
+      return father[id] === child[parentId]
+    });
+    branchArr.length > 0 ? father.children = branchArr : '';
+    //返回第一层
+    return father[parentId] === rootId;
+  });
+  console.log("treeData", treeData)
+  return treeData != '' ? treeData : data;
 };
 
 
+/**
+     * 下载文件
+     * @param {String} path - 下载地址/下载请求地址。
+     * @param {String} name - 下载文件的名字/重命名（考虑到兼容性问题，最好加上后缀名）
+     */
+export function downloadFile(path, name) {
+  if (path && name) {
+    const xhr = new XMLHttpRequest();
+    xhr.open("get", path);
+    xhr.responseType = "blob";
+    xhr.send();
+    xhr.onload = function () {
+      if (this.status === 200 || this.status === 304) {
+        // 如果是IE10及以上，不支持download属性，采用msSaveOrOpenBlob方法，但是IE10以下也不支持msSaveOrOpenBlob
+        if ("msSaveOrOpenBlob" in navigator) {
+          navigator.msSaveOrOpenBlob(this.response, name);
+          return;
+        }
+        // const blob = new Blob([this.response], { type: xhr.getResponseHeader('Content-Type') });
+        // const url = URL.createObjectURL(blob);
+        const url = URL.createObjectURL(this.response);
+        const a = document.createElement("a");
+        a.style.display = "none";
+        a.href = url;
+        a.download = name;
+        document.body.appendChild(a);
+        a.click();
+        document.body.removeChild(a);
+        URL.revokeObjectURL(url);
+      }
+    };
+  }
+
+}
+
+
+// 当元素滚动条被滚动时运行的脚本
+export function handleScroll() {
+  let scrollbarEl = this.$refs["scroll"].wrap;
+  let jump = document.querySelectorAll(".step-jump");
+
+  scrollbarEl.onscroll = () => {
+    let distance = scrollbarEl.scrollTop;
+    jump.forEach((item, index) => {
+      if (distance >= item.offsetTop) {
+        this.activeStep = index;
+      }
+    });
+  };
+}
+// 锚点点击
+export function jump(index) {
+  console.log(index);
+  let _this = this;
+  this.activeStep = index;
+  // 用 class=".step-jump" 添加锚点，此时的类名要放在tr上，放在td上不对，
+  // 以后做的时候要注意这点，不是表格的时候，如何放置锚点
+  let jump = document.querySelectorAll(".step-jump");
+  console.log("jump", jump);
+  // 通过 offsetTop 获取对象到窗体顶部的距离，然后赋值给 scrollTop，就能实现锚点的功能
+  let total = jump[index].offsetTop;
+  console.log(total);
+  // scrollTop滚动条距离页面的距离
+  let distance = this.$refs["scroll"].wrap.scrollTop;
+  // 平滑滚动，时长500ms，每10ms一跳，共50跳
+  let step = total / 50;
+  if (total > distance) {
+    smoothDown();
+  } else {
+    let newTotal = distance - total;
+    step = newTotal / 50;
+    smoothUp();
+  }
+  function smoothDown() {
+    if (distance < total) {
+      distance += step;
+      _this.$refs["scroll"].wrap.scrollTop = distance;
+      setTimeout(smoothDown, 10);
+    } else {
+      _this.$refs["scroll"].wrap.scrollTop = distance;
+      document.body.scrollTop = total;
+      document.documentElement.scrollTop = total;
+      window.pageYOffset = total;
+    }
+  }
+  function smoothUp() {
+    if (distance > total) {
+      distance -= step;
+      _this.$refs["scroll"].wrap.scrollTop = distance;
+      setTimeout(smoothUp, 10);
+    } else {
+      _this.$refs["scroll"].wrap.scrollTop = distance;
+    }
+  }
+};
+
+
+
+
+
+
+
+
+

device-manager-ui/admin/src/views/Home.vue

@@ -193,9 +193,6 @@ export default {
   },
   created() {
     let today = new Date();
-
-    console.log("year:",today.getFullYear())
-
     let query = {
       year: today.getFullYear(),
       month: today.getMonth()+1,
@@ -208,7 +205,6 @@ export default {
         if (res.code == 1) {
           console.log("res", res);
           this.statData = res.data.data[0];
-
           console.log("statData", this.statData);
         }
         this.loading = false;

device-manager-ui/admin/src/views/device/drawershow.vue

@@ -10,7 +10,7 @@
             <el-row>
                  
             <Field label="设备名称"  prop="deviceName" v-model="form.deviceName" placeholder="请输入设备名称"/> 
-            <Field  label="SN码" prop="deviceCode" v-model="form.deviceCode"  placeholder="请输入设备SN码"/>
+            <Field  label="设备编码" prop="deviceCode" v-model="form.deviceCode"  placeholder="请输入设备编码码"/>
             <Field  label="MAC地址" prop="deviceMac" v-model="form.deviceMac" placeholder="请输入设备的MAC地址"/>
             <Field  label="平台类型" prop="platformId" v-model="form.platformId" type="select" :enumData="dict.platformId" placeholder="请选择平台类型"/>
             <Field  label="产品类型" prop="productId" v-model="form.productId" type="select" :enumData="dict.productId" placeholder="请选择产品类型"/>
@@ -77,6 +77,9 @@
                         {required: true,message: "请输入设备名称", trigger: "blur" },
                         {max: 20,message: "最多只能录入20个字符",trigger: "blur",},
                     ],
+                    deviceCode: [
+                        {required: true,message: "请输入设备编码", trigger: "blur" },
+                    ],
                     platformId: [
                         {required: true,message: "请选择平台", trigger: "blur" },
                     ],

device-manager-ui/admin/src/views/device/list.vue

@@ -80,7 +80,7 @@
         :limit="1"
         accept=".xlsx, .xls"
         :headers="upload.headers"
-        :action="upload.url + '?updateSupport=' + upload.updateSupport"
+        :action="upload.url + '?siteId=' + siteId"
         :disabled="upload.isUploading"
         :on-progress="handleFileUploadProgress"
         :on-success="handleFileSuccess"
@@ -154,7 +154,7 @@ export default {
     /** 下载模板操作 */
     downloadTemplate() {
       this.isExport = true;
-      this.$download("/device/downloadTemplate", {}, { type: "excel" })
+      this.$download("/device/downloadTemplate", {}, { type: "excel",fileName:"设备导入模板" })
         .then(() => (this.isExport = false))
         .catch((error) => {
           this.isExport = false;
@@ -187,7 +187,7 @@ export default {
           "deviceName": this.$route.query["deviceName"],
           "siteId": this.$route.query["siteId"],
         },
-        { type: "excel" }
+        { type: "excel" ,fileName:"设备表"}
       )
         .then(() => (this.isExport = false))
         .catch((error) => {
@@ -357,7 +357,7 @@ export default {
                 <div>
                   <table-buttons
                     noAdd
-                    noEdit
+                   
                     row={row}
                     onEdit={this.toEdit}
                     onView={this.toView}

device-manager-ui/admin/src/views/device/view.vue

@@ -149,7 +149,7 @@
         content-class-name="contentClass"
       >
 
-      <ImageUpload v-model="form.devicePhotoPath" prePath="/file/preview" />
+      <ImagePreview :src="form.devicePhotoPath"  />
      
       </el-descriptions-item>
 

device-manager/src/main/java/com/mortals/xhx/common/key/RedisKey.java

@@ -14,4 +14,11 @@ public class RedisKey {
      */
     public static final String KEY_DEVICE_ONLINE_CACHE = "device:online:";
 
+
+
+    public static final String KEY_SITE_CACHE = "siteDict";
+
+    public static final String KEY_PLATFORM_CACHE = "platformDict";
+
+    public static final String KEY_PRODUCT_CACHE = "productDict";
 }

device-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/DeviceStartService.java

 package com.mortals.xhx.daemon.applicationservice;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
+import com.mortals.framework.service.ICacheService;
 import com.mortals.framework.springcloud.service.IApplicationService;
+import com.mortals.framework.springcloud.service.IApplicationStartedService;
+import com.mortals.xhx.common.pdu.site.SitePdu;
 import com.mortals.xhx.common.utils.SendTaskThreadPool;
 import com.mortals.xhx.common.utils.SmsQueueManager;
+import com.mortals.xhx.feign.site.ISiteFeign;
 import com.mortals.xhx.module.alarm.model.AlarmSmsSendEntity;
+import com.mortals.xhx.module.platform.model.PlatformQuery;
+import com.mortals.xhx.module.platform.service.PlatformService;
+import com.mortals.xhx.module.product.model.ProductQuery;
+import com.mortals.xhx.module.product.service.ProductService;
 import com.mortals.xhx.queue.TbQueueMsg;
 import com.mortals.xhx.utils.IotThreadFactory;
 import lombok.extern.slf4j.Slf4j;
@@ -19,21 +29,31 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
+import static com.mortals.xhx.common.key.RedisKey.*;
+
 @Component
 @Slf4j
-public class DeviceStartService implements IApplicationService {
+public class DeviceStartService implements IApplicationStartedService {
 
     @Autowired
     private SendTaskThreadPool sendTaskThreadPool;
 
     protected Boolean stopped = false;
+    @Autowired
+    private ICacheService cacheService;
+    @Autowired
+    private ISiteFeign siteFeign;
+    @Autowired
+    private PlatformService platformService;
+    @Autowired
+    private ProductService productService;
 
     @Override
     public void start() {
         log.info("初始化发送线程数量");
         sendTaskThreadPool.init(20);
         //启动短信发送响应更新线程
-        
+
         sendTaskThreadPool.execute(() -> {
             int waitTime = 1000;
             while (!stopped) {
@@ -55,6 +75,27 @@ public class DeviceStartService implements IApplicationService {
         });
 
 
+        //初始化站点缓存
+
+        String resp = siteFeign.list(new SitePdu());
+        JSONObject jsonObject = JSONObject.parseObject(resp);
+        if (jsonObject.getInteger("code") == 1) {
+            List<SitePdu> sitePduList = jsonObject.getJSONObject("data").getObject("data", new TypeReference<List<SitePdu>>() {
+            });
+
+            sitePduList.stream().forEach(sitePdu -> {
+                cacheService.hset(KEY_SITE_CACHE, sitePdu.getId().toString(), sitePdu.getSiteName());
+            });
+        }
+
+        productService.find(new ProductQuery()).stream().forEach(item -> {
+            cacheService.hset(KEY_PRODUCT_CACHE, item.getProductCode(), item.getProductName());
+        });
+
+        platformService.find(new PlatformQuery()).stream().forEach(item -> {
+            cacheService.hset(KEY_PLATFORM_CACHE, item.getPlatformSn(), item.getPlatformName());
+        });
+
         log.info("开始服务..[配置已加载完成，但部分框架还未初始化，比如：Kafka]");
     }
 
@@ -63,4 +104,9 @@ public class DeviceStartService implements IApplicationService {
         log.info("停止服务..");
     }
 
+    @Override
+    public int getOrder() {
+        return 50;
+    }
+
 }

device-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceEntity.java

@@ -27,7 +27,7 @@ public class DeviceEntity extends DeviceVo {
     /**
     * 设备编码,SN码等，默认为MAC地址
     */
-    @Excel(name = "设备编码,SN码等，默认为MAC地址")
+    @Excel(name = "设备编码")
     private String deviceCode;
     /**
     * 设备的MAC地址
@@ -36,6 +36,7 @@ public class DeviceEntity extends DeviceVo {
     /**
     * 站点Id，来源基础服务平台
     */
+    //@Excel(name = "站点名称",cacheDict = "siteDict")
     private Long siteId;
     /**
     * 站点编号，来源基础服务平台
@@ -68,7 +69,6 @@ public class DeviceEntity extends DeviceVo {
     /**
     * 设备生产厂商名称
     */
-    @Excel(name = "设备生产厂商名称")
     private String deviceFirmname;
     /**
     * 设备来源(0.子设备，1.网关设备，2.直连设备)
@@ -114,6 +114,7 @@ public class DeviceEntity extends DeviceVo {
     /**
     * 设备图片
     */
+    @Excel(name = "设备图片",height = 90, type = Excel.Type.EXPORT, cellType = Excel.ColumnType.IMAGE)
     private String devicePhotoPath;
     /**
     * 设备访问ip

device-manager/src/main/java/com/mortals/xhx/module/device/model/vo/DeviceVo.java

 package com.mortals.xhx.module.device.model.vo;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.device.model.DeviceEntity;
 import lombok.Data;
+import org.apache.poi.ss.usermodel.PictureData;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -22,14 +26,13 @@ public class DeviceVo extends BaseEntityLong {
     /**
      * 平台编码
      */
-    @Excel(name = "平台编码",combo = {"排号系统"}, readConverterExp = "phxt=排号系统")
+    @Excel(name = "平台",cacheDict = "platformDict")
     private String platformCode;
 
     /**
      * 产品编码
      */
-    @Excel(name = "产品编码",combo = {"排队机", "窗口屏", "呼叫器", "集中显示屏", "导视机", "评价器", "自助服务终端", "填单机", "样表机"}
-            , readConverterExp = "pdj=排队机,ckp=窗口屏,hjq=呼叫器,jzxsp=集中显示屏,dsj=导视机,pjq=评价器,zzfwzd=自助服务终端,tdj=填单机,ybj=样表机")
+    @Excel(name = "产品",cacheDict = "productDict")
     private String productCode;
 
 
@@ -37,4 +40,12 @@ public class DeviceVo extends BaseEntityLong {
      * 是否通知第三方
      */
     private Boolean switchSend=true;
+
+    /**
+     * 设备图片附件
+     */
+    @Excel(name = "设备图片", type = Excel.Type.IMPORT, cellType = Excel.ColumnType.IMAGE)
+    @JSONField(deserialize = false,serialize = false)
+    @JsonIgnore
+    private PictureData picObj;
 }
\ No newline at end of file

device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceServiceImpl.java

@@ -19,8 +19,10 @@ import com.mortals.xhx.module.device.model.DeviceEntity;
 import com.mortals.xhx.module.device.model.DeviceQuery;
 import com.mortals.xhx.module.device.service.DeviceService;
 import com.mortals.xhx.module.platform.model.PlatformEntity;
+import com.mortals.xhx.module.platform.model.PlatformQuery;
 import com.mortals.xhx.module.platform.service.PlatformService;
 import com.mortals.xhx.module.product.model.ProductEntity;
+import com.mortals.xhx.module.product.model.ProductQuery;
 import com.mortals.xhx.module.product.service.ProductService;
 import com.mortals.xhx.queue.*;
 import lombok.extern.slf4j.Slf4j;
@@ -283,13 +285,38 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
 
     @Override
     protected void saveBefore(DeviceEntity entity, Context context) throws AppException {
+
+        if (ObjectUtils.isEmpty(entity.getDeviceCode())) {
+            throw new AppException("设备编码不能为空！");
+        }
+
+        entity.setDeviceCode(StrUtil.replace(entity.getDeviceCode(), ":", "-"));
+        if (ObjectUtils.isEmpty(entity.getDeviceMac())) {
+            entity.setDeviceMac(entity.getDeviceCode());
+        }
+
         //产品编码唯一
         DeviceEntity deviceEntity = this.selectOne(new DeviceQuery().deviceCode(entity.getDeviceCode()));
         if (!ObjectUtils.isEmpty(deviceEntity)) {
             throw new AppException("设备编码重复！");
         }
 
-        entity.setDeviceCode(StrUtil.replace(entity.getDeviceCode(),":","-"));
+
+        if (!ObjectUtils.isEmpty(entity.getPlatformCode())) {
+            PlatformEntity platformEntity = platformService.selectOne(new PlatformQuery().platformSn(entity.getPlatformCode()));
+            if (!ObjectUtils.isEmpty(platformEntity)) {
+                entity.setPlatformId(platformEntity.getId());
+                entity.setPlatformName(platformEntity.getPlatformName());
+            }
+        }
+
+        if (!ObjectUtils.isEmpty(entity.getProductCode())) {
+            ProductEntity productEntity = productService.selectOne(new ProductQuery().productCode(entity.getProductCode()));
+            if (!ObjectUtils.isEmpty(productEntity)) {
+                entity.setProductId(productEntity.getId());
+                entity.setProductName(productEntity.getProductName());
+            }
+        }
 
 
         super.saveBefore(entity, context);

device-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceController.java

 package com.mortals.xhx.module.device.web;
 
+import cn.hutool.core.convert.Convert;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
+import com.mortals.framework.util.FileUtil;
+import com.mortals.framework.utils.ReflectUtils;
+import com.mortals.framework.utils.poi.ExcelUtil;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.message.MessageService;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.base.system.upload.service.UploadService;
 import com.mortals.xhx.base.system.user.model.UserEntity;
 import com.mortals.xhx.busiz.rsp.ApiResp;
 import com.mortals.xhx.common.code.ApiRespCodeEnum;
@@ -32,7 +37,10 @@ import com.mortals.xhx.queue.TopicPartitionInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -60,6 +68,8 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe
     private PlatformService platformService;
     @Autowired
     private MessageService messageService;
+    @Autowired
+    private UploadService uploadService;
 
     public DeviceController() {
         super.setModuleDesc("设备");
@@ -244,4 +254,32 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe
         return jsonObject.toJSONString();
     }
 
+
+    @Override
+    public void doImportDataBefore(List<DeviceEntity> list, boolean updateSupport, Context context) throws AppException {
+        String siteId = request.getParameter("siteId");
+        if(!ObjectUtils.isEmpty(siteId)){
+            list.stream().forEach(item->item.setSiteId(Convert.toLong(siteId,0L)));
+        }
+        list.stream().peek(item -> {
+                    if (!ObjectUtils.isEmpty(item.getPicObj())) {
+                        String extension = item.getPicObj().suggestFileExtension();
+                        String newName = "/file/uploadfile/" + new Date().getTime() + "." + extension;
+                        String filePath = uploadService.getFilePath(newName);
+                        try {
+                            boolean bool = FileUtil.write(filePath, item.getPicObj().getData(), true, true);
+                            if (bool) {
+                                item.setDevicePhotoPath(newName);
+                            }
+                        } catch (IOException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+        ).count();
+
+        super.doImportDataBefore(list, updateSupport, context);
+    }
+
+
 }
\ No newline at end of file