提交代码

ruoyi-ui/src/api/project/checkDetection.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询材料送检列表
+export function listCheckDetection(query) {
+  return request({
+    url: '/project/checkDetection/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询材料送检详细
+export function getCheckDetection(id) {
+  return request({
+    url: '/project/checkDetection/' + id,
+    method: 'get'
+  })
+}
+
+// 新增材料送检
+export function addCheckDetection(data) {
+  return request({
+    url: '/project/checkDetection',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改材料送检
+export function updateCheckDetection(data) {
+  return request({
+    url: '/project/checkDetection',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除材料送检
+export function delCheckDetection(id) {
+  return request({
+    url: '/project/checkDetection/' + id,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/views/project/checkDetection/index.vue

@@ -0,0 +1,364 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="项目主键" prop="projectId">
+        <el-input
+          v-model="queryParams.projectId"
+          placeholder="请输入项目主键"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="单位主键" prop="deptId">
+        <el-input
+          v-model="queryParams.deptId"
+          placeholder="请输入单位主键"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="送检类型" prop="checkType">
+        <el-select v-model="queryParams.checkType" placeholder="请选择送检类型" clearable>
+          <el-option
+            v-for="dict in dict.type.check_detection_check_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="送检时间">
+        <el-date-picker
+          v-model="daterangeCheckTime"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="送检状态" prop="checkState">
+        <el-input
+          v-model="queryParams.checkState"
+          placeholder="请输入送检状态"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="检测结果" prop="detectionResult">
+        <el-input
+          v-model="queryParams.detectionResult"
+          placeholder="请输入检测结果"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['project:checkDetection:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['project:checkDetection:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['project:checkDetection:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['project:checkDetection:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="checkDetectionList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="主键" align="center" prop="id" />
+      <el-table-column label="项目主键" align="center" prop="projectId" />
+      <el-table-column label="单位主键" align="center" prop="deptId" />
+      <el-table-column label="送检类型" align="center" prop="checkType">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.check_detection_check_type" :value="scope.row.checkType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="送检时间" align="center" prop="checkTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.checkTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="送检状态" align="center" prop="checkState" />
+      <el-table-column label="检测结果" align="center" prop="detectionResult" />
+      <el-table-column label="检测报告" align="center" prop="detectionFile" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['project:checkDetection:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['project:checkDetection:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改材料送检对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="项目主键" prop="projectId">
+          <el-input v-model="form.projectId" placeholder="请输入项目主键" />
+        </el-form-item>
+        <el-form-item label="单位主键" prop="deptId">
+          <el-input v-model="form.deptId" placeholder="请输入单位主键" />
+        </el-form-item>
+        <el-form-item label="送检类型" prop="checkType">
+          <el-select v-model="form.checkType" placeholder="请选择送检类型">
+            <el-option
+              v-for="dict in dict.type.check_detection_check_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="送检时间" prop="checkTime">
+          <el-date-picker clearable
+            v-model="form.checkTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择送检时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="送检状态" prop="checkState">
+          <el-input v-model="form.checkState" placeholder="请输入送检状态" />
+        </el-form-item>
+        <el-form-item label="检测结果" prop="detectionResult">
+          <el-input v-model="form.detectionResult" placeholder="请输入检测结果" />
+        </el-form-item>
+        <el-form-item label="检测报告" prop="detectionFile">
+          <file-upload v-model="form.detectionFile"/>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listCheckDetection, getCheckDetection, delCheckDetection, addCheckDetection, updateCheckDetection } from "@/api/project/checkDetection";
+
+export default {
+  name: "CheckDetection",
+  dicts: ['check_detection_check_type'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 材料送检表格数据
+      checkDetectionList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 备注时间范围
+      daterangeCheckTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        projectId: null,
+        deptId: null,
+        checkType: null,
+        checkTime: null,
+        checkState: null,
+        detectionResult: null,
+        detectionFile: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询材料送检列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeCheckTime && '' != this.daterangeCheckTime) {
+        this.queryParams.params["beginCheckTime"] = this.daterangeCheckTime[0];
+        this.queryParams.params["endCheckTime"] = this.daterangeCheckTime[1];
+      }
+      listCheckDetection(this.queryParams).then(response => {
+        this.checkDetectionList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        projectId: null,
+        deptId: null,
+        checkType: null,
+        checkTime: null,
+        checkState: null,
+        detectionResult: null,
+        detectionFile: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        remark: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeCheckTime = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加材料送检";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getCheckDetection(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改材料送检";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateCheckDetection(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addCheckDetection(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除材料送检编号为"' + ids + '"的数据项？').then(function() {
+        return delCheckDetection(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('project/checkDetection/export', {
+        ...this.queryParams
+      }, `checkDetection_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

ruoyi-ui/src/views/project/surProject/index.vue

@@ -446,6 +446,12 @@
                 v-hasPermi="['project:surProjectAttendance:add']"
                 >今日出勤</el-dropdown-item
               >
+              <el-dropdown-item
+                command="handVideoConfig"
+                icon="el-icon-video-camera-solid"
+                v-hasPermi="['project:videoConfig:add']"
+                >视频配置</el-dropdown-item
+              >
               <el-dropdown-item
                 command="handleDelete"
                 icon="el-icon-delete"
@@ -554,13 +560,17 @@
           <el-col :span="24">
             <el-form-item label="经纬度" prop="longitude" class="fi-longitude">
               <div>
-              <div>({{ form.longitude }},{{ form.latitude }}) </div>
+                <div>({{ form.longitude }},{{ form.latitude }})</div>
-              <el-button @click="getMapInfo">选择经纬度</el-button>
+                <el-button @click="getMapInfo">选择经纬度</el-button>
-            </div>
+              </div>
-              <div style="margin-left: 12px;flex-grow: 1;">
+              <div style="margin-left: 12px; flex-grow: 1">
-                             
+                <el-input
-                <el-input type="textarea" :rows="3" placeholder="请输入地址" v-model="form.projectAddress">
+                  type="textarea"
-                            </el-input>
+                  :rows="3"
+                  placeholder="请输入地址"
+                  v-model="form.projectAddress"
+                >
+                </el-input>
               </div>
             </el-form-item>
           </el-col>
@@ -783,6 +793,7 @@
     <projectCheckingDrawer ref="projectChecking"></projectCheckingDrawer>
     <materialSealDrawer ref="materialSeal"></materialSealDrawer>
     <projectMeasureDrawer ref="projectMeasure"></projectMeasureDrawer>
+    <videoConfigDrawer ref="videoConfig"></videoConfigDrawer>
   </div>
 </template>
 
@@ -810,6 +821,7 @@ import insuranceDrawer from "../surProjectInsurance/insuranceDrawer.vue";
 import projectCheckingDrawer from "../projectChecking/projectCheckingDrawer.vue";
 import materialSealDrawer from "../materialSeal/projectMaterialSealDrawer.vue";
 import projectMeasureDrawer from "../projectMeasure/projectMeasureDrawer.vue";
+import videoConfigDrawer from "@/views/project/videoConfig/videoConfigDrawer";
 import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 
 export default {
@@ -829,6 +841,7 @@ export default {
     projectCheckingDrawer,
     materialSealDrawer,
     projectMeasureDrawer,
+    videoConfigDrawer,
   },
   dicts: [
     "sys_check_state",
@@ -1075,6 +1088,9 @@ export default {
         case "handleProjectMaterialSeal":
           this.$refs.materialSeal.show(row);
           break;
+        case "handVideoConfig":
+          this.$refs.videoConfig.show(row);
+          break;
         default:
           break;
       }
@@ -1195,8 +1211,8 @@ export default {
 .prj-suprj-edit-dialog {
   .el-dialog__body {
     padding-bottom: 0px;
-    .fi-longitude{
+    .fi-longitude {
-      .el-form-item__content{
+      .el-form-item__content {
         display: flex;
       }
     }

ruoyi-ui/src/views/project/videoConfig/index.vue

@@ -11,19 +11,41 @@
       <el-form-item label="项目名称" prop="projectName">
         <el-input
           v-model="queryParams.projectName"
-          placeholder="请输入项目主键"
+          placeholder="请输入项目名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="视频编号" prop="videoDvrNumber">
+      <el-form-item label="设备名称" prop="videoName">
         <el-input
-          v-model="queryParams.videoDvrNumber"
+          v-model="queryParams.videoName"
-          placeholder="请输入视频编号"
+          placeholder="请输入设备名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="设备编号" prop="videoDvrNumber">
+        <el-input
+          v-model="queryParams.videoDvrNumber"
+          placeholder="请输入设备编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="通信状态" prop="signalState">
+        <el-select
+          v-model="queryParams.signalState"
+          placeholder="请选择通信状态"
+          clearable
+        >
+          <el-option
+            v-for="dict in dict.type.project_video_signal_state"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
           >搜索</el-button
@@ -88,21 +110,50 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键" align="center" prop="id" />
       <el-table-column
-        label="项目主键"
+        label="项目名称"
         align="center"
         prop="projectName"
         width="250"
         show-overflow-tooltip
       />
-      <el-table-column label="视频类型" align="center" prop="videoOnlyType" />
+      <el-table-column
-      <el-table-column label="视频编号" align="center" prop="videoDvrNumber" />
+        label="设备名称"
-      <el-table-column label="视频信令" align="center" prop="videoDvrSecurity" />
+        align="center"
+        prop="videoName"
+        width="250"
+        show-overflow-tooltip
+      />
+      <el-table-column label="设备类型" align="center" prop="videoOnlyType">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.project_video_type"
+            :value="scope.row.videoOnlyType"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="设备编号"
+        align="center"
+        prop="videoDvrNumber"
+        width="120"
+        show-overflow-tooltip
+      />
       <el-table-column label="通道数量" align="center" prop="videoPassageCount" />
-      <el-table-column label="通信类型" align="center" prop="signalType" />
+      <el-table-column label="通信状态" align="center" prop="signalState">
-      <el-table-column label="通信状态" align="center" prop="signalState" />
+        <template slot-scope="scope">
-      <el-table-column label="通信密码" align="center" prop="signalCode" />
+          <dict-tag
+            :options="dict.type.project_video_signal_state"
+            :value="scope.row.signalState"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="DVR信令" align="center" prop="videoDvrSecurity" />
+      <el-table-column label="接入时间" align="center" prop="createTime" width="120">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="数据状态" align="center" prop="isDel">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_common_isdel" :value="scope.row.isDel" />
@@ -142,38 +193,29 @@
     <!-- 添加或修改视频配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="680px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="项目名称" prop="projectId">
+        <el-form-item label="项目名称" prop="projectName">
-          <el-input v-model="form.projectName" placeholder="请输入项目主键" />
+          <el-input
+            v-model="form.projectName"
+            placeholder="请输入项目名称"
+            :disabled="true"
+          />
         </el-form-item>
-        <el-form-item label="视频编号" prop="videoDvrNumber">
+        <el-form-item label="设备名称" prop="videoName">
-          <el-input v-model="form.videoDvrNumber" placeholder="请输入视频编号" />
+          <el-input v-model="form.videoName" placeholder="请输入设备名称" />
         </el-form-item>
-        <el-form-item label="视频信令" prop="videoDvrSecurity">
+        <el-form-item label="设备编号" prop="videoDvrNumber">
-          <el-input v-model="form.videoDvrSecurity" placeholder="请输入视频信令" />
+          <el-input v-model="form.videoDvrNumber" placeholder="请输入设备编号" />
         </el-form-item>
-        <el-form-item label="通道数量" prop="videoPassageCount">
+        <el-form-item label="DVR信令" prop="videoDvrSecurity">
-          <el-input v-model="form.videoPassageCount" placeholder="请输入通道数量" />
+          <el-input v-model="form.videoDvrSecurity" placeholder="请输入DVR信令" />
-        </el-form-item>
-        <el-form-item label="通信状态" prop="signalState">
-          <el-input v-model="form.signalState" placeholder="请输入通信状态" />
         </el-form-item>
         <el-form-item label="通信密码" prop="signalCode">
           <el-input v-model="form.signalCode" placeholder="请输入通信密码" />
         </el-form-item>
-        <el-form-item label="数据状态" prop="isDel">
-          <el-select v-model="form.isDel" placeholder="请选择数据状态">
-            <el-option
-              v-for="dict in dict.type.sys_common_isdel"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
-        <el-divider content-position="center">视频通道信息</el-divider>
+        <el-divider content-position="center">设备通道信息</el-divider>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
             <el-button
@@ -202,14 +244,19 @@
         >
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column label="序号" align="center" prop="index" width="50" />
-          <el-table-column label="通道名称" prop="passageName" width="150">
+          <el-table-column label="通道名称" prop="passageName">
             <template slot-scope="scope">
               <el-input v-model="scope.row.passageName" placeholder="请输入通道名称" />
             </template>
           </el-table-column>
-          <el-table-column label="视频通道" prop="passageValue" width="150">
+          <el-table-column label="视频通道" prop="passageValue">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.passageValue" placeholder="请输入视频通道" />
+              <el-input-number
+                size="small"
+                v-model="scope.row.passageValue"
+                placeholder="请输入视频通道"
+                style="width: 100%"
+              />
             </template>
           </el-table-column>
         </el-table>
@@ -233,7 +280,7 @@ import {
 
 export default {
   name: "VideoConfig",
-  dicts: ["sys_common_isdel"],
+  dicts: ["project_video_type", "project_video_signal_state", "sys_common_isdel"],
   data() {
     return {
       // 遮罩层
@@ -263,6 +310,8 @@ export default {
         pageNum: 1,
         pageSize: 10,
         projectId: null,
+        projectName: null,
+        videoName: null,
         videoOnlyType: null,
         videoDvrNumber: null,
         videoDvrSecurity: null,
@@ -275,7 +324,28 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {
+        videoName: [
+          { required: true, message: "请输入设备名称", trigger: "blur" },
+          { maxlength: 20, message: "设备名称最多20字符", trigger: "blur" },
+        ],
+        videoDvrNumber: [
+          { required: true, message: "请输入设备编号", trigger: "blur" },
+          { maxlength: 20, message: "设备编号最多20字符", trigger: "blur" },
+        ],
+        videoDvrSecurity: [
+          { required: false, message: "请输入DVR信令", trigger: "blur" },
+          { maxlength: 200, message: "DVR信令最多200字符", trigger: "blur" },
+        ],
+        signalCode: [
+          { required: false, message: "请输入通信密码", trigger: "blur" },
+          { maxlength: 200, message: "通信密码最多200字符", trigger: "blur" },
+        ],
+        remark: [
+          { required: false, message: "请输入备注", trigger: "blur" },
+          { maxlength: 200, message: "备注最多200字符", trigger: "blur" },
+        ],
+      },
     };
   },
   created() {

ruoyi-ui/src/views/project/videoConfig/videoConfigDrawer.vue

@@ -74,13 +74,13 @@
       >
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column
-          label="项目名称"
+          label="设备名称"
           align="center"
-          prop="projectName"
+          prop="videoName"
-          width="250"
+          width="200"
           show-overflow-tooltip
         />
-        <el-table-column label="视频类型" align="center" prop="videoOnlyType">
+        <el-table-column label="设备类型" align="center" prop="videoOnlyType">
           <template slot-scope="scope">
             <dict-tag
               :options="dict.type.project_video_type"
@@ -89,7 +89,7 @@
           </template>
         </el-table-column>
         <el-table-column
-          label="视频编号"
+          label="设备编号"
           align="center"
           prop="videoDvrNumber"
           width="120"
@@ -104,18 +104,12 @@
             />
           </template>
         </el-table-column>
-        <el-table-column label="视频信令" align="center" prop="videoDvrSecurity" />
+        <el-table-column label="DVR信令" align="center" prop="videoDvrSecurity" />
         <el-table-column label="接入时间" align="center" prop="createTime" width="120">
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="数据状态" align="center" prop="isDel">
-          <template slot-scope="scope">
-            <dict-tag :options="dict.type.sys_common_isdel" :value="scope.row.isDel" />
-          </template>
-        </el-table-column>
-        <el-table-column label="备注" align="center" prop="remark" />
         <el-table-column
           label="操作"
           align="center"
@@ -160,11 +154,14 @@
               :disabled="true"
             />
           </el-form-item>
-          <el-form-item label="视频编号" prop="videoDvrNumber">
+          <el-form-item label="设备名称" prop="videoName">
-            <el-input v-model="form.videoDvrNumber" placeholder="请输入视频编号" />
+            <el-input v-model="form.videoName" placeholder="请输入设备名称" />
           </el-form-item>
-          <el-form-item label="视频信令" prop="videoDvrSecurity">
+          <el-form-item label="设备编号" prop="videoDvrNumber">
-            <el-input v-model="form.videoDvrSecurity" placeholder="请输入视频信令" />
+            <el-input v-model="form.videoDvrNumber" placeholder="请输入设备编号" />
+          </el-form-item>
+          <el-form-item label="DVR信令" prop="videoDvrSecurity">
+            <el-input v-model="form.videoDvrSecurity" placeholder="请输入DVR信令" />
           </el-form-item>
           <el-form-item label="通信密码" prop="signalCode">
             <el-input v-model="form.signalCode" placeholder="请输入通信密码" />
@@ -172,7 +169,7 @@
           <el-form-item label="备注" prop="remark">
             <el-input v-model="form.remark" placeholder="请输入备注" />
           </el-form-item>
-          <el-divider content-position="center">视频通道信息</el-divider>
+          <el-divider content-position="center">设备通道信息</el-divider>
           <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">
               <el-button
@@ -201,17 +198,18 @@
           >
             <el-table-column type="selection" width="50" align="center" />
             <el-table-column label="序号" align="center" prop="index" width="50" />
-            <el-table-column label="通道名称" prop="passageName" width="250">
+            <el-table-column label="通道名称" prop="passageName">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.passageName" placeholder="请输入通道名称" />
               </template>
             </el-table-column>
-            <el-table-column label="视频通道" prop="passageValue" width="250">
+            <el-table-column label="视频通道" prop="passageValue">
               <template slot-scope="scope">
                 <el-input-number
                   size="small"
                   v-model="scope.row.passageValue"
                   placeholder="请输入视频通道"
+                  style="width: 100%"
                 />
               </template>
             </el-table-column>
@@ -237,7 +235,7 @@ import {
 
 export default {
   name: "VideoConfig",
-  dicts: ["project_video_type", "project_video_signal_state", "sys_common_isdel"],
+  dicts: ["project_video_type", "project_video_signal_state"],
   data() {
     return {
       // 遮罩层
@@ -284,20 +282,24 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        videoName: [
+          { required: true, message: "请输入设备名称", trigger: "blur" },
+          { maxlength: 20, message: "设备名称最多20字符", trigger: "blur" },
+        ],
         videoDvrNumber: [
-          { required: true, message: "请输入视频编号", trigger: "blur" },
+          { required: true, message: "请输入设备编号", trigger: "blur" },
-          { maxlength: 10, message: "视频编号最多10字符", trigger: "blur" },
+          { maxlength: 20, message: "设备编号最多20字符", trigger: "blur" },
         ],
         videoDvrSecurity: [
-          { required: false, message: "请输入通讯信令", trigger: "blur" },
+          { required: false, message: "请输入DVR信令", trigger: "blur" },
-          { maxlength: 200, message: "通讯信令最多200字符", trigger: "blur" },
+          { maxlength: 200, message: "DVR信令最多200字符", trigger: "blur" },
         ],
         signalCode: [
           { required: false, message: "请输入通讯密码", trigger: "blur" },
           { maxlength: 200, message: "通讯密码最多200字符", trigger: "blur" },
         ],
         remark: [
-          { required: true, message: "请输入备注", trigger: "blur" },
+          { required: false, message: "请输入备注", trigger: "blur" },
           { maxlength: 200, message: "备注最多200字符", trigger: "blur" },
         ],
       },
@@ -372,6 +374,8 @@ export default {
       this.reset();
       this.open = true;
       this.title = "添加视频配置";
+      this.form.projectId = this.project.id;
+      this.form.projectName = this.project.projectName;
     },
     /** 修改按钮操作 */
     handleUpdate(row) {

yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectCheckDetectionController.java

@@ -0,0 +1,104 @@
+package com.yanzhu.jh.project.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.yanzhu.jh.project.domain.SurProjectCheckDetection;
+import com.yanzhu.jh.project.service.ISurProjectCheckDetectionService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 材料送检Controller
+ * 
+ * @author JiangYuQi
+ * @date 2023-08-26
+ */
+@RestController
+@RequestMapping("/project/checkDetection")
+public class SurProjectCheckDetectionController extends BaseController
+{
+    @Autowired
+    private ISurProjectCheckDetectionService surProjectCheckDetectionService;
+
+    /**
+     * 查询材料送检列表
+     */
+    @PreAuthorize("@ss.hasPermi('project:checkDetection:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SurProjectCheckDetection surProjectCheckDetection)
+    {
+        startPage();
+        List<SurProjectCheckDetection> list = surProjectCheckDetectionService.selectSurProjectCheckDetectionList(surProjectCheckDetection);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出材料送检列表
+     */
+    @PreAuthorize("@ss.hasPermi('project:checkDetection:export')")
+    @Log(title = "材料送检", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SurProjectCheckDetection surProjectCheckDetection)
+    {
+        List<SurProjectCheckDetection> list = surProjectCheckDetectionService.selectSurProjectCheckDetectionList(surProjectCheckDetection);
+        ExcelUtil<SurProjectCheckDetection> util = new ExcelUtil<SurProjectCheckDetection>(SurProjectCheckDetection.class);
+        util.exportExcel(response, list, "材料送检数据");
+    }
+
+    /**
+     * 获取材料送检详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('project:checkDetection:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(surProjectCheckDetectionService.selectSurProjectCheckDetectionById(id));
+    }
+
+    /**
+     * 新增材料送检
+     */
+    @PreAuthorize("@ss.hasPermi('project:checkDetection:add')")
+    @Log(title = "材料送检", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SurProjectCheckDetection surProjectCheckDetection)
+    {
+        return toAjax(surProjectCheckDetectionService.insertSurProjectCheckDetection(surProjectCheckDetection));
+    }
+
+    /**
+     * 修改材料送检
+     */
+    @PreAuthorize("@ss.hasPermi('project:checkDetection:edit')")
+    @Log(title = "材料送检", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SurProjectCheckDetection surProjectCheckDetection)
+    {
+        return toAjax(surProjectCheckDetectionService.updateSurProjectCheckDetection(surProjectCheckDetection));
+    }
+
+    /**
+     * 删除材料送检
+     */
+    @PreAuthorize("@ss.hasPermi('project:checkDetection:remove')")
+    @Log(title = "材料送检", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(surProjectCheckDetectionService.deleteSurProjectCheckDetectionByIds(ids));
+    }
+}

yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectCheckDetection.java

@@ -0,0 +1,143 @@
+package com.yanzhu.jh.project.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 材料送检对象 sur_project_check_detection
+ * 
+ * @author JiangYuQi
+ * @date 2023-08-26
+ */
+public class SurProjectCheckDetection extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 项目主键 */
+    @Excel(name = "项目主键")
+    private Long projectId;
+
+    /** 单位主键 */
+    @Excel(name = "单位主键")
+    private Long deptId;
+
+    /** 送检类型 */
+    @Excel(name = "送检类型")
+    private String checkType;
+
+    /** 送检时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "送检时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date checkTime;
+
+    /** 送检状态 */
+    @Excel(name = "送检状态")
+    private String checkState;
+
+    /** 检测结果 */
+    @Excel(name = "检测结果")
+    private String detectionResult;
+
+    /** 检测报告 */
+    @Excel(name = "检测报告")
+    private String detectionFile;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setProjectId(Long projectId) 
+    {
+        this.projectId = projectId;
+    }
+
+    public Long getProjectId() 
+    {
+        return projectId;
+    }
+    public void setDeptId(Long deptId) 
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId() 
+    {
+        return deptId;
+    }
+    public void setCheckType(String checkType) 
+    {
+        this.checkType = checkType;
+    }
+
+    public String getCheckType() 
+    {
+        return checkType;
+    }
+    public void setCheckTime(Date checkTime) 
+    {
+        this.checkTime = checkTime;
+    }
+
+    public Date getCheckTime() 
+    {
+        return checkTime;
+    }
+    public void setCheckState(String checkState) 
+    {
+        this.checkState = checkState;
+    }
+
+    public String getCheckState() 
+    {
+        return checkState;
+    }
+    public void setDetectionResult(String detectionResult) 
+    {
+        this.detectionResult = detectionResult;
+    }
+
+    public String getDetectionResult() 
+    {
+        return detectionResult;
+    }
+    public void setDetectionFile(String detectionFile) 
+    {
+        this.detectionFile = detectionFile;
+    }
+
+    public String getDetectionFile() 
+    {
+        return detectionFile;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("projectId", getProjectId())
+            .append("deptId", getDeptId())
+            .append("checkType", getCheckType())
+            .append("checkTime", getCheckTime())
+            .append("checkState", getCheckState())
+            .append("detectionResult", getDetectionResult())
+            .append("detectionFile", getDetectionFile())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectVideoConfig.java

@@ -23,6 +23,10 @@ public class SurProjectVideoConfig extends BaseEntity
     @Excel(name = "项目主键")
     private Long projectId;
 
+    /** 视频名称 */
+    @Excel(name = "视频名称")
+    private String videoName;
+
     /** 视频类型 */
     @Excel(name = "视频类型")
     private String videoOnlyType;
@@ -37,7 +41,7 @@ public class SurProjectVideoConfig extends BaseEntity
 
     /** 通道数量 */
     @Excel(name = "通道数量")
-    private Long videoPassageCount;
+    private int videoPassageCount;
 
     /** 通信类型 */
     @Excel(name = "通信类型")
@@ -105,12 +109,13 @@ public class SurProjectVideoConfig extends BaseEntity
     {
         return videoDvrSecurity;
     }
-    public void setVideoPassageCount(Long videoPassageCount) 
+
+    public void setVideoPassageCount(int videoPassageCount)
     {
         this.videoPassageCount = videoPassageCount;
     }
 
-    public Long getVideoPassageCount() 
+    public int getVideoPassageCount()
     {
         return videoPassageCount;
     }
@@ -169,11 +174,20 @@ public class SurProjectVideoConfig extends BaseEntity
         this.projectName = projectName;
     }
 
+    public String getVideoName() {
+        return videoName;
+    }
+
+    public void setVideoName(String videoName) {
+        this.videoName = videoName;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
             .append("projectId", getProjectId())
+            .append("videoName", getVideoName())
             .append("videoOnlyType", getVideoOnlyType())
             .append("videoDvrNumber", getVideoDvrNumber())
             .append("videoDvrSecurity", getVideoDvrSecurity())

yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectCheckDetectionMapper.java

@@ -0,0 +1,61 @@
+package com.yanzhu.jh.project.mapper;
+
+import java.util.List;
+import com.yanzhu.jh.project.domain.SurProjectCheckDetection;
+
+/**
+ * 材料送检Mapper接口
+ * 
+ * @author JiangYuQi
+ * @date 2023-08-26
+ */
+public interface SurProjectCheckDetectionMapper 
+{
+    /**
+     * 查询材料送检
+     * 
+     * @param id 材料送检主键
+     * @return 材料送检
+     */
+    public SurProjectCheckDetection selectSurProjectCheckDetectionById(Long id);
+
+    /**
+     * 查询材料送检列表
+     * 
+     * @param surProjectCheckDetection 材料送检
+     * @return 材料送检集合
+     */
+    public List<SurProjectCheckDetection> selectSurProjectCheckDetectionList(SurProjectCheckDetection surProjectCheckDetection);
+
+    /**
+     * 新增材料送检
+     * 
+     * @param surProjectCheckDetection 材料送检
+     * @return 结果
+     */
+    public int insertSurProjectCheckDetection(SurProjectCheckDetection surProjectCheckDetection);
+
+    /**
+     * 修改材料送检
+     * 
+     * @param surProjectCheckDetection 材料送检
+     * @return 结果
+     */
+    public int updateSurProjectCheckDetection(SurProjectCheckDetection surProjectCheckDetection);
+
+    /**
+     * 删除材料送检
+     * 
+     * @param id 材料送检主键
+     * @return 结果
+     */
+    public int deleteSurProjectCheckDetectionById(Long id);
+
+    /**
+     * 批量删除材料送检
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSurProjectCheckDetectionByIds(Long[] ids);
+}

yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectCheckDetectionService.java

@@ -0,0 +1,61 @@
+package com.yanzhu.jh.project.service;
+
+import java.util.List;
+import com.yanzhu.jh.project.domain.SurProjectCheckDetection;
+
+/**
+ * 材料送检Service接口
+ * 
+ * @author JiangYuQi
+ * @date 2023-08-26
+ */
+public interface ISurProjectCheckDetectionService 
+{
+    /**
+     * 查询材料送检
+     * 
+     * @param id 材料送检主键
+     * @return 材料送检
+     */
+    public SurProjectCheckDetection selectSurProjectCheckDetectionById(Long id);
+
+    /**
+     * 查询材料送检列表
+     * 
+     * @param surProjectCheckDetection 材料送检
+     * @return 材料送检集合
+     */
+    public List<SurProjectCheckDetection> selectSurProjectCheckDetectionList(SurProjectCheckDetection surProjectCheckDetection);
+
+    /**
+     * 新增材料送检
+     * 
+     * @param surProjectCheckDetection 材料送检
+     * @return 结果
+     */
+    public int insertSurProjectCheckDetection(SurProjectCheckDetection surProjectCheckDetection);
+
+    /**
+     * 修改材料送检
+     * 
+     * @param surProjectCheckDetection 材料送检
+     * @return 结果
+     */
+    public int updateSurProjectCheckDetection(SurProjectCheckDetection surProjectCheckDetection);
+
+    /**
+     * 批量删除材料送检
+     * 
+     * @param ids 需要删除的材料送检主键集合
+     * @return 结果
+     */
+    public int deleteSurProjectCheckDetectionByIds(Long[] ids);
+
+    /**
+     * 删除材料送检信息
+     * 
+     * @param id 材料送检主键
+     * @return 结果
+     */
+    public int deleteSurProjectCheckDetectionById(Long id);
+}

yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckDetectionServiceImpl.java

@@ -0,0 +1,98 @@
+package com.yanzhu.jh.project.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.yanzhu.jh.project.mapper.SurProjectCheckDetectionMapper;
+import com.yanzhu.jh.project.domain.SurProjectCheckDetection;
+import com.yanzhu.jh.project.service.ISurProjectCheckDetectionService;
+import com.ruoyi.common.utils.SecurityUtils;
+/**
+ * 材料送检Service业务层处理
+ * 
+ * @author JiangYuQi
+ * @date 2023-08-26
+ */
+@Service
+public class SurProjectCheckDetectionServiceImpl implements ISurProjectCheckDetectionService 
+{
+    @Autowired
+    private SurProjectCheckDetectionMapper surProjectCheckDetectionMapper;
+
+    /**
+     * 查询材料送检
+     * 
+     * @param id 材料送检主键
+     * @return 材料送检
+     */
+    @Override
+    public SurProjectCheckDetection selectSurProjectCheckDetectionById(Long id)
+    {
+        return surProjectCheckDetectionMapper.selectSurProjectCheckDetectionById(id);
+    }
+
+    /**
+     * 查询材料送检列表
+     * 
+     * @param surProjectCheckDetection 材料送检
+     * @return 材料送检
+     */
+    @Override
+    public List<SurProjectCheckDetection> selectSurProjectCheckDetectionList(SurProjectCheckDetection surProjectCheckDetection)
+    {
+        return surProjectCheckDetectionMapper.selectSurProjectCheckDetectionList(surProjectCheckDetection);
+    }
+
+    /**
+     * 新增材料送检
+     * 
+     * @param surProjectCheckDetection 材料送检
+     * @return 结果
+     */
+    @Override
+    public int insertSurProjectCheckDetection(SurProjectCheckDetection surProjectCheckDetection)
+    {
+        surProjectCheckDetection.setCreateBy(SecurityUtils.getUsername());
+        surProjectCheckDetection.setCreateTime(DateUtils.getNowDate());
+        return surProjectCheckDetectionMapper.insertSurProjectCheckDetection(surProjectCheckDetection);
+    }
+
+    /**
+     * 修改材料送检
+     * 
+     * @param surProjectCheckDetection 材料送检
+     * @return 结果
+     */
+    @Override
+    public int updateSurProjectCheckDetection(SurProjectCheckDetection surProjectCheckDetection)
+    {
+        surProjectCheckDetection.setUpdateBy(SecurityUtils.getUsername());
+        surProjectCheckDetection.setUpdateTime(DateUtils.getNowDate());
+        return surProjectCheckDetectionMapper.updateSurProjectCheckDetection(surProjectCheckDetection);
+    }
+
+    /**
+     * 批量删除材料送检
+     * 
+     * @param ids 需要删除的材料送检主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSurProjectCheckDetectionByIds(Long[] ids)
+    {
+        return surProjectCheckDetectionMapper.deleteSurProjectCheckDetectionByIds(ids);
+    }
+
+    /**
+     * 删除材料送检信息
+     * 
+     * @param id 材料送检主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSurProjectCheckDetectionById(Long id)
+    {
+        return surProjectCheckDetectionMapper.deleteSurProjectCheckDetectionById(id);
+    }
+}

yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectVideoConfigServiceImpl.java

@@ -1,6 +1,8 @@
 package com.yanzhu.jh.project.service.impl;
 
 import java.util.List;
+
+import com.ruoyi.common.enums.PublicStateEnum;
 import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -58,6 +60,8 @@ public class SurProjectVideoConfigServiceImpl implements ISurProjectVideoConfigS
     @Override
     public int insertSurProjectVideoConfig(SurProjectVideoConfig surProjectVideoConfig)
     {
+        surProjectVideoConfig.setVideoPassageCount(surProjectVideoConfig.getSurProjectVideoPassageList().size());
+        surProjectVideoConfig.setIsDel(PublicStateEnum.OK.getCode());
         surProjectVideoConfig.setCreateBy(SecurityUtils.getUsername());
         surProjectVideoConfig.setCreateTime(DateUtils.getNowDate());
         int rows = surProjectVideoConfigMapper.insertSurProjectVideoConfig(surProjectVideoConfig);
@@ -75,6 +79,8 @@ public class SurProjectVideoConfigServiceImpl implements ISurProjectVideoConfigS
     @Override
     public int updateSurProjectVideoConfig(SurProjectVideoConfig surProjectVideoConfig)
     {
+
+        surProjectVideoConfig.setVideoPassageCount(surProjectVideoConfig.getSurProjectVideoPassageList().size());
         surProjectVideoConfig.setUpdateBy(SecurityUtils.getUsername());
         surProjectVideoConfig.setUpdateTime(DateUtils.getNowDate());
         surProjectVideoConfigMapper.deleteSurProjectVideoPassageByVideoId(surProjectVideoConfig.getId());
@@ -125,6 +131,7 @@ public class SurProjectVideoConfigServiceImpl implements ISurProjectVideoConfigS
             for (SurProjectVideoPassage surProjectVideoPassage : surProjectVideoPassageList)
             {
                 surProjectVideoPassage.setVideoId(id);
+                surProjectVideoPassage.setVideoDvrNumber(surProjectVideoConfig.getVideoDvrNumber());
                 list.add(surProjectVideoPassage);
             }
             if (list.size() > 0)

yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml

@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yanzhu.jh.project.mapper.SurProjectCheckDetectionMapper">
+    
+    <resultMap type="SurProjectCheckDetection" id="SurProjectCheckDetectionResult">
+        <result property="id"    column="id"    />
+        <result property="projectId"    column="project_id"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="checkType"    column="check_type"    />
+        <result property="checkTime"    column="check_time"    />
+        <result property="checkState"    column="check_state"    />
+        <result property="detectionResult"    column="detection_result"    />
+        <result property="detectionFile"    column="detection_file"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectSurProjectCheckDetectionVo">
+        select id, project_id, dept_id, check_type, check_time, check_state, detection_result, detection_file, create_by, create_time, update_by, update_time, remark from sur_project_check_detection
+    </sql>
+
+    <select id="selectSurProjectCheckDetectionList" parameterType="SurProjectCheckDetection" resultMap="SurProjectCheckDetectionResult">
+        <include refid="selectSurProjectCheckDetectionVo"/>
+        <where>  
+            <if test="projectId != null "> and project_id = #{projectId}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="checkType != null  and checkType != ''"> and check_type = #{checkType}</if>
+            <if test="params.beginCheckTime != null and params.beginCheckTime != '' and params.endCheckTime != null and params.endCheckTime != ''"> and check_time between #{params.beginCheckTime} and #{params.endCheckTime}</if>
+            <if test="checkState != null  and checkState != ''"> and check_state = #{checkState}</if>
+            <if test="detectionResult != null  and detectionResult != ''"> and detection_result = #{detectionResult}</if>
+            <if test="detectionFile != null  and detectionFile != ''"> and detection_file = #{detectionFile}</if>
+        </where>
+    </select>
+    
+    <select id="selectSurProjectCheckDetectionById" parameterType="Long" resultMap="SurProjectCheckDetectionResult">
+        <include refid="selectSurProjectCheckDetectionVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertSurProjectCheckDetection" parameterType="SurProjectCheckDetection" useGeneratedKeys="true" keyProperty="id">
+        insert into sur_project_check_detection
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="projectId != null">project_id,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="checkType != null">check_type,</if>
+            <if test="checkTime != null">check_time,</if>
+            <if test="checkState != null">check_state,</if>
+            <if test="detectionResult != null">detection_result,</if>
+            <if test="detectionFile != null">detection_file,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="projectId != null">#{projectId},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="checkType != null">#{checkType},</if>
+            <if test="checkTime != null">#{checkTime},</if>
+            <if test="checkState != null">#{checkState},</if>
+            <if test="detectionResult != null">#{detectionResult},</if>
+            <if test="detectionFile != null">#{detectionFile},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSurProjectCheckDetection" parameterType="SurProjectCheckDetection">
+        update sur_project_check_detection
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="projectId != null">project_id = #{projectId},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="checkType != null">check_type = #{checkType},</if>
+            <if test="checkTime != null">check_time = #{checkTime},</if>
+            <if test="checkState != null">check_state = #{checkState},</if>
+            <if test="detectionResult != null">detection_result = #{detectionResult},</if>
+            <if test="detectionFile != null">detection_file = #{detectionFile},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSurProjectCheckDetectionById" parameterType="Long">
+        delete from sur_project_check_detection where id = #{id}
+    </delete>
+
+    <delete id="deleteSurProjectCheckDetectionByIds" parameterType="String">
+        delete from sur_project_check_detection where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

yanzhu-jh/src/main/resources/mapper/project/SurProjectVideoConfigMapper.xml

@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="projectId"    column="project_id"    />
         <result property="projectName"    column="projectName"    />
+        <result property="videoName"    column="video_name"    />
         <result property="videoOnlyType"    column="video_only_type"    />
         <result property="videoDvrNumber"    column="video_dvr_number"    />
         <result property="videoDvrSecurity"    column="video_dvr_security"    />
@@ -36,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectSurProjectVideoConfigVo">
-        select spvc.id, spvc.project_id, spvc.video_only_type, spvc.video_dvr_number, spvc.video_dvr_security, spvc.video_passage_count, spvc.signal_type, spvc.signal_state, spvc.signal_code, spvc.is_del, spvc.create_by, spvc.create_time, spvc.update_by, spvc.update_time, spvc.remark, sp.projectName from sur_project_video_config spvc
+        select spvc.id, spvc.project_id, spvc.video_name, spvc.video_only_type, spvc.video_dvr_number, spvc.video_dvr_security, spvc.video_passage_count, spvc.signal_type, spvc.signal_state, spvc.signal_code, spvc.is_del, spvc.create_by, spvc.create_time, spvc.update_by, spvc.update_time, spvc.remark, sp.projectName from sur_project_video_config spvc
         left join sur_project sp on sp.id=spvc.project_id
     </sql>
 
@@ -46,10 +47,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and spvc.is_del='0'
             <if test="projectId != null "> and spvc.project_id = #{projectId}</if>
             <if test="projectName != null "> and sp.projectName like concat('%', #{projectName}, '%')</if>
+            <if test="videoName != null "> and spvc.video_name like concat('%', #{videoName}, '%')</if>
             <if test="videoOnlyType != null  and videoOnlyType != ''"> and spvc.video_only_type = #{videoOnlyType}</if>
             <if test="videoDvrNumber != null  and videoDvrNumber != ''"> and spvc.video_dvr_number like concat('%', #{videoDvrNumber}, '%')</if>
             <if test="videoDvrSecurity != null  and videoDvrSecurity != ''"> and spvc.video_dvr_security = #{videoDvrSecurity}</if>
-            <if test="videoPassageCount != null "> and spvc.video_passage_count = #{videoPassageCount}</if>
             <if test="signalType != null  and signalType != ''"> and spvc.signal_type = #{signalType}</if>
             <if test="signalState != null  and signalState != ''"> and spvc.signal_state = #{signalState}</if>
             <if test="signalCode != null  and signalCode != ''"> and spvc.signal_code = #{signalCode}</if>
@@ -65,7 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     
     <select id="selectSurProjectVideoConfigById" parameterType="Long" resultMap="SurProjectVideoConfigSurProjectVideoPassageResult">
-        select a.id, a.project_id, a.video_only_type, a.video_dvr_number, a.video_dvr_security, a.video_passage_count, a.signal_type, a.signal_state, a.signal_code, a.is_del, a.create_by, a.create_time, a.update_by, a.update_time, a.remark, p.projectName,
+        select a.id, a.project_id, a.video_name, a.video_only_type, a.video_dvr_number, a.video_dvr_security, a.video_passage_count, a.signal_type, a.signal_state, a.signal_code, a.is_del, a.create_by, a.create_time, a.update_by, a.update_time, a.remark, p.projectName,
         b.id as sub_id, b.video_id as sub_video_id, b.video_dvr_number as sub_video_dvr_number, b.passage_name as sub_passage_name, b.passage_value as sub_passage_value
         from sur_project_video_config a
         left join sur_project p on a.project_id=p.id
@@ -77,6 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into sur_project_video_config
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="projectId != null">project_id,</if>
+            <if test="videoName != null">video_name,</if>
             <if test="videoOnlyType != null">video_only_type,</if>
             <if test="videoDvrNumber != null">video_dvr_number,</if>
             <if test="videoDvrSecurity != null">video_dvr_security,</if>
@@ -93,6 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="projectId != null">#{projectId},</if>
+            <if test="videoName != null">#{videoName},</if>
             <if test="videoOnlyType != null">#{videoOnlyType},</if>
             <if test="videoDvrNumber != null">#{videoDvrNumber},</if>
             <if test="videoDvrSecurity != null">#{videoDvrSecurity},</if>
@@ -113,6 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update sur_project_video_config
         <trim prefix="SET" suffixOverrides=",">
             <if test="projectId != null">project_id = #{projectId},</if>
+            <if test="videoName != null">video_name = #{videoName},</if>
             <if test="videoOnlyType != null">video_only_type = #{videoOnlyType},</if>
             <if test="videoDvrNumber != null">video_dvr_number = #{videoDvrNumber},</if>
             <if test="videoDvrSecurity != null">video_dvr_security = #{videoDvrSecurity},</if>