From e55ecffb98f185b31a4dd9534a80f13d5d6087ce Mon Sep 17 00:00:00 2001 From: 15683799673 Date: Fri, 27 Jun 2025 20:28:33 +0800 Subject: [PATCH] =?UTF-8?q?java=20=E5=AE=9E=E4=BD=93=E7=B1=BB=E5=9E=8Blong?= =?UTF-8?q?=E6=94=B9int?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 28 ++++++++++++++----- .../dromara/property/domain/TdFactory.java | 13 +-------- .../property/domain/bo/TdFactoryBo.java | 13 +-------- .../property/domain/vo/TdFactoryVo.java | 14 +--------- .../dromara/sis/domain/SisAccessControl.java | 21 ++++---------- .../sis/domain/SisAccessControlDevice.java | 2 +- .../dromara/sis/domain/SisDeviceManage.java | 9 +++--- .../dromara/sis/domain/SisDevicePoint.java | 8 +++--- .../dromara/sis/domain/SisLibDeviceRef.java | 2 +- .../org/dromara/sis/domain/SisPersonLib.java | 4 +-- .../dromara/sis/domain/SisPersonLibImg.java | 4 +-- .../org/dromara/sis/domain/TdFactory.java | 16 ++--------- .../java/org/dromara/sis/domain/TdMeter.java | 12 ++++---- .../org/dromara/sis/domain/TdMeterConfig.java | 10 +++---- .../org/dromara/sis/domain/TdMeterRoom.java | 5 ++-- .../sis/domain/bo/SisAccessControlBo.java | 13 +-------- .../domain/bo/SisAccessControlDeviceBo.java | 6 ++-- .../sis/domain/bo/SisDeviceManageBo.java | 7 +---- .../sis/domain/bo/SisDevicePointBo.java | 28 ++++--------------- .../sis/domain/bo/SisLibDeviceImgRefBo.java | 16 ----------- .../sis/domain/bo/SisLibDeviceRefBo.java | 18 +----------- .../dromara/sis/domain/bo/SisPersonLibBo.java | 6 ++-- .../sis/domain/bo/SisPersonLibImgBo.java | 21 ++------------ .../dromara/sis/domain/bo/TdFactoryBo.java | 8 ------ .../org/dromara/sis/domain/bo/TdMeterBo.java | 10 +++---- .../sis/domain/bo/TdMeterConfigBo.java | 10 +++---- .../domain/vo/SisAccessControlDeviceVo.java | 2 +- .../sis/domain/vo/SisAccessControlVo.java | 25 ++++------------- .../sis/domain/vo/SisDeviceManageVo.java | 10 ++----- .../sis/domain/vo/SisDevicePointVo.java | 15 +++------- .../sis/domain/vo/SisLibDeviceImgRefVo.java | 19 ------------- .../sis/domain/vo/SisLibDeviceRefVo.java | 21 +------------- .../sis/domain/vo/SisPersonLibImgVo.java | 23 ++------------- .../dromara/sis/domain/vo/SisPersonLibVo.java | 23 ++------------- .../dromara/sis/domain/vo/TdFactoryVo.java | 7 ----- .../sis/domain/vo/TdMeterConfigVo.java | 10 +++---- .../org/dromara/sis/domain/vo/TdMeterVo.java | 12 ++++---- .../e8/domain/door/req/DoorDeviceAddReq.java | 4 +-- .../sis/sdk/unview/utils/UniViewHttp.java | 5 ++-- .../impl/SisAccessControlServiceImpl.java | 1 - .../impl/SisDeviceManageServiceImpl.java | 1 - .../service/impl/SisPersonLibServiceImpl.java | 4 +-- .../service/impl/TdFactoryServiceImpl.java | 1 - 43 files changed, 124 insertions(+), 363 deletions(-) diff --git a/pom.xml b/pom.xml index 8a211f1..1f8d7af 100644 --- a/pom.xml +++ b/pom.xml @@ -68,25 +68,39 @@ + + localhost + + + dev + 127.0.0.1:8848 + 127.0.0.1:4560 + DEFAULT_GROUP + DEFAULT_GROUP + nacos + nacos + + + + true + + dev dev - - + + 47.109.37.87:8848 47.109.37.87:4560 DEFAULT_GROUP DEFAULT_GROUP nacos nacos - + - - - true - + prod diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TdFactory.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TdFactory.java index c3f37e8..776989f 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TdFactory.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TdFactory.java @@ -22,7 +22,7 @@ public class TdFactory extends TenantEntity { private static final long serialVersionUID = 1L; /** - * + * */ @TableId(value = "id") private Long id; @@ -42,15 +42,4 @@ public class TdFactory extends TenantEntity { */ private String remark; - /** - * 数据状态：1有效，0无效 - */ - private Long dataState; - - /** - * 搜索值 - */ - private String searchValue; - - } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TdFactoryBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TdFactoryBo.java index dff8301..daf5704 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TdFactoryBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TdFactoryBo.java @@ -21,7 +21,7 @@ import jakarta.validation.constraints.*; public class TdFactoryBo extends BaseEntity { /** - * + * */ @NotNull(message = "不能为空", groups = { EditGroup.class }) private Long id; @@ -43,16 +43,5 @@ public class TdFactoryBo extends BaseEntity { */ private String remark; - /** - * 数据状态：1有效，0无效 - */ - @NotNull(message = "数据状态：1有效，0无效不能为空", groups = { AddGroup.class, EditGroup.class }) - private Long dataState; - - /** - * 搜索值 - */ - private String searchValue; - } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TdFactoryVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TdFactoryVo.java index b0fc9ad..2ad4ae3 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TdFactoryVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TdFactoryVo.java @@ -29,7 +29,7 @@ public class TdFactoryVo implements Serializable { private static final long serialVersionUID = 1L; /** - * + * */ @ExcelProperty(value = "") private Long id; @@ -52,17 +52,5 @@ public class TdFactoryVo implements Serializable { @ExcelProperty(value = "备注") private String remark; - /** - * 数据状态：1有效，0无效 - */ - @ExcelProperty(value = "数据状态：1有效，0无效") - private Long dataState; - - /** - * 搜索值 - */ - @ExcelProperty(value = "搜索值") - private String searchValue; - } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAccessControl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAccessControl.java index 0b51fa9..3a3112f 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAccessControl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAccessControl.java @@ -1,9 +1,10 @@ package org.dromara.sis.domain; -import org.dromara.common.tenant.core.TenantEntity; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; +import org.dromara.common.tenant.core.TenantEntity; import java.io.Serial; @@ -55,12 +56,12 @@ public class SisAccessControl extends TenantEntity { /** * */ - private Long accessPort; + private Integer accessPort; /** * 门禁设备类型 */ - private Long accessType; + private Integer accessType; /** * @@ -70,7 +71,7 @@ public class SisAccessControl extends TenantEntity { /** * 控制卡类型：1-系统，2-E8 */ - private Long controlType; + private Integer controlType; /** * 控制卡类型编码 @@ -82,15 +83,5 @@ public class SisAccessControl extends TenantEntity { */ private String outCode; - /** - * 组织编码 - */ - private String orgCode; - - /** - * 搜索值 - */ - private String searchValue; - } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAccessControlDevice.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAccessControlDevice.java index 50b62d4..44b5a1a 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAccessControlDevice.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAccessControlDevice.java @@ -60,7 +60,7 @@ public class SisAccessControlDevice extends TenantEntity { /** * 设备端口 */ - private Long eqpPort; + private Integer eqpPort; /** * 设备账号 diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisDeviceManage.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisDeviceManage.java index 8b5e1da..51d347c 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisDeviceManage.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisDeviceManage.java @@ -1,9 +1,10 @@ package org.dromara.sis.domain; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; @@ -55,7 +56,7 @@ public class SisDeviceManage extends BaseEntity { /** * 设备在线状态 0:离线 1:在线 2:未知 */ - private Long deviceStatus; + private Integer deviceStatus; /** * 父级设备id @@ -70,7 +71,7 @@ public class SisDeviceManage extends BaseEntity { /** * 录像机端口 */ - private Long vcrPort; + private Integer vcrPort; /** * 门禁id diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisDevicePoint.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisDevicePoint.java index 3d44867..e77ff14 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisDevicePoint.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisDevicePoint.java @@ -35,12 +35,12 @@ public class SisDevicePoint extends TenantEntity { /** * 视频协议 1：onvif 2：rtsp */ - private Long video; + private Integer video; /** * 传输协议(AIBOX 需要，一体机不需要) 1: tcp 2:udp */ - private Long transportType; + private Integer transportType; /** * 点位名称 @@ -60,7 +60,7 @@ public class SisDevicePoint extends TenantEntity { /** * 端口 */ - private Long port; + private Integer port; /** * 通道相机账号 @@ -75,7 +75,7 @@ public class SisDevicePoint extends TenantEntity { /** * onvif 设备码流添加方式：1：主码流 2：自定义码流 */ - private Long videoType; + private Integer videoType; /** * 码流 id：当选择自定义码流时，该字段必填， diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisLibDeviceRef.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisLibDeviceRef.java index ebb9fb2..02ae561 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisLibDeviceRef.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisLibDeviceRef.java @@ -46,7 +46,7 @@ public class SisLibDeviceRef extends TenantEntity { /** * 第三方设备库添加状态 1: 成功，2：失败 */ - private Long eqpLibState; + private Integer eqpLibState; } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisPersonLib.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisPersonLib.java index 36b4ea4..3f7cede 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisPersonLib.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisPersonLib.java @@ -45,12 +45,12 @@ public class SisPersonLib extends TenantEntity { /** * 库类型，1：人员库，2：工服库 */ - private Long libType; + private Integer libType; /** * 库的业务类型 1: 门禁库，2: 黑名单库 */ - private Long busiType; + private Integer busiType; } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisPersonLibImg.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisPersonLibImg.java index f584aa9..f4b5748 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisPersonLibImg.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisPersonLibImg.java @@ -52,7 +52,7 @@ public class SisPersonLibImg extends TenantEntity { * 性别 1：男 2：女 99：未说明 */ - private Long sex; + private Integer sex; /** * 邮箱 @@ -69,7 +69,7 @@ public class SisPersonLibImg extends TenantEntity { 1：身份证 2：护照 3：行驶证 99：其它 */ - private Long certificateType; + private Integer certificateType; /** * 证件号码 diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TdFactory.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TdFactory.java index a67d410..e72a292 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TdFactory.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TdFactory.java @@ -1,10 +1,10 @@ package org.dromara.sis.domain; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; +import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; @@ -43,15 +43,5 @@ public class TdFactory extends BaseEntity { */ private String remark; - /** - * 数据状态：1有效，0无效 - */ - private Long dataState; - - /** - * 修改时间 - */ - private Date modifyTime; - } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TdMeter.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TdMeter.java index b5378d7..45618bf 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TdMeter.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TdMeter.java @@ -46,12 +46,12 @@ public class TdMeter extends BaseEntity { /** * 设备类型(1-电表，2-水表，3-气表) */ - private Long meterType; + private Integer meterType; /** * 表用途(1-分表，2-总表，3-公摊表) */ - private Long meterPurpose; + private Integer meterPurpose; /** * 分摊类型 @@ -61,12 +61,12 @@ public class TdMeter extends BaseEntity { * 4-按房源数量 * 5-按固定比例 */ - private Long shareType; + private Integer shareType; /** * 付费类型(1-先付费，2-后付费) */ - private Long payType; + private Integer payType; /** * 当前表显示读数 @@ -91,12 +91,12 @@ public class TdMeter extends BaseEntity { /** * 通信状态 */ - private Long communicationState; + private Integer communicationState; /** * 运行状态 */ - private Long runningState; + private Integer runningState; /** * 备注 diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TdMeterConfig.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TdMeterConfig.java index 4e8e275..221f0be 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TdMeterConfig.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TdMeterConfig.java @@ -30,27 +30,27 @@ public class TdMeterConfig extends BaseEntity { /** * 设备类型(1-电表，2-水表，3-气表) */ - private Long meterType; + private Integer meterType; /** * 付费类型(1-先付费，2-后付费) */ - private Long payType; + private Integer payType; /** * 欠费是否断电/水/气(0-是，1-否) */ - private Long arrearsOutage; + private Integer arrearsOutage; /** * 后付费模式下是否自动断电/水/气（0-是，1-否） */ - private Long autoOutage; + private Integer autoOutage; /** * 当auto_outage=0的时候生效，逾期多少天自动断水/电/气 */ - private Long overdueDay; + private Integer overdueDay; /** * 备注 diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TdMeterRoom.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TdMeterRoom.java index f62aeb0..ff13e5e 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TdMeterRoom.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/TdMeterRoom.java @@ -1,9 +1,10 @@ package org.dromara.sis.domain; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAccessControlBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAccessControlBo.java index 1b357c4..ee1075e 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAccessControlBo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAccessControlBo.java @@ -60,7 +60,7 @@ public class SisAccessControlBo extends BaseEntity { * */ @NotNull(message = "不能为空", groups = { AddGroup.class, EditGroup.class }) - private Long accessPort; + private Integer accessPort; /** * 门禁设备类型 @@ -96,17 +96,6 @@ public class SisAccessControlBo extends BaseEntity { @NotBlank(message = "组织编码不能为空", groups = { AddGroup.class, EditGroup.class }) private String orgCode; - /** - * 数据状态：1有效，0无效 - */ - @NotNull(message = "数据状态：1有效，0无效不能为空", groups = { AddGroup.class, EditGroup.class }) - private Long dataState; - - /** - * 搜索值 - */ - private String searchValue; - /** * 绑定设备Id */ diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAccessControlDeviceBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAccessControlDeviceBo.java index c8fe4a0..a2b729d 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAccessControlDeviceBo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAccessControlDeviceBo.java @@ -41,12 +41,12 @@ public class SisAccessControlDeviceBo extends BaseEntity { /** * 设备类型 */ - private Long eqpType; + private Integer eqpType; /** * 接入类型(1: 平台接入，2:设备接入) */ - private Long accessType; + private Integer accessType; /** * 设备ip @@ -58,7 +58,7 @@ public class SisAccessControlDeviceBo extends BaseEntity { * 设备端口 */ @NotNull(message = "设备端口不能为空", groups = {AddGroup.class, EditGroup.class}) - private Long eqpPort; + private Integer eqpPort; /** * 设备账号 diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDeviceManageBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDeviceManageBo.java index 57ddffe..f1fd769 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDeviceManageBo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDeviceManageBo.java @@ -48,18 +48,13 @@ public class SisDeviceManageBo extends BaseEntity { * 设备端口 */ @NotNull(message = "设备端口不能为空", groups = {AddGroup.class, EditGroup.class}) - private Long devicePort; + private Integer devicePort; /** * 设备 */ private String deviceMac; - /** - * 设备在线状态 0:离线 1:在线 2:未知 - */ - private Long deviceStatus; - /** * 父级设备id */ diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDevicePointBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDevicePointBo.java index c18cab5..0d796e4 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDevicePointBo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDevicePointBo.java @@ -36,14 +36,14 @@ public class SisDevicePointBo extends BaseEntity { * 视频协议 1：onvif 2： rtsp */ - private Long video; + private Integer video; /** * 传输协议(AIBOX 需要，一 -体机不需要) 1: tcp 2: +体机不需要) 1: tcp 2: udp */ - private Long transportType; + private Integer transportType; /** * 点位名称 @@ -64,7 +64,7 @@ rtsp 时，该字段必填） /** * 端口 */ - private Long port; + private Integer port; /** * 通道相机账号 @@ -81,7 +81,7 @@ rtsp 时，该字段必填） 式：1：主码流 2：自定 义码流 */ - private Long videoType; + private Integer videoType; /** * 码流 id：当选择自定义码 @@ -89,22 +89,6 @@ rtsp 时，该字段必填） 获取设备码流信息接口返 回的码流 id */ - private Long videoId; - - /** - * 创建人id - */ - private Long createById; - - /** - * 更新人id - */ - private Long updateById; - - /** - * 搜索值 - */ - private String searchValue; - + private Integer videoId; } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisLibDeviceImgRefBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisLibDeviceImgRefBo.java index 4a3fd11..0d4c648 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisLibDeviceImgRefBo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisLibDeviceImgRefBo.java @@ -56,20 +56,4 @@ public class SisLibDeviceImgRefBo extends BaseEntity { @NotNull(message = "设备库图片id不能为空", groups = { AddGroup.class, EditGroup.class }) private Long eqpLibImgId; - /** - * 创建人id - */ - private Long createById; - - /** - * 更新人id - */ - private Long updateById; - - /** - * 搜索值 - */ - private String searchValue; - - } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisLibDeviceRefBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisLibDeviceRefBo.java index 68c9d89..cc8681c 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisLibDeviceRefBo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisLibDeviceRefBo.java @@ -49,22 +49,6 @@ public class SisLibDeviceRefBo extends BaseEntity { * 第三方设备库添加状态 1: 成功，2：失败 */ @NotNull(message = "第三方设备库添加状态 1: 成功，2：失败不能为空", groups = {AddGroup.class, EditGroup.class}) - private Long eqpLibState; - - /** - * 创建人id - */ - private Long createById; - - /** - * 更新人id - */ - private Long updateById; - - /** - * 搜索值 - */ - private String searchValue; - + private Integer eqpLibState; } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisPersonLibBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisPersonLibBo.java index 6768106..42557bd 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisPersonLibBo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisPersonLibBo.java @@ -42,7 +42,7 @@ public class SisPersonLibBo extends BaseEntity { /** * 设备编码，需要同步创建到设备中 */ - @NotBlank(message = "人像设备不能为空", groups = {AddGroup.class, EditGroup.class}) + @NotNull(message = "人像设备不能为空", groups = {AddGroup.class, EditGroup.class}) private List eqpIds; /** @@ -53,7 +53,7 @@ public class SisPersonLibBo extends BaseEntity { /** * 库类型，1：人员库，2：工服库 */ - private Long libType; + private Integer libType; /** * 库类型名称 @@ -65,7 +65,7 @@ public class SisPersonLibBo extends BaseEntity { /** * 库的业务类型 1: 门禁库，2: 黑名单库 */ - private Long busiType = 1L; + private Integer busiType = 1; } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisPersonLibImgBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisPersonLibImgBo.java index 8c05f4b..ff9d722 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisPersonLibImgBo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisPersonLibImgBo.java @@ -53,7 +53,7 @@ public class SisPersonLibImgBo extends BaseEntity { * 性别 1：男 * 2：女 99：未说明 */ - private Long sex; + private Integer sex; /** * 邮箱 @@ -70,7 +70,7 @@ public class SisPersonLibImgBo extends BaseEntity { * 1：身份证 2：护照 * 3：行驶证 99：其它 */ - private Long certificateType; + private Integer certificateType; /** * 证件号码 @@ -81,21 +81,4 @@ public class SisPersonLibImgBo extends BaseEntity { * 出生日期 */ private String birthDate; - - /** - * 创建人id - */ - private Long createById; - - /** - * 更新人id - */ - private Long updateById; - - /** - * 搜索值 - */ - private String searchValue; - - } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TdFactoryBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TdFactoryBo.java index 2cd84c7..c26c230 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TdFactoryBo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TdFactoryBo.java @@ -43,12 +43,4 @@ public class TdFactoryBo extends BaseEntity { * 备注 */ private String remark; - - /** - * 数据状态：1有效，0无效 - */ - @NotNull(message = "数据状态：1有效，0无效不能为空", groups = {AddGroup.class, EditGroup.class}) - private Long dataState; - - } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TdMeterBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TdMeterBo.java index 376bf34..fba940f 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TdMeterBo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TdMeterBo.java @@ -49,12 +49,12 @@ public class TdMeterBo extends BaseEntity { /** * 设备类型(1-电表，2-水表，3-气表) */ - private Long meterType; + private Integer meterType; /** * 表用途(1-分表，2-总表，3-公摊表) */ - private Long meterPurpose; + private Integer meterPurpose; /** * 分摊类型 @@ -64,17 +64,17 @@ public class TdMeterBo extends BaseEntity { * 4-按房源数量 * 5-按固定比例 */ - private Long shareType; + private Integer shareType; /** * 付费类型(1-先付费，2-后付费) */ - private Long payType; + private Integer payType; /** * 最大表显读数(超过归0) */ - private Long maxDisplay; + private Integer maxDisplay; /** * 计费倍率 diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TdMeterConfigBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TdMeterConfigBo.java index 13b5216..5c12b79 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TdMeterConfigBo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/TdMeterConfigBo.java @@ -29,31 +29,31 @@ public class TdMeterConfigBo extends BaseEntity { /** * 设备类型(1-电表，2-水表，3-气表) */ - private Long meterType; + private Integer meterType; /** * 付费类型(1-先付费，2-后付费) */ @NotNull(message = "付费类型(1-先付费，2-后付费)不能为空", groups = { AddGroup.class, EditGroup.class }) - private Long payType; + private Integer payType; /** * 欠费是否断电/水/气(0-是，1-否) */ @NotNull(message = "欠费是否断电/水/气(0-是，1-否)不能为空", groups = { AddGroup.class, EditGroup.class }) - private Long arrearsOutage; + private Integer arrearsOutage; /** * 后付费模式下是否自动断电/水/气（0-是，1-否） */ @NotNull(message = "后付费模式下是否自动断电/水/气（0-是，1-否）不能为空", groups = { AddGroup.class, EditGroup.class }) - private Long autoOutage; + private Integer autoOutage; /** * 当auto_outage=0的时候生效，逾期多少天自动断水/电/气 */ @NotNull(message = "当auto_outage=0的时候生效，逾期多少天自动断水/电/气不能为空", groups = { AddGroup.class, EditGroup.class }) - private Long overdueDay; + private Integer overdueDay; /** * 备注 diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAccessControlDeviceVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAccessControlDeviceVo.java index fd56776..4b15d55 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAccessControlDeviceVo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAccessControlDeviceVo.java @@ -76,7 +76,7 @@ public class SisAccessControlDeviceVo implements Serializable { * 设备端口 */ @ExcelProperty(value = "设备端口") - private Long eqpPort; + private Integer eqpPort; /** * 设备账号 diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAccessControlVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAccessControlVo.java index 866e6b6..ed58c95 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAccessControlVo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAccessControlVo.java @@ -29,7 +29,7 @@ public class SisAccessControlVo implements Serializable { private static final long serialVersionUID = 1L; /** - * + * */ @ExcelProperty(value = "") private Long id; @@ -65,19 +65,19 @@ public class SisAccessControlVo implements Serializable { private String accessIp; /** - * + * */ @ExcelProperty(value = "") - private Long accessPort; + private Integer accessPort; /** * 门禁设备类型 */ @ExcelProperty(value = "门禁设备类型") - private Long accessType; + private Integer accessType; /** - * + * */ @ExcelProperty(value = "") private String factoryCode; @@ -86,7 +86,7 @@ public class SisAccessControlVo implements Serializable { * 控制卡类型：1-系统，2-E8 */ @ExcelProperty(value = "控制卡类型：1-系统，2-E8") - private Long controlType; + private Integer controlType; /** * 控制卡类型编码 @@ -106,17 +106,4 @@ public class SisAccessControlVo implements Serializable { @ExcelProperty(value = "组织编码") private String orgCode; - /** - * 数据状态：1有效，0无效 - */ - @ExcelProperty(value = "数据状态：1有效，0无效") - private Long dataState; - - /** - * 搜索值 - */ - @ExcelProperty(value = "搜索值") - private String searchValue; - - } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDeviceManageVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDeviceManageVo.java index 1c8d099..6ac3c70 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDeviceManageVo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDeviceManageVo.java @@ -53,7 +53,7 @@ public class SisDeviceManageVo implements Serializable { * 设备端口 */ @ExcelProperty(value = "设备端口") - private Long devicePort; + private Integer devicePort; /** * 设备 @@ -61,12 +61,6 @@ public class SisDeviceManageVo implements Serializable { @ExcelProperty(value = "设备") private String deviceMac; - /** - * 设备在线状态 0:离线 1:在线 2:未知 - */ - @ExcelProperty(value = "设备在线状态 0:离线 1:在线 2:未知") - private Long deviceStatus; - /** * 父级设备id */ @@ -83,7 +77,7 @@ public class SisDeviceManageVo implements Serializable { * 录像机端口 */ @ExcelProperty(value = "录像机端口") - private Long vcrPort; + private Integer vcrPort; /** * 门禁id diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDevicePointVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDevicePointVo.java index c1b0eb5..a453e8d 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDevicePointVo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDevicePointVo.java @@ -43,7 +43,7 @@ public class SisDevicePointVo implements Serializable { * rtsp */ @ExcelProperty(value = "视频协议") - private Long video; + private Integer video; /** * 传输协议(AIBOX 需要，一 @@ -51,7 +51,7 @@ public class SisDevicePointVo implements Serializable { * udp */ @ExcelProperty(value = "传输协议") - private Long transportType; + private Integer transportType; /** * 点位名称 @@ -77,7 +77,7 @@ public class SisDevicePointVo implements Serializable { * 端口 */ @ExcelProperty(value = "端口") - private Long port; + private Integer port; /** * 通道相机账号 @@ -97,7 +97,7 @@ public class SisDevicePointVo implements Serializable { * 义码流 */ @ExcelProperty(value = "码流") - private Long videoType; + private Integer videoType; /** * 码流 id：当选择自定义码 @@ -108,11 +108,4 @@ public class SisDevicePointVo implements Serializable { @ExcelProperty(value = "码流id") private Long videoId; - /** - * 搜索值 - */ - @ExcelProperty(value = "搜索值") - private String searchValue; - - } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisLibDeviceImgRefVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisLibDeviceImgRefVo.java index 8a5344e..e2d9d50 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisLibDeviceImgRefVo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisLibDeviceImgRefVo.java @@ -60,23 +60,4 @@ public class SisLibDeviceImgRefVo implements Serializable { @ExcelProperty(value = "设备库图片id") private Long eqpLibImgId; - /** - * 创建人id - */ - @ExcelProperty(value = "创建人id") - private Long createById; - - /** - * 更新人id - */ - @ExcelProperty(value = "更新人id") - private Long updateById; - - /** - * 搜索值 - */ - @ExcelProperty(value = "搜索值") - private String searchValue; - - } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisLibDeviceRefVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisLibDeviceRefVo.java index 166019f..c528df0 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisLibDeviceRefVo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisLibDeviceRefVo.java @@ -52,25 +52,6 @@ public class SisLibDeviceRefVo implements Serializable { * 第三方设备库添加状态 1: 成功，2：失败 */ @ExcelProperty(value = "第三方设备库添加状态 1: 成功，2：失败") - private Long eqpLibState; - - /** - * 创建人id - */ - @ExcelProperty(value = "创建人id") - private Long createById; - - /** - * 更新人id - */ - @ExcelProperty(value = "更新人id") - private Long updateById; - - /** - * 搜索值 - */ - @ExcelProperty(value = "搜索值") - private String searchValue; - + private Integer eqpLibState; } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisPersonLibImgVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisPersonLibImgVo.java index 15068b3..340485e 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisPersonLibImgVo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisPersonLibImgVo.java @@ -60,7 +60,7 @@ public class SisPersonLibImgVo implements Serializable { 2：女 99：未说明 */ @ExcelProperty(value = "性别 1") - private Long sex; + private Integer sex; /** * 邮箱 @@ -80,7 +80,7 @@ public class SisPersonLibImgVo implements Serializable { 3：行驶证 99：其它 */ @ExcelProperty(value = "证件类型") - private Long certificateType; + private Integer certificateType; /** * 证件号码 @@ -94,23 +94,4 @@ public class SisPersonLibImgVo implements Serializable { @ExcelProperty(value = "出生日期") private String birthDate; - /** - * 创建人id - */ - @ExcelProperty(value = "创建人id") - private Long createById; - - /** - * 更新人id - */ - @ExcelProperty(value = "更新人id") - private Long updateById; - - /** - * 搜索值 - */ - @ExcelProperty(value = "搜索值") - private String searchValue; - - } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisPersonLibVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisPersonLibVo.java index c5384e0..294b1f3 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisPersonLibVo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisPersonLibVo.java @@ -52,31 +52,12 @@ public class SisPersonLibVo implements Serializable { * 库类型，1：人员库，2：工服库 */ @ExcelProperty(value = "库类型，1：人员库，2：工服库") - private Long libType; + private Integer libType; /** * 库的业务类型 1: 门禁库，2: 黑名单库 */ @ExcelProperty(value = "库的业务类型 1: 门禁库，2: 黑名单库") - private Long busiType; - - /** - * 创建人id - */ - @ExcelProperty(value = "创建人id") - private Long createById; - - /** - * 更新人id - */ - @ExcelProperty(value = "更新人id") - private Long updateById; - - /** - * 搜索值 - */ - @ExcelProperty(value = "搜索值") - private String searchValue; - + private Integer busiType; } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TdFactoryVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TdFactoryVo.java index 534a75e..1e59c43 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TdFactoryVo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TdFactoryVo.java @@ -48,11 +48,4 @@ public class TdFactoryVo implements Serializable { @ExcelProperty(value = "备注") private String remark; - /** - * 数据状态：1有效，0无效 - */ - @ExcelProperty(value = "数据状态：1有效，0无效") - private Long dataState; - - } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TdMeterConfigVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TdMeterConfigVo.java index ca4d7e1..4a44e60 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TdMeterConfigVo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TdMeterConfigVo.java @@ -36,32 +36,32 @@ public class TdMeterConfigVo implements Serializable { * 设备类型(1-电表，2-水表，3-气表) */ @ExcelProperty(value = "设备类型(1-电表，2-水表，3-气表)") - private Long meterType; + private Integer meterType; /** * 付费类型(1-先付费，2-后付费) */ @ExcelProperty(value = "付费类型(1-先付费，2-后付费)") - private Long payType; + private Integer payType; /** * 欠费是否断电/水/气(0-是，1-否) */ @ExcelProperty(value = "欠费是否断电/水/气(0-是，1-否)") - private Long arrearsOutage; + private Integer arrearsOutage; /** * 后付费模式下是否自动断电/水/气（0-是，1-否） */ @ExcelProperty(value = "后付费模式下是否自动断电/水/气", converter = ExcelDictConvert.class) @ExcelDictFormat(readConverterExp = "0=-是，1-否") - private Long autoOutage; + private Integer autoOutage; /** * 当auto_outage=0的时候生效，逾期多少天自动断水/电/气 */ @ExcelProperty(value = "当auto_outage=0的时候生效，逾期多少天自动断水/电/气") - private Long overdueDay; + private Integer overdueDay; /** * 备注 diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TdMeterVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TdMeterVo.java index ab70349..dcb2a9a 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TdMeterVo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/TdMeterVo.java @@ -53,13 +53,13 @@ public class TdMeterVo implements Serializable { * 设备类型(1-电表，2-水表，3-气表) */ @ExcelProperty(value = "设备类型(1-电表，2-水表，3-气表)") - private Long meterType; + private Integer meterType; /** * 表用途(1-分表，2-总表，3-公摊表) */ @ExcelProperty(value = "表用途(1-分表，2-总表，3-公摊表)") - private Long meterPurpose; + private Integer meterPurpose; /** * 分摊类型 @@ -70,13 +70,13 @@ public class TdMeterVo implements Serializable { * 5-按固定比例 */ @ExcelProperty(value = "分摊类型 1-不公摊 2-按分表用量 3-按租客面积 4-按房源数量 5-按固定比例") - private Long shareType; + private Integer shareType; /** * 付费类型(1-先付费，2-后付费) */ @ExcelProperty(value = "付费类型(1-先付费，2-后付费)") - private Long payType; + private Integer payType; /** * 当前表显示读数 @@ -94,13 +94,13 @@ public class TdMeterVo implements Serializable { * 通信状态 */ @ExcelProperty(value = "通信状态") - private Long communicationState; + private Integer communicationState; /** * 运行状态 */ @ExcelProperty(value = "运行状态") - private Long runningState; + private Integer runningState; /** * 备注 diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/door/req/DoorDeviceAddReq.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/door/req/DoorDeviceAddReq.java index b2e6690..a749606 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/door/req/DoorDeviceAddReq.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/domain/door/req/DoorDeviceAddReq.java @@ -28,7 +28,7 @@ public class DoorDeviceAddReq { /** * 设备端口 */ - private Long port; + private Integer port; /** * 设备MAC @@ -56,7 +56,7 @@ public class DoorDeviceAddReq { * 2201:一体式门禁 2202:分体式门禁 2203:人脸门禁 2204:梯控 2207:人脸盒子终端 * 2208:人脸盒子面板机 2209:一体式读头 2211:梯控读头 2102:电子哨兵 */ - private Long type; + private Integer type; /** * 业务逻辑设备类 diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/unview/utils/UniViewHttp.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/unview/utils/UniViewHttp.java index 81b4ea8..e859fa3 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/unview/utils/UniViewHttp.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/unview/utils/UniViewHttp.java @@ -106,14 +106,13 @@ public class UniViewHttp { if (data == null) { requestEntity = new HttpEntity<>(null, headers); } - if (data instanceof JSONObject) { - JSONObject obj = (JSONObject) data; + if (data instanceof JSONObject obj) { requestEntity = new HttpEntity<>(obj.toJSONString(), headers); } else { requestEntity = new HttpEntity<>(JSONObject.toJSONString(data), headers); } ResponseEntity exchange = restTemplate.exchange(requestUrl, api.getMethod(), requestEntity, String.class); - int statusCode = exchange.getStatusCodeValue(); + int statusCode = exchange.getStatusCode().value(); String body = exchange.getBody(); if (HttpStatus.HTTP_UNAUTHORIZED == statusCode) { diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAccessControlServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAccessControlServiceImpl.java index cc6e19f..a45615f 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAccessControlServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAccessControlServiceImpl.java @@ -92,7 +92,6 @@ public class SisAccessControlServiceImpl implements ISisAccessControlService { lqw.eq(bo.getControlType() != null, SisAccessControl::getControlType, bo.getControlType()); lqw.eq(StringUtils.isNotBlank(bo.getControlCode()), SisAccessControl::getControlCode, bo.getControlCode()); lqw.eq(StringUtils.isNotBlank(bo.getOutCode()), SisAccessControl::getOutCode, bo.getOutCode()); - lqw.eq(StringUtils.isNotBlank(bo.getOrgCode()), SisAccessControl::getOrgCode, bo.getOrgCode()); lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), SisAccessControl::getSearchValue, bo.getSearchValue()); return lqw; } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDeviceManageServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDeviceManageServiceImpl.java index a7d4ba1..4a7fb40 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDeviceManageServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDeviceManageServiceImpl.java @@ -79,7 +79,6 @@ public class SisDeviceManageServiceImpl implements ISisDeviceManageService { lqw.eq(StringUtils.isNotBlank(bo.getDeviceIp()), SisDeviceManage::getDeviceIp, bo.getDeviceIp()); lqw.eq(bo.getDevicePort() != null, SisDeviceManage::getDevicePort, bo.getDevicePort()); lqw.eq(StringUtils.isNotBlank(bo.getDeviceMac()), SisDeviceManage::getDeviceMac, bo.getDeviceMac()); - lqw.eq(bo.getDeviceStatus() != null, SisDeviceManage::getDeviceStatus, bo.getDeviceStatus()); lqw.eq(bo.getParentId() != null, SisDeviceManage::getParentId, bo.getParentId()); lqw.eq(StringUtils.isNotBlank(bo.getVcrIp()), SisDeviceManage::getVcrIp, bo.getVcrIp()); lqw.eq(bo.getVcrPort() != null, SisDeviceManage::getVcrPort, bo.getVcrPort()); diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisPersonLibServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisPersonLibServiceImpl.java index 021f3cb..4152531 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisPersonLibServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisPersonLibServiceImpl.java @@ -122,7 +122,7 @@ public class SisPersonLibServiceImpl implements ISisPersonLibService { systemInfo.setAccount(sisAccessControlDeviceVo.getEqpAccount()); systemInfo.setPassword(sisAccessControlDeviceVo.getEqpPwd()); systemInfo.setIp(sisAccessControlDeviceVo.getEqpIp()); - systemInfo.setPort(systemInfo.getPort()); + systemInfo.setPort(sisAccessControlDeviceVo.getEqpPort()); // libType =1 人像库，否则工服库 Integer outLibCode = null; if (bo.getLibType() == 1) { @@ -138,7 +138,7 @@ public class SisPersonLibServiceImpl implements ISisPersonLibService { ref.setLibId(add.getId()); ref.setEqpId(sisAccessControlDeviceVo.getId()); ref.setEqpLibCode(Long.valueOf(outLibCode)); - ref.setEqpLibState(1L); + ref.setEqpLibState(1); Boolean insert = sisLibDeviceRefService.insert(ref); Assert.isTrue(insert, "写入库关联关系表失败!"); log.info("同步建库完成!"); diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TdFactoryServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TdFactoryServiceImpl.java index 5920ca6..c070bf4 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TdFactoryServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/TdFactoryServiceImpl.java @@ -76,7 +76,6 @@ public class TdFactoryServiceImpl implements ITdFactoryService { lqw.orderByAsc(TdFactory::getId); lqw.eq(StringUtils.isNotBlank(bo.getFactoryNo()), TdFactory::getFactoryNo, bo.getFactoryNo()); lqw.like(StringUtils.isNotBlank(bo.getFactoryName()), TdFactory::getFactoryName, bo.getFactoryName()); - lqw.eq(bo.getDataState() != null, TdFactory::getDataState, bo.getDataState()); return lqw; }