Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/zhengyuan-danger-chemistry-manage

danger-manage-admin/src/main/java/com/zehong/web/controller/workPermit/TSpecialWorkPermitSignController.java

 package com.zehong.web.controller.workPermit;
 
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.util.List;
+import java.util.Map;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -20,6 +27,10 @@ import com.zehong.system.service.ITSpecialWorkPermitSignService;
 import com.zehong.common.utils.poi.ExcelUtil;
 import com.zehong.common.core.page.TableDataInfo;
 
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * 【请填写功能名称】Controller
  * 
@@ -68,6 +79,37 @@ public class TSpecialWorkPermitSignController extends BaseController
         return AjaxResult.success(tSpecialWorkPermitSignService.selectTSpecialWorkPermitSignById(signId));
     }
 
+    /**
+     * app添加
+     */
+    //@PreAuthorize("@ss.hasPermi('system:sign:add')")
+    @Log(title = "批量添加", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/insertAll")
+    public AjaxResult addAll(HttpServletRequest req, HttpServletResponse resp) throws Exception
+    {
+        StringBuffer sb = new StringBuffer() ;
+        InputStream is = req.getInputStream();
+        BufferedReader br = new BufferedReader(new InputStreamReader(is,"utf-8"));
+        String s = "" ;
+        while((s=br.readLine())!=null){
+            sb.append(s) ;
+        }
+        if(sb.toString().length()<=0){
+            return toAjax(0);
+        }
+        Map<String,Object> map  = (Map<String,Object>) JSON.parseObject(sb.toString());
+
+        int a = 0;
+        List<Map<String,Object>> list =(List<Map<String,Object>>) JSON.parse((String) map.get("signList"));
+        for(Map<String,Object> m : list){
+            TSpecialWorkPermitSign t = new TSpecialWorkPermitSign();
+            t.setPermitId(((Integer) m.get("permitId")).longValue());
+            t.setStaffId(((Integer) m.get("staffId")).longValue());
+            t.setStaffType((String) m.get("staffType"));
+           a = tSpecialWorkPermitSignService.insertTSpecialWorkPermitSign(t);
+        }
+        return toAjax(1);
+    }
     /**
      * 新增【请填写功能名称】
      */

danger-manage-admin/src/main/resources/application-dev.yml

@@ -105,7 +105,7 @@ zehong:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/zehong/uploadPath，Linux配置 /home/zehong/uploadPath）
-  profile: /home/zehong/uploadPath
+  profile: D:/zehong/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证

danger-manage-admin/src/main/resources/application.yml

@@ -55,7 +55,7 @@ swagger:
   # 是否开启swagger
   enabled: true
   # 请求前缀
-  pathMapping: /dev-api
+  pathMapping:
 
 # 防止XSS攻击
 xss: 

danger-manage-web/src/components/bigWindow/video.vue

@@ -94,7 +94,7 @@ export default {
       this.open();
     },
     open() {
-      this.queryParam.cameraIndexCode = "c3949900706942479d414998b4c2ee40";
+      this.queryParam.cameraIndexCode = this.deviceData.sbbh;
       getPreviewURLs(this.queryParam).then((response) => {
         if (response.data.code == "0") {
           this.videoOpenNum++;

danger-manage-web/src/views/index.vue

@@ -434,13 +434,16 @@ export default {
           .map((item) => {
             let obj;
             // 视频
+
             if (item.mapDeviceType == 5) {
+            console.log(item,"item");
               obj = {
                 latitude: item.latitude,
                 longitude: item.longitude,
                 deviceId: item.mapDeviceId,
                 shortNum: 10,
                 deviceType: item.mapDeviceType,
+                sbbh: item.mapDeviceNum,
                 title: item.mapDeviceName,
                 config: { scale: 1, textHeight: -32 },
               };

danger-manage-web/src/views/system/statistics/index.vue

@@ -90,9 +90,9 @@
     </el-row>
 
     <el-table v-loading="loading" :data="settingList" @selection-change="handleSelectionChange">
+      <el-table-column  width="180" label="巡检区域" align="center" prop="dictLabel" />
       <el-table-column  width="250" label="巡检地点" align="center" prop="patrolAddress" />
-      <el-table-column  width="200" label="巡检区域" align="center" prop="dictLabel" />
-      <el-table-column width="600"  label="巡检内容" align="center" prop="patrolComent" >
+      <el-table-column width="500"  label="巡检内容" align="center" prop="patrolComent" >
         <span slot-scope="scope" v-if="scope.row.patrolComent">{{scope.row.patrolComent}}</span>
         <span v-else>-</span>
       </el-table-column>
@@ -106,7 +106,7 @@
         <span slot-scope="scope" v-else-if="scope.row.isNormal==1">正常</span>
       </el-table-column>
       <el-table-column label="上报时间" align="center" prop="createTime" width="170" />
-      <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" width="80" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -139,20 +139,23 @@
 <!--    </el-dialog>-->
 
     <el-dialog :title="title" :visible.sync="open" width="1100px" append-to-body>
-      <el-descriptions :model="form"    :column="2" border>
+      <el-descriptions :model="form" :column="4" border>
         <el-descriptions-item label="巡检区域">{{form.dictLabel}}</el-descriptions-item>
         <el-descriptions-item :span="2" label="巡检地点" >{{form.patrolAddress}}</el-descriptions-item>
-        <el-descriptions-item :span="2" label="巡检内容">{{form.patrolComent}}</el-descriptions-item>
         <el-descriptions-item label="巡检频次" >{{form.patrolFrequency}}</el-descriptions-item>
+        <el-descriptions-item :span="4" label="巡检内容">{{form.patrolComent}}</el-descriptions-item>
+
         <el-descriptions-item  label="巡检结果" >
           <el-tag v-if="form.isNormal==0" size="danger">异常</el-tag>
           <el-tag v-else-if="form.isNormal==1"  size="small">正常</el-tag>
         </el-descriptions-item>
-        <el-descriptions-item   label="图片" >
-          <el-image  size="small" :preview-src-list="srcList" :src="form.picture"  ></el-image>
-        </el-descriptions-item>
-        <el-descriptions-item :span="4" label="上报人">{{form.nickName}}</el-descriptions-item>
         <el-descriptions-item :span="2" label="上报时间">{{form.createTime}}</el-descriptions-item>
+        <el-descriptions-item label="上报人">{{form.nickName}}</el-descriptions-item>
+
+        <el-descriptions-item  :span="4" label="图片" >
+          <el-image style="padding-left:10px" size="small" :preview-src-list="srcList" :src="form.picture" ></el-image>
+        </el-descriptions-item>
+
         <el-descriptions-item  label="备注">{{form.remarks}}</el-descriptions-item>
       </el-descriptions>
             <div slot="footer" class="dialog-footer">