diff --git a/pom.xml b/pom.xml
index 6a1b3bf..4c4e200 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,7 +115,12 @@
5.7.20
-
+
+
+ net.java.dev.jna
+ jna
+ 5.9.0
+
org.springframework.boot
diff --git a/xymanager_common/pom.xml b/xymanager_common/pom.xml
index 3bcf5ed..6ec040f 100644
--- a/xymanager_common/pom.xml
+++ b/xymanager_common/pom.xml
@@ -93,6 +93,12 @@
pagehelper-spring-boot-starter
+
+
+ net.java.dev.jna
+ jna
+
+
diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalChannelIdListVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalChannelIdListVo.java
index a9b98c7..d3b6d9e 100644
--- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalChannelIdListVo.java
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalChannelIdListVo.java
@@ -12,5 +12,11 @@ import java.util.List;
public class TerminalChannelIdListVo {
@NotEmpty(message = "不能传入空值")
@ApiModelProperty(value = "通道编号数组", required = true, example = "A0001")
- private List list;
+ private List list;
+
+ @Data
+ private static class ChannelIdItem {
+ @ApiModelProperty(value = "通道编号", example = "123")
+ private Integer id;
+ }
}
diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalVo.java
index de9c6ed..627c269 100644
--- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalVo.java
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalVo.java
@@ -31,23 +31,18 @@ public class TerminalVo {
private String cmdid;
@ApiModelProperty(value = "原始 ID，各厂家内部识别号", example = "12345678")
- @NotBlank(message = "各厂家内部识别号不能缺少")
private Short orgId;
@ApiModelProperty(value = "装置名称", example = "名称名称")
- @NotBlank(message = "装置名称不能缺少")
private String equipName;
@ApiModelProperty(value = "显示名", example = "名称名称")
- @NotBlank(message = "显示名不能缺少")
private String displayName;
@ApiModelProperty(value = "装置型号", example = "型号型号")
- @NotBlank(message = "装置型号不能缺少")
private String model;
@ApiModelProperty(value = "装置基本信息版本号", example = "型号型号")
- @NotBlank(message = "装置基本信息版本号不能缺少")
private String essentialInfoVersion;
@ApiModelProperty(value = "是否带云台", example = " 0： 不带云台 1：带云台")
@@ -55,23 +50,18 @@ public class TerminalVo {
private Byte hasPan;
@ApiModelProperty(value = "生产厂家", example = "生产厂家")
- @NotBlank(message = "生产厂家不能缺少")
private String bsManufacturer;
@ApiModelProperty(value = "生产日期", example = "2022-06-12")
- @NotBlank(message = "生产日期不能缺少")
private Date bsProductionDate;
@ApiModelProperty(value = "出厂编号", example = "123456")
- @NotBlank(message = "出厂编号不能缺少")
private String bsIdentifier;
@ApiModelProperty(value = "纬度", example = "21321")
- @NotBlank(message = "纬度不能缺少")
private Double latitude;
@ApiModelProperty(value = "经度", example = "213")
- @NotBlank(message = "经度不能缺少")
private Double longitude;
}
diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UpdateTerminalChannelVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UpdateTerminalChannelVo.java
index ced8c0b..20edb81 100644
--- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UpdateTerminalChannelVo.java
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UpdateTerminalChannelVo.java
@@ -16,8 +16,8 @@ public class UpdateTerminalChannelVo {
private Integer id;
@NotNull(message = "通道编号不能缺少")
- @ApiModelProperty(value = "通道编号", example = "123455")
- private Integer channelname;
+ @ApiModelProperty(value = "通道名称", example = "123455")
+ private String channelname;
@NotNull(message = "通道编号状态")
@ApiModelProperty(value = "通道状态", example = "0---关闭 1--开启")
diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalChannelsDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalChannelsDao.java
index bbe3899..2518e77 100644
--- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalChannelsDao.java
+++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalChannelsDao.java
@@ -22,6 +22,6 @@ public interface TerminalChannelsDao {
int updateByPrimaryKeySelective(@Param("data") TerminalChannels record,@Param("updateat") Date update);
- int deleteList(@Param("list") List list,@Param("status") Integer status,@Param("updateat") Date update);
+ int deleteList(@Param("list") List list,@Param("status") Integer status,@Param("updateat") Date update);
}
\ No newline at end of file
diff --git a/xymanager_dao/src/main/resources/mappers/TerminalChannelsDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalChannelsDao.xml
index 5ec0190..c1ffc3d 100644
--- a/xymanager_dao/src/main/resources/mappers/TerminalChannelsDao.xml
+++ b/xymanager_dao/src/main/resources/mappers/TerminalChannelsDao.xml
@@ -196,9 +196,9 @@
update_time = #{updateat},
- where
-
- #{id}
+ where id in
+
+ #{item.id}
\ No newline at end of file
diff --git a/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml
index 101d1f1..435c75c 100644
--- a/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml
+++ b/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml
@@ -140,17 +140,115 @@
insert into terminals
- (line_id,tower_id,cmdid, org_id, equip_name, display_name, model, essential_info_version, has_pan,
- bs_manufacturer, bs_production_date, bs_identifier, latitude, longitude,status, create_time,
- update_time)
- VALUES
-
- (#{item.lineid},#{item.towerid},#{item.cmdid},
- #{item.orgId},#{item.equipName},#{item.displayName},
- #{item.model},#{item.essentialInfoVersion},#{item.hasPan},
- #{item.bsManufacturer},#{item.bsProductionDate},#{item.bsIdentifier},
- #{item.latitude},#{item.longitude},#{status},
- #{createat},#{updateat})
+
+
+
+
+ line_id,
+
+
+ tower_id,
+
+
+ cmdid,
+
+
+ org_id,
+
+
+ equip_name,
+
+
+ display_name,
+
+
+ model,
+
+
+ essential_info_version,
+
+
+ has_pan,
+
+
+ bs_manufacturer,
+
+
+ bs_production_date,
+
+
+ bs_identifier,
+
+
+ latitude,
+
+
+ longitude,
+
+
+ status,
+
+
+ create_time,
+
+
+ update_time,
+
+
+
+
+
+ #{item.lineid},
+
+
+ #{item.towerid},
+
+
+ #{item.cmdid},
+
+
+ #{item.orgId},
+
+
+ #{item.equipName},
+
+
+ #{item.displayName},
+
+
+ #{item.model},
+
+
+ #{item.essentialInfoVersion},
+
+
+ #{item.hasPan},
+
+
+ #{item.bsManufacturer},
+
+
+ #{item.bsProductionDate},
+
+
+ #{item.bsIdentifier},
+
+
+ #{item.latitude},
+
+
+ #{item.longitude},
+
+
+ #{status},
+
+
+ #{createat},
+
+
+ #{updateat},
+
+
diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalChannelServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalChannelServiceImpl.java
index 492bb0a..f5b8360 100644
--- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalChannelServiceImpl.java
+++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalChannelServiceImpl.java
@@ -7,6 +7,7 @@ import com.github.pagehelper.PageInfo;
import com.shxy.xymanager_common.bean.ServiceBody;
import com.shxy.xymanager_common.dto.DyLineAndTerminalAndChannelDto;
import com.shxy.xymanager_common.dto.TermChannelAndMapperDto;
+import com.shxy.xymanager_common.entity.Lines;
import com.shxy.xymanager_common.entity.TerminalChannels;
import com.shxy.xymanager_common.enums.CommonStatus;
import com.shxy.xymanager_common.exception.Asserts;
@@ -61,7 +62,8 @@ public class TerminalChannelServiceImpl implements TerminalChannelService {
*/
@Override
public ServiceBody updateChannelList(UpdateTerminalChannelVo vo) {
- TerminalChannels bean = BeanUtil.copyProperties(vo, TerminalChannels.class);
+ TerminalChannels bean = new TerminalChannels();
+ BeanUtil.copyProperties(vo, bean,CopyOptions.create().ignoreCase());
int i = terminalChannelsDao.updateByPrimaryKeySelective(bean, new Date());
if (i != 0) {
return Asserts.success("修改成功");
@@ -70,9 +72,15 @@ public class TerminalChannelServiceImpl implements TerminalChannelService {
}
}
+ /**
+ *
+ * @param vo
+ * @return
+ */
@Override
public ServiceBody deleteChannelList(TerminalChannelIdListVo vo) {
- int i = terminalChannelsDao.deleteList(vo.getList(), CommonStatus.DELETE.value(), new Date());
+ List list = BeanUtil.copyToList(vo.getList(), TerminalChannels.class);
+ int i = terminalChannelsDao.deleteList(list, CommonStatus.DELETE.value(), new Date());
if (i != 0) {
return Asserts.success("删除成功");
} else {