1078-完善接入国标通道页面以及属性

src/main/java/com/genersoft/iot/vmp/jt1078/controller/JT1078TerminalController.java

@@ -89,6 +89,14 @@ public class JT1078TerminalController {
         return service.getChannelList(page, count, deviceId, query);
     }
 
+    @Operation(summary = "1078-查询单个部标通道", security = @SecurityRequirement(name = JwtUtils.HEADER))
+    @Parameter(name = "id", description = "通道数据库ID", required = true)
+    @GetMapping("/channel/one")
+    public JTChannel getChannel(Integer id) {
+        assert id != null;
+        return service.getChannelByDbId(id);
+    }
+
     @Operation(summary = "1078-更新通道", security = @SecurityRequirement(name = JwtUtils.HEADER))
     @Parameter(name = "channel", description = "通道", required = true)
     @PostMapping("/channel/update")

src/main/java/com/genersoft/iot/vmp/jt1078/dao/JTChannelMapper.java

@@ -29,17 +29,108 @@ public interface JTChannelMapper {
             "<if test=\"hasAudio != null\">, has_audio=#{hasAudio}</if>" +
             "<if test=\"name != null\">, name=#{name}</if>" +
             "<if test=\"channelId != null\">, channel_id=#{channelId}</if>" +
+            "<if test='gbManufacturer != null'>, gb_manufacturer=#{gbManufacturer}</if>" +
+            "<if test='gbModel != null'>, gb_model=#{gbModel}</if>" +
+            "<if test='gbCivilCode != null'>, gb_civil_code=#{gbCivilCode}</if>" +
+            "<if test='gbBlock != null'>, gb_block=#{gbBlock}</if>" +
+            "<if test='gbAddress != null'>, gb_address=#{gbAddress}</if>" +
+            "<if test='gbParental != null'>, gb_parental=#{gbParental}</if>" +
+            "<if test='gbParentId != null'>, gb_parent_id=#{gbParentId}</if>" +
+            "<if test='gbRegisterWay != null'>, gb_register_way=#{gbRegisterWay}</if>" +
+            "<if test='gbSecurityLevelCode != null'>, gb_security_level_code=#{gbSecurityLevelCode}</if>" +
+            "<if test='gbSecrecy != null'>, gb_secrecy=#{gbSecrecy}</if>" +
+            "<if test='gbIpAddress != null'>, gb_ip_address=#{gbIpAddress}</if>" +
+            "<if test='gbPort != null'>, gb_port=#{gbPort}</if>" +
+            "<if test='gbPassword != null'>, gb_password=#{gbPassword}</if>" +
+            "<if test='gbStatus != null'>, gb_status=#{gbStatus}</if>" +
+            "<if test='gbLongitude != null'>, gb_longitude=#{gbLongitude}</if>" +
+            "<if test='gbLatitude != null'>, gb_latitude=#{gbLatitude}</if>" +
+            "<if test='gbBusinessGroupId != null'>, gb_business_group_id=#{gbBusinessGroupId}</if>" +
+            "<if test='gbPtzType != null'>, gb_ptz_type=#{gbPtzType}</if>" +
+            "<if test='gbPhotoelectricImagingTyp != null'>, gb_photoelectric_imaging_typ=#{gbPhotoelectricImagingTyp}</if>" +
+            "<if test='gbCapturePositionType != null'>, gb_capture_position_type=#{gbCapturePositionType}</if>" +
+            "<if test='gbRoomType != null'>, gb_room_type=#{gbRoomType}</if>" +
+            "<if test='gbSupplyLightType != null'>, gb_supply_light_type=#{gbSupplyLightType}</if>" +
+            "<if test='gbDirectionType != null'>, gb_direction_type=#{gbDirectionType}</if>" +
+            "<if test='gbResolution != null'>, gb_resolution=#{gbResolution}</if>" +
+            "<if test='gbStreamNumberList != null'>, gb_stream_number_list=#{gbStreamNumberList}</if>" +
+            "<if test='gbDownloadSpeed != null'>, gb_download_speed=#{gbDownloadSpeed}</if>" +
+            "<if test='gbSvcSpaceSupportMod != null'>, gb_svc_space_support_mod=#{gbSvcSpaceSupportMod}</if>" +
+            "<if test='gbSvcTimeSupportMode != null'>, gb_svc_time_support_mode=#{gbSvcTimeSupportMode}</if>" +
+            "<if test='gbSsvcRatioSupportList != null'>, gb_ssvc_ratio_support_list=#{gbSsvcRatioSupportList}</if>" +
+            "<if test='gbMobileDeviceType != null'>, gb_mobile_device_type=#{gbMobileDeviceType}</if>" +
+            "<if test='gbHorizontalFieldAngle != null'>, gb_horizontal_field_angle=#{gbHorizontalFieldAngle}</if>" +
+            "<if test='gbVerticalFieldAngle != null'>, gb_vertical_field_angle=#{gbVerticalFieldAngle}</if>" +
+            "<if test='gbMaxViewDistance != null'>, gb_max_view_distance=#{gbMaxViewDistance}</if>" +
+            "<if test='gbGrassrootsCode != null'>, gb_grassroots_code=#{gbGrassrootsCode}</if>" +
+            "<if test='gbPoType != null'>, gb_po_type=#{gbPoType}</if>" +
+            "<if test='gbPoCommonName != null'>, gb_po_common_name=#{gbPoCommonName}</if>" +
+            "<if test='gbMac != null'>, gb_mac=#{gbMac}</if>" +
+            "<if test='gbFunctionType != null'>, gb_function_type=#{gbFunctionType}</if>" +
+            "<if test='gbEncodeType != null'>, gb_encode_type=#{gbEncodeType}</if>" +
+            "<if test='gbInstallTime != null'>, gb_install_time=#{gbInstallTime}</if>" +
+            "<if test='gbManagementUnit != null'>, gb_management_unit=#{gbManagementUnit}</if>" +
+            "<if test='gbContactInfo != null'>, gb_contact_info=#{gbContactInfo}</if>" +
+            "<if test='gbRecordSaveDays != null'>, gb_record_save_days=#{gbRecordSaveDays}</if>" +
+            "<if test='gbIndustrialClassification != null'>, gb_industrial_classification=#{gbIndustrialClassification}</if>" +
             "WHERE id=#{id}"+
             " </script>"})
     void update(JTChannel channel);
 
-    @Insert("INSERT INTO wvp_jt_channel (" +
+    @Insert(value = {" <script>" +
+            "INSERT INTO wvp_jt_channel (" +
             "terminal_db_id,"+
             "channel_id,"+
             "name,"+
             "has_audio,"+
             "create_time,"+
             "update_time"+
+            "<if test='gbDeviceId != null'>, gb_device_id</if>" +
+            "<if test='gbName != null'>, gb_name</if>" +
+            "<if test='gbManufacturer != null'>, gb_manufacturer</if>" +
+            "<if test='gbModel != null'>, gb_model</if>" +
+            "<if test='gbCivilCode != null'>, gb_civil_code</if>" +
+            "<if test='gbBlock != null'>, gb_block</if>" +
+            "<if test='gbAddress != null'>, gb_address</if>" +
+            "<if test='gbParental != null'>, gb_parental</if>" +
+            "<if test='gbParentId != null'>, gb_parent_id</if>" +
+            "<if test='gbRegisterWay != null'>, gb_register_way</if>" +
+            "<if test='gbSecurityLevelCode != null'>, gb_security_level_code</if>" +
+            "<if test='gbSecrecy != null'>, gb_secrecy</if>" +
+            "<if test='gbIpAddress != null'>, gb_ip_address</if>" +
+            "<if test='gbPort != null'>, gb_port</if>" +
+            "<if test='gbPassword != null'>, gb_password</if>" +
+            "<if test='gbStatus != null'>, gb_status</if>" +
+            "<if test='gbLongitude != null'>, gb_longitude</if>" +
+            "<if test='gbLatitude != null'>, gb_latitude</if>" +
+            "<if test='gbBusinessGroupId != null'>, gb_business_group_id</if>" +
+            "<if test='gbPtzType != null'>, gb_ptz_type</if>" +
+            "<if test='gbPhotoelectricImagingTyp != null'>, gb_photoelectric_imaging_typ</if>" +
+            "<if test='gbCapturePositionType != null'>, gb_capture_position_type</if>" +
+            "<if test='gbRoomType != null'>, gb_room_type</if>" +
+            "<if test='gbSupplyLightType != null'>, gb_supply_light_type</if>" +
+            "<if test='gbDirectionType != null'>, gb_direction_type</if>" +
+            "<if test='gbResolution != null'>, gb_resolution</if>" +
+            "<if test='gbStreamNumberList != null'>, gb_stream_number_list</if>" +
+            "<if test='gbDownloadSpeed != null'>, gb_download_speed</if>" +
+            "<if test='gbSvcSpaceSupportMod != null'>, gb_svc_space_support_mod</if>" +
+            "<if test='gbSvcTimeSupportMode != null'>, gb_svc_time_support_mode</if>" +
+            "<if test='gbSsvcRatioSupportList != null'>, gb_ssvc_ratio_support_list</if>" +
+            "<if test='gbMobileDeviceType != null'>, gb_mobile_device_type</if>" +
+            "<if test='gbHorizontalFieldAngle != null'>, gb_horizontal_field_angle</if>" +
+            "<if test='gbVerticalFieldAngle != null'>, gb_vertical_field_angle</if>" +
+            "<if test='gbMaxViewDistance != null'>, gb_max_view_distance</if>" +
+            "<if test='gbGrassrootsCode != null'>, gb_grassroots_code</if>" +
+            "<if test='gbPoType != null'>, gb_po_type</if>" +
+            "<if test='gbPoCommonName != null'>, gb_po_common_name</if>" +
+            "<if test='gbMac != null'>, gb_mac</if>" +
+            "<if test='gbFunctionType != null'>, gb_function_type</if>" +
+            "<if test='gbEncodeType != null'>, gb_encode_type</if>" +
+            "<if test='gbInstallTime != null'>, gb_install_time</if>" +
+            "<if test='gbManagementUnit != null'>, gb_management_unit</if>" +
+            "<if test='gbContactInfo != null'>, gb_contact_info</if>" +
+            "<if test='gbRecordSaveDays != null'>, gb_record_save_days</if>" +
+            "<if test='gbIndustrialClassification != null'>, gb_industrial_classification</if>" +
             ") VALUES (" +
             "#{terminalDbId}," +
             "#{channelId}," +
@@ -47,7 +138,53 @@ public interface JTChannelMapper {
             "#{hasAudio}," +
             "#{createTime}," +
             "#{updateTime}" +
-            ")")
+            "<if test='gbDeviceId != null'>, #{gbDeviceId}</if>" +
+            "<if test='gbName != null'>, #{gbName}</if>" +
+            "<if test='gbManufacturer != null'>, #{gbManufacturer}</if>" +
+            "<if test='gbModel != null'>, #{gbModel}</if>" +
+            "<if test='gbCivilCode != null'>, #{gbCivilCode}</if>" +
+            "<if test='gbBlock != null'>, #{gbBlock}</if>" +
+            "<if test='gbAddress != null'>, #{gbAddress}</if>" +
+            "<if test='gbParental != null'>, #{gbParental}</if>" +
+            "<if test='gbParentId != null'>, #{gbParentId}</if>" +
+            "<if test='gbRegisterWay != null'>, #{gbRegisterWay}</if>" +
+            "<if test='gbSecurityLevelCode != null'>, #{gbSecurityLevelCode}</if>" +
+            "<if test='gbSecrecy != null'>, #{gbSecrecy}</if>" +
+            "<if test='gbIpAddress != null'>, #{gbIpAddress}</if>" +
+            "<if test='gbPort != null'>, #{gbPort}</if>" +
+            "<if test='gbPassword != null'>, #{gbPassword}</if>" +
+            "<if test='gbStatus != null'>, #{gbStatus}</if>" +
+            "<if test='gbLongitude != null'>, #{gbLongitude}</if>" +
+            "<if test='gbLatitude != null'>, #{gbLatitude}</if>" +
+            "<if test='gbBusinessGroupId != null'>, #{gbBusinessGroupId}</if>" +
+            "<if test='gbPtzType != null'>, #{gbPtzType}</if>" +
+            "<if test='gbPhotoelectricImagingTyp != null'>, #{gbPhotoelectricImagingTyp}</if>" +
+            "<if test='gbCapturePositionType != null'>, #{gbCapturePositionType}</if>" +
+            "<if test='gbRoomType != null'>, #{gbRoomType}</if>" +
+            "<if test='gbSupplyLightType != null'>, #{gbSupplyLightType}</if>" +
+            "<if test='gbDirectionType != null'>, #{gbDirectionType}</if>" +
+            "<if test='gbResolution != null'>, #{gbResolution}</if>" +
+            "<if test='gbStreamNumberList != null'>, #{gbStreamNumberList}</if>" +
+            "<if test='gbDownloadSpeed != null'>, #{gbDownloadSpeed}</if>" +
+            "<if test='gbSvcSpaceSupportMod != null'>, #{gbSvcSpaceSupportMod}</if>" +
+            "<if test='gbSvcTimeSupportMode != null'>, #{gbSvcTimeSupportMode}</if>" +
+            "<if test='gbSsvcRatioSupportList != null'>, #{gbSsvcRatioSupportList}</if>" +
+            "<if test='gbMobileDeviceType != null'>, #{gbMobileDeviceType}</if>" +
+            "<if test='gbHorizontalFieldAngle != null'>, #{gbHorizontalFieldAngle}</if>" +
+            "<if test='gbVerticalFieldAngle != null'>, #{gbVerticalFieldAngle}</if>" +
+            "<if test='gbMaxViewDistance != null'>, #{gbMaxViewDistance}</if>" +
+            "<if test='gbGrassrootsCode != null'>, #{gbGrassrootsCode}</if>" +
+            "<if test='gbPoType != null'>, #{gbPoType}</if>" +
+            "<if test='gbPoCommonName != null'>, #{gbPoCommonName}</if>" +
+            "<if test='gbMac != null'>, #{gbMac}</if>" +
+            "<if test='gbFunctionType != null'>, #{gbFunctionType}</if>" +
+            "<if test='gbEncodeType != null'>, #{gbEncodeType}</if>" +
+            "<if test='gbInstallTime != null'>, #{gbInstallTime}</if>" +
+            "<if test='gbManagementUnit != null'>, #{gbManagementUnit}</if>" +
+            "<if test='gbContactInfo != null'>, #{gbContactInfo}</if>" +
+            "<if test='gbRecordSaveDays != null'>, #{gbRecordSaveDays}</if>" +
+            "<if test='gbIndustrialClassification != null'>, #{gbIndustrialClassification}</if>" +
+            " )</script>"})
     void add(JTChannel channel);
 
     @Delete("delete from wvp_jt_channel where id = #{id}")
@@ -62,4 +199,12 @@ public interface JTChannelMapper {
             " </script>"})
     JTChannel getChannel(@Param("terminalDbId") int terminalDbId, @Param("channelId") Integer channelId);
 
+    @Select(value = {" <script>" +
+            " SELECT * " +
+            " from " +
+            " wvp_jt_channel" +
+            " WHERE " +
+            " id = #{id}" +
+            " </script>"})
+    JTChannel getChannelByDbId(@Param("id") Integer id);
 }

src/main/java/com/genersoft/iot/vmp/jt1078/service/Ijt1078Service.java

@@ -133,4 +133,6 @@ public interface Ijt1078Service {
     JTDevice getDeviceById(Integer deviceId);
 
     void updateDevicePosition(String phoneNumber, Double longitude, Double latitude);
+
+    JTChannel getChannelByDbId(Integer id);
 }

src/main/java/com/genersoft/iot/vmp/jt1078/service/impl/jt1078ServiceImpl.java

@@ -1188,4 +1188,8 @@ public class jt1078ServiceImpl implements Ijt1078Service {
         jtDeviceMapper.batchUpdateDevicePosition(devices);
     }
 
+    @Override
+    public JTChannel getChannelByDbId(Integer id) {
+        return jtChannelMapper.getChannelByDbId(id);
+    }
 }

web_src/src/components/JTChannelEdit.vue

@@ -4,7 +4,7 @@
       <div class="page-title">
         <el-button icon="el-icon-back" size="mini" style="font-size: 20px; color: #000;" type="text" @click="showDevice" ></el-button>
         <el-divider direction="vertical"></el-divider>
-        国标通道参数
+        通道编辑
       </div>
       <div class="page-header-btn">
         <div style="display: inline;">
@@ -14,12 +14,21 @@
     </div>
     <el-container v-loading="isLoading" style="height: 82vh; overflow: auto">
       <el-main style="padding: 5px; background-color: #ffffff;">
-        <el-divider content-position="center">通讯参数</el-divider>
+        <el-divider content-position="center">部标通道参数</el-divider>
-        <el-form size="mini"  ref="form" :rules="rules" :model="form" label-width="240px" style="display: grid; grid-template-columns: 1fr 1fr 1fr 1fr;">
+        <el-form ref="form" :rules="rules" :model="form" label-width="240px" style="display: grid; grid-template-columns: 1fr 1fr 1fr ">
-          <el-form-item label="编码" prop="gbDeviceId">
+          <el-form-item label="编号" prop="channelId">
+            <el-input v-model="form.channelId" clearable></el-input>
+          </el-form-item>
+          <el-form-item label="名称" prop="name">
+            <el-input v-model="form.name" clearable></el-input>
+          </el-form-item>
+        </el-form>
+        <el-divider content-position="center">国标通道参数</el-divider>
+        <el-form size="mini"  ref="form" :rules="rules" :model="form" label-width="240px" style="display: grid; grid-template-columns: 1fr 1fr 1fr ">
+          <el-form-item label="国标编码" prop="gbDeviceId">
             <el-input v-model="form.gbDeviceId" clearable></el-input>
           </el-form-item>
-          <el-form-item label="名称" prop="gbName">
+          <el-form-item label="通道名称" prop="gbName">
             <el-input v-model="form.gbName" clearable></el-input>
           </el-form-item>
           <el-form-item label="设备厂商" prop="gbManufacturer">
@@ -184,7 +193,7 @@
             <el-input v-model="form.gbGrassrootsCode" clearable></el-input>
           </el-form-item>
           <el-form-item label="监控点位类型" prop="gbPoType">
-            <el-select multiple v-model="form.gbMobileDeviceType" style="float: left; width: 100%" >
+            <el-select v-model="form.gbPoType" style="float: left; width: 100%" >
               <el-option label="一类视频监控点" :value="1"></el-option>
               <el-option label="二类视频监控点" :value="2"></el-option>
               <el-option label="三类视频监控点" :value="3"></el-option>
@@ -195,7 +204,7 @@
             <el-input v-model="form.gbMac" clearable></el-input>
           </el-form-item>
           <el-form-item label="卡口功能类型" prop="gbFunctionType">
-            <el-select multiple v-model="form.gbFunctionType" style="float: left; width: 100%" >
+            <el-select v-model="form.gbFunctionType" style="float: left; width: 100%" >
               <el-option label="人脸卡口" value="01"></el-option>
               <el-option label="人员卡口" value="02"></el-option>
               <el-option label="机动车卡口" value="03"></el-option>
@@ -249,18 +258,15 @@ export default {
   },
   data() {
     return {
-      phoneNumber: this.$route.params.phoneNumber,
       form: {
-        collisionAlarmParams: {},
+        id: this.$route.params.id,
-        illegalDrivingPeriods: {},
+        terminalDbId: this.$route.params.terminalDbId
-        cameraTimer: {},
       },
       version: 3,
       rules: {
         deviceId: [{ required: true, message: "请输入设备编号", trigger: "blur" }]
       },
       winHeight: window.innerHeight - 200,
-      beforeUrl: "/jtDeviceList",
       isLoading: false,
       loadSnap: {},
     };
@@ -271,35 +277,55 @@ export default {
   },
   methods: {
     initData: function () {
-      this.isLoading = true;
+      console.log(this.form.id)
-      this.$axios({
+      if (this.form.id) {
-        method: 'get',
+        this.isLoading = true;
-        url: `/api/jt1078/config`,
+        this.$axios({
-        params: {
+          method: 'get',
-          phoneNumber: this.phoneNumber
+          url: `/api/jt1078/terminal/channel/one`,
-        }
+          params: {
-      }).then((res)=> {
+            id: this.form.id
-        this.isLoading = false;
+          }
-        console.log(res)
+        }).then((res)=> {
-        this.form = res.data.data;
+          this.isLoading = false;
-      }).cache((e)=>{
+          if (res.data.data) {
-        this.isLoading = false;
+            this.form = res.data.data;
-      });
+          }
+        }).cache((e)=>{
+          this.isLoading = false;
+        });
+      }else {
+        isLoading = false;
+      }
     },
     onSubmit: function () {
+      console.log("onSubmit");
+      let isEdit = typeof (this.form.id) !== "undefined"
       this.$axios({
         method: 'post',
-        url: `/api/jt1078/set-config`,
+        url:`/api/jt1078/terminal/channel/${isEdit?'update':'add'}/`,
-        data: {
+        params: this.form
-          phoneNumber: this.phoneNumber,
+      }).then((res) => {
-          config: this.form
+        console.log(res.data)
+        if (res.data.code === 0) {
+          this.$message({
+            showClose: true,
+            message: "保存成功",
+            type: "success",
+          });
+        }else {
+          this.$message({
+            showClose: true,
+            message: res.data.msg,
+            type: "error",
+          });
         }
-      }).then(function (res) {
+      }).catch(function (error) {
-        console.log(JSON.stringify(res));
+        console.log(error);
       });
     },
     showDevice: function () {
-      this.$router.push(this.beforeUrl)
+      window.history.go(-1)
     },
   }
 };

web_src/src/components/JTChannelList.vue

@@ -306,27 +306,29 @@ export default {
       this.initData();
     },
     add: function () {
-      this.$refs.channelEdit.openDialog(null, this.deviceId, () => {
+      // this.$refs.channelEdit.openDialog(null, this.deviceId, () => {
-        this.$refs.channelEdit.close();
+      //   this.$refs.channelEdit.close();
-        this.$message({
+      //   this.$message({
-          showClose: true,
+      //     showClose: true,
-          message: "添加成功",
+      //     message: "添加成功",
-          type: "success",
+      //     type: "success",
-        });
+      //   });
-        setTimeout(this.getList, 200)
+      //   setTimeout(this.getList, 200)
-      })
+      // })
+      this.$router.push(`/jtChannelEdit/${this.device.id}`);
     },
     // 编辑
     handleEdit(row) {
-      this.$refs.channelEdit.openDialog(row, this.deviceId, () => {
+      // this.$refs.channelEdit.openDialog(row, this.deviceId, () => {
-        this.$refs.channelEdit.close();
+      //   this.$refs.channelEdit.close();
-        this.$message({
+      //   this.$message({
-          showClose: true,
+      //     showClose: true,
-          message: "修改成功",
+      //     message: "修改成功",
-          type: "success",
+      //     type: "success",
-        });
+      //   });
-        setTimeout(this.getList, 200)
+      //   setTimeout(this.getList, 200)
-      })
+      // })
+      this.$router.push(`/jtChannelEdit/${this.device.id}/${row.id}`);
     }
   }
 };

web_src/src/router/index.js

@@ -7,6 +7,7 @@ import deviceList from '../components/DeviceList.vue'
 import jtDeviceList from '../components/JTDeviceList.vue'
 import jtChannelList from '../components/JTChannelList.vue'
 import jtRecordDetail from '../components/JTRecordDetail.vue'
+import jtChannelEdit from '../components/JTChannelEdit.vue'
 import jtDeviceParams from '../components/JTDeviceParam.vue'
 import channelList from '../components/channelList.vue'
 import gbRecordDetail from '../components/GBRecordDetail.vue'
@@ -93,6 +94,16 @@ export default new VueRouter({
           name: 'jtDeviceParams',
           component: jtDeviceParams,
         },
+        {
+          path: '/jtChannelEdit/:terminalDbId/:id',
+          name: 'jtChannelEditUpdate',
+          component: jtChannelEdit,
+        },
+        {
+          path: '/jtChannelEdit/:terminalDbId/',
+          name: 'jtChannelEditAdd',
+          component: jtChannelEdit,
+        },
         {
           path: '/parentPlatformList/:count/:page',
           name: 'parentPlatformList',