diff --git a/src/main/java/com/genersoft/iot/vmp/jt1078/controller/JT1078TerminalController.java b/src/main/java/com/genersoft/iot/vmp/jt1078/controller/JT1078TerminalController.java
index ac0a5dcf6..6f27df398 100644
--- a/src/main/java/com/genersoft/iot/vmp/jt1078/controller/JT1078TerminalController.java
+++ b/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")
diff --git a/src/main/java/com/genersoft/iot/vmp/jt1078/dao/JTChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/jt1078/dao/JTChannelMapper.java
index 331c4095b..555a899c7 100644
--- a/src/main/java/com/genersoft/iot/vmp/jt1078/dao/JTChannelMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/jt1078/dao/JTChannelMapper.java
@@ -29,17 +29,108 @@ public interface JTChannelMapper {
", has_audio=#{hasAudio}" +
", name=#{name}" +
", channel_id=#{channelId}" +
+ ", gb_manufacturer=#{gbManufacturer}" +
+ ", gb_model=#{gbModel}" +
+ ", gb_civil_code=#{gbCivilCode}" +
+ ", gb_block=#{gbBlock}" +
+ ", gb_address=#{gbAddress}" +
+ ", gb_parental=#{gbParental}" +
+ ", gb_parent_id=#{gbParentId}" +
+ ", gb_register_way=#{gbRegisterWay}" +
+ ", gb_security_level_code=#{gbSecurityLevelCode}" +
+ ", gb_secrecy=#{gbSecrecy}" +
+ ", gb_ip_address=#{gbIpAddress}" +
+ ", gb_port=#{gbPort}" +
+ ", gb_password=#{gbPassword}" +
+ ", gb_status=#{gbStatus}" +
+ ", gb_longitude=#{gbLongitude}" +
+ ", gb_latitude=#{gbLatitude}" +
+ ", gb_business_group_id=#{gbBusinessGroupId}" +
+ ", gb_ptz_type=#{gbPtzType}" +
+ ", gb_photoelectric_imaging_typ=#{gbPhotoelectricImagingTyp}" +
+ ", gb_capture_position_type=#{gbCapturePositionType}" +
+ ", gb_room_type=#{gbRoomType}" +
+ ", gb_supply_light_type=#{gbSupplyLightType}" +
+ ", gb_direction_type=#{gbDirectionType}" +
+ ", gb_resolution=#{gbResolution}" +
+ ", gb_stream_number_list=#{gbStreamNumberList}" +
+ ", gb_download_speed=#{gbDownloadSpeed}" +
+ ", gb_svc_space_support_mod=#{gbSvcSpaceSupportMod}" +
+ ", gb_svc_time_support_mode=#{gbSvcTimeSupportMode}" +
+ ", gb_ssvc_ratio_support_list=#{gbSsvcRatioSupportList}" +
+ ", gb_mobile_device_type=#{gbMobileDeviceType}" +
+ ", gb_horizontal_field_angle=#{gbHorizontalFieldAngle}" +
+ ", gb_vertical_field_angle=#{gbVerticalFieldAngle}" +
+ ", gb_max_view_distance=#{gbMaxViewDistance}" +
+ ", gb_grassroots_code=#{gbGrassrootsCode}" +
+ ", gb_po_type=#{gbPoType}" +
+ ", gb_po_common_name=#{gbPoCommonName}" +
+ ", gb_mac=#{gbMac}" +
+ ", gb_function_type=#{gbFunctionType}" +
+ ", gb_encode_type=#{gbEncodeType}" +
+ ", gb_install_time=#{gbInstallTime}" +
+ ", gb_management_unit=#{gbManagementUnit}" +
+ ", gb_contact_info=#{gbContactInfo}" +
+ ", gb_record_save_days=#{gbRecordSaveDays}" +
+ ", gb_industrial_classification=#{gbIndustrialClassification}" +
"WHERE id=#{id}"+
" "})
void update(JTChannel channel);
- @Insert("INSERT INTO wvp_jt_channel (" +
+ @Insert(value = {" "})
void add(JTChannel channel);
@Delete("delete from wvp_jt_channel where id = #{id}")
@@ -62,4 +199,12 @@ public interface JTChannelMapper {
" "})
JTChannel getChannel(@Param("terminalDbId") int terminalDbId, @Param("channelId") Integer channelId);
+ @Select(value = {" "})
+ JTChannel getChannelByDbId(@Param("id") Integer id);
}
diff --git a/src/main/java/com/genersoft/iot/vmp/jt1078/service/Ijt1078Service.java b/src/main/java/com/genersoft/iot/vmp/jt1078/service/Ijt1078Service.java
index 31f1d862c..c0092d46b 100644
--- a/src/main/java/com/genersoft/iot/vmp/jt1078/service/Ijt1078Service.java
+++ b/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);
}
diff --git a/src/main/java/com/genersoft/iot/vmp/jt1078/service/impl/jt1078ServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/jt1078/service/impl/jt1078ServiceImpl.java
index 7c58f9aa4..90a2992e9 100644
--- a/src/main/java/com/genersoft/iot/vmp/jt1078/service/impl/jt1078ServiceImpl.java
+++ b/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);
+ }
}
diff --git a/web_src/src/components/JTChannelGBParams.vue b/web_src/src/components/JTChannelEdit.vue
similarity index 86%
rename from web_src/src/components/JTChannelGBParams.vue
rename to web_src/src/components/JTChannelEdit.vue
index 00754388a..e1ca3eb46 100755
--- a/web_src/src/components/JTChannelGBParams.vue
+++ b/web_src/src/components/JTChannelEdit.vue
@@ -4,7 +4,7 @@
- 国标通道参数
+ 通道编辑