update

sptg-device/sptg-device-api/src/main/java/com/sptg/device/api/dto/DeviceOptionsDto.java

@@ -1,46 +0,0 @@
-package com.sptg.device.api.dto;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.device.api.entity.DeviceOptions;
-import com.sptg.device.api.entity.DeviceTemplate;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * title: DeviceDto
- * package: com.sptg.device.api.dto
- * description: 设备数据传输对象
- */
-@Getter
-@Setter
-public class DeviceOptionsDto extends DeviceOptions {
-
-    /**
-     * 分页条件
-     */
-    @TableField(exist = false)
-    private Page<DeviceOptions> page;
-
-    /**
-     * 排序条件
-     */
-    @TableField(exist = false)
-    private String sortField;
-
-    /**
-     * 排序顺序
-     */
-    @TableField(exist = false)
-    private String sortOrder;
-
-    /**
-     * 设备ids
-     */
-    @TableField(exist = false)
-    private List<Long> deviceIds;
-    @TableField(exist = false)
-    private Integer all;
-}

sptg-device/sptg-device-api/src/main/java/com/sptg/device/api/dto/DeviceRemoteInfoDto.java

@@ -1,36 +0,0 @@
-package com.sptg.device.api.dto;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.device.api.entity.DevicePath;
-import com.sptg.device.api.entity.DeviceRemoteInfo;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * title: DevicePathDto
- * package: com.sptg.device.api.dto
- * description:设备位置数据传输对象
- */
-@Getter
-@Setter
-public class DeviceRemoteInfoDto extends DeviceRemoteInfo {
-
-    /**
-     * 分页条件
-     */
-    @TableField(exist = false)
-    private Page<DeviceRemoteInfo> page;
-
-    /**
-     * 排序条件
-     */
-    @TableField(exist = false)
-    private String sortField;
-
-    /**
-     * 排序顺序
-     */
-    @TableField(exist = false)
-    private String sortOrder;
-}

sptg-device/sptg-device-api/src/main/java/com/sptg/device/api/dto/DeviceTemplateDto.java

@@ -1,44 +0,0 @@
-package com.sptg.device.api.dto;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.device.api.entity.Device;
-import com.sptg.device.api.entity.DeviceTemplate;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * title: DeviceDto
- * package: com.sptg.device.api.dto
- * description: 设备数据传输对象
- */
-@Getter
-@Setter
-public class DeviceTemplateDto extends DeviceTemplate {
-
-    /**
-     * 分页条件
-     */
-    @TableField(exist = false)
-    private Page<DeviceTemplate> page;
-
-    /**
-     * 排序条件
-     */
-    @TableField(exist = false)
-    private String sortField;
-
-    /**
-     * 排序顺序
-     */
-    @TableField(exist = false)
-    private String sortOrder;
-
-    /**
-     * 是否是下拉列表
-     */
-    @TableField(exist = false)
-    private Boolean isSelect=false;
-}

sptg-device/sptg-device-api/src/main/java/com/sptg/device/api/entity/DeviceOptions.java

@@ -1,187 +0,0 @@
-package com.sptg.device.api.entity;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.Date;
-
-/**
- * title: Device
- * package: com.sptg.device.api.entity
- * description: 设备实体类
- */
-@Setter
-@Getter
-@TableName(value = "device_options")
-public class DeviceOptions implements java.io.Serializable{
-
-    /**
-     * 主键
-     */
-    @TableId(value = "l_id",type = IdType.ID_WORKER)
-    private Long id;
-
-    /**
-     * 设备id
-     */
-    @TableField(value = "l_device_id")
-    private Long deviceId;
-
-    /**
-     * 设备序列号
-     */
-    @TableField(value = "s_serial_number")
-    private String serialNumber;
-
-    /**
-     * 设备厂商
-     */
-    @TableField(value = "s_device_factory")
-    private String deviceFactory;
-
-    /**
-     * 设备型号
-     */
-    @TableField(value = "s_type_code")
-    private String typeCode;
-
-    /**
-     * 通话音量 { 0--100 }
-     */
-    @TableField(value = "i_call_volume")
-    private Integer callVolume;
-
-    /**
-     * 广告音量 { 0--100 }
-     */
-    @TableField(value = "i_ad_volume")
-    private Integer adVolume;
-
-    /**
-     * 屏幕亮度 { 0--100 }
-     */
-    @TableField(value = "i_screen_brightness")
-    private Integer screenBrightness;
-
-    /**
-     * 人脸识别度 { 0--100 }
-     */
-    @TableField(value = "i_face_resolution")
-    private Integer faceResolution;
-
-    /**
-     * 补光灯亮度 { 0--100 }
-     */
-    @TableField(value = "i_fill_light")
-    private Integer fillLight;
-
-    /**
-     * 设备开门时长
-     */
-    @TableField(value = "i_delay")
-    private Integer delay;
-
-    /**
-     * 是否显示住户名称 : { 1：显示，2：不显示 }
-     */
-    @TableField(value = "i_is_show_username")
-    private Integer isShowUsername;
-
-    /**
-     * 是否启用时间策略 { 1：启用，2：不启用 }
-     */
-    @TableField(value = "i_time_strategy_is_enable")
-    private Integer timeStrategyIsEnable;
-
-    /**
-     * 石头开启活体检测,默认开启
-     * 1 就是开启,0 就是关闭
-     */
-    @TableField(value = "i_live_detect")
-    private Integer liveDetect;
-
-    /**
-     * 识别框位置：{ 1：左上角，2：左下角，3：中间位置，4：右下角 }
-     */
-    @TableField(value = "i_discern_box_position")
-    private Integer discernBoxPosition;
-
-    /**
-     * 广告轮播模式
-     */
-    @TableField(value = "i_play_model")
-    private Integer playModel;
-
-    /**
-     * 管理密码
-     */
-    @TableField(value = "s_admin_pwd")
-    private String adminPwd;
-
-    /**
-     * 紧急开门密码
-     */
-    @TableField(value = "s_open_door_pwd")
-    private String openDoorPwd;
-
-    /**
-     * 修改时间
-     */
-    @TableField(value = "t_update_date")
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    private Date updateDate;
-
-    /**
-     * 删除标记：{ -1：已删除，0：正常 }
-     */
-    @TableField(value = "i_status")
-    private Integer status;
-
-    /**
-     * 刷脸开门功能：{-1：禁用，0：启用 }：
-     */
-    @TableField(value = "i_face_open_door")
-    private Integer faceOpenDoor;
-
-    /**
-     * 刷卡开门功能：{-1：禁用，0：启用 }
-     */
-    @TableField(value = "i_card_open_door")
-    private Integer cardOpenDoor;
-
-    /**
-     * 远程开门功能：{-1：禁用，0：启用 }
-     */
-    @TableField(value = "i_remote_open_door")
-    private Integer remoteOpenDoor;
-
-    /**
-     * 密码开门功能：{-1：禁用，0：启用 }
-     */
-    @TableField(value = "i_pwd_open_door")
-    private Integer pwdOpenDoor;
-
-    /**
-     * 设备键盘功能：{-1：禁用，0：启用 }
-     */
-    @TableField(value = "i_keyboard")
-    private Integer keyboard;
-
-    /**
-     * 广告播放功能：{-1：禁用，0：启用 }
-     */
-    @TableField(value = "i_ad_play")
-    private Integer adPlay;
-
-    /**
-     * 广告播放功能：{-1：禁用，0：启用 }
-     */
-    @TableField(exist = false)
-    private String oldOpenDoorPwd;
-
-}

sptg-device/sptg-device-api/src/main/java/com/sptg/device/api/entity/DeviceRemoteInfo.java

@@ -1,171 +0,0 @@
-package com.sptg.device.api.entity;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.FieldStrategy;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.sptg.common.core.entity.BaseEntity;
-import lombok.Getter;
-import lombok.Setter;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * title: DevicePath
- * package: com.sptg.device.api.entity
- * description: 设备位置
- *
- *
- *
- */
-@Getter
-@Setter
-@TableName(value = "device_remote_info")
-public class DeviceRemoteInfo implements java.io.Serializable {
-
-    /**
-     * 主键
-     */
-    @TableId(value = "l_id",type = IdType.ID_WORKER)
-    private Long id;
-
-    /**
-     * 删除标记：{ -1：已删除，0：正常 }
-     */
-    @TableField(value = "i_status")
-    private Integer status;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "t_create_date")
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    private Date createDate;
-
-    /**
-     * 创建时间
-     */
-    @TableField(value = "t_update_date")
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    private Date updateDate;
-
-    /**
-     * 设备序列号
-     */
-    @TableField(value = "s_serial_number", strategy = FieldStrategy.IGNORED)
-    private String serialNumber;
-
-    /**
-     * 人脸识别度 { 0~100 }
-     */
-    @TableField(value = "s_face_threshold", strategy = FieldStrategy.IGNORED)
-    private String faceThreshold;
-
-    /**
-     * 是否开启活体检测
-     * 1、开启
-     * 2、闭关
-     */
-    @TableField(value = "s_live_detect", strategy = FieldStrategy.IGNORED)
-    private String liveDetect;
-
-    /**
-     * 是否定时开/关屏
-     * 1、开启
-     * 2、关闭
-     */
-    @TableField(value = "s_timing_open_screen", strategy = FieldStrategy.IGNORED)
-    private String timingOpenScreen;
-
-    /**
-     * 远程设备IP
-     */
-    @TableField(value = "s_remote_ip", strategy = FieldStrategy.IGNORED)
-    private String remoteIp;
-
-    /**
-     * 远程设备端口号
-     */
-    @TableField(value = "s_remote_port", strategy = FieldStrategy.IGNORED)
-    private String remotePort;
-
-    /**
-     * 硬盘空间使用率
-     * 整数
-     */
-    @TableField(value = "s_disk_space_usage", strategy = FieldStrategy.IGNORED)
-    private String diskSpaceUsage;
-
-    /**
-     * CPU温度
-     */
-    @TableField(value = "s_cpu_temperature", strategy = FieldStrategy.IGNORED)
-    private Integer cpuTemperature;
-
-    /**
-     * 流量卡IMEI码
-     */
-    @TableField(value = "s_imei", strategy = FieldStrategy.IGNORED)
-    private String imei;
-
-    /**
-     * 摄像头型号
-     */
-    @TableField(value = "s_camera_model", strategy = FieldStrategy.IGNORED)
-    private String cameraModel;
-
-    /**
-     * 设备上门禁卡总数
-     */
-    @TableField(value = "s_card_total", strategy = FieldStrategy.IGNORED)
-    private String cardTotal;
-
-    /**
-     * 设备上人脸总数
-     */
-    @TableField(value = "s_face_total", strategy = FieldStrategy.IGNORED)
-    private String faceTotal;
-
-    /**
-     * 屏幕亮度
-     */
-    @TableField(value = "s_screen_brightness", strategy = FieldStrategy.IGNORED)
-    private String screenBrightness;
-
-    /**
-     * 恢复包版本号
-     */
-    @TableField(value = "s_restore_pkg_version", strategy = FieldStrategy.IGNORED)
-    private String restorePkgVersion;
-
-
-    /**
-     * 当前设备升级包的版本号
-     */
-    @TableField(value = "s_pkg_version", strategy = FieldStrategy.IGNORED)
-    private String pkgVersion;
-
-    /**
-     * 设备禁用信息
-     * 0：无禁用
-     * 1：禁用了整个设备
-     * 2：禁用了刷脸开门
-     * 3：禁用了门禁卡开门
-     * 4：禁用了密码开门
-     * 5：禁用了远程开门
-     * 6：禁用了设备按键
-     * 7：禁用了广告播放
-     * 禁用多项时，用“-”连接，比如2-3
-     */
-    @TableField(value = "s_disable_info", strategy = FieldStrategy.IGNORED)
-    private String disableInfo;
-
-    /**
-     * 设备音量大小
-     */
-    @TableField(value = "s_volume", strategy = FieldStrategy.IGNORED)
-    private String volume;
-}

sptg-device/sptg-device-api/src/main/java/com/sptg/device/api/entity/DeviceTemplate.java

@@ -1,179 +0,0 @@
-package com.sptg.device.api.entity;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.sptg.common.core.entity.BaseEntity;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.Date;
-
-/**
- * title: Device
- * package: com.sptg.device.api.entity
- * description: 设备实体类
- */
-@Setter
-@Getter
-@TableName(value = "device_template")
-public class DeviceTemplate extends BaseEntity {
-
-    /**
-     * 设备配置名称
-     */
-    @TableField(value = "s_name")
-    private String name;
-
-    /**
-     * 设备厂商
-     */
-    @TableField(value = "s_device_factory")
-    private String deviceFactory;
-
-    /**
-     * 设备型号
-     */
-    @TableField(value = "s_type_code")
-    private String typeCode;
-
-    /**
-     * 设备尺寸
-     */
-    @TableField(value = "s_size")
-    private String size;
-
-    /**
-     * 通话音量 { 0--100 }
-     */
-    @TableField(value = "i_call_volume")
-    private Integer callVolume;
-
-    /**
-     * 广告音量 { 0--100 }
-     */
-    @TableField(value = "i_ad_volume")
-    private Integer adVolume;
-
-    /**
-     * 屏幕亮度 { 0--100 }
-     */
-    @TableField(value = "i_screen_brightness")
-    private Integer screenBrightness;
-
-    /**
-     * 设备开门时长
-     */
-    @TableField(value = "i_delay")
-    private Integer delay;
-
-    /**
-     * 是否显示住户名称 : { 1：显示，2：不显示 }
-     */
-    @TableField(value = "i_is_show_username")
-    private Integer isShowUsername;
-
-    /**
-     * 是否支持门禁卡功能：
-     *  1：支持
-     *  2：不支持
-     */
-    @TableField(value = "i_have_card")
-    private Integer haveCard;
-
-    /**
-     * 是否支持人脸识别：
-     *  1：支持
-     *  2：不支持
-     */
-    @TableField(value = "i_have_face")
-    private Integer haveFace;
-
-    /**
-     * 是否支持视频通话：
-     *  1：支持
-     *  2：不支持
-     */
-    @TableField(value = "i_have_call")
-    private Integer haveCall;
-
-    /**
-     * 是否支持键盘：
-     *  1：支持
-     *  2：不支持
-     */
-    @TableField(value = "i_have_keyboard")
-    private Integer haveKeyboard;
-    @TableField(value = "i_have_ad")
-    private Integer haveAd;
-	/**
-     * 是否支持一键重启：
-     *  1：支持
-     *  2：不支持
-     */
-
-    @TableField(value = "i_reboot")
-    private Integer reboot;
-
-    /**
-     * 人脸识别度 { 0--100 }
-     */
-    @TableField(value = "i_face_resolution")
-    private Integer faceResolution;
-
-    /**
-     * 补光灯亮度 { 0--100 }
-     */
-    @TableField(value = "i_fill_light")
-    private Integer fillLight;
-
-    /**
-     * 石头开启活体检测,默认开启
-     * 1 就是开启,0 就是关闭
-     */
-    @TableField(value = "i_live_detect")
-    private Integer liveDetect;
-
-    /**
-     * 识别框位置：{ 1：左上角，2：左下角，3：中间位置，4：右下角 }
-     */
-    @TableField(value = "i_discern_box_position")
-    private Integer discernBoxPosition;
-
-    /**
-     * 广告轮播模式
-     */
-    @TableField(value = "i_play_model")
-    private Integer playModel;
-
-    /**
-     * 紧急开门密码
-     */
-    @TableField(value = "s_open_door_pwd")
-    private String openDoorPwd;
-
-    /**
-     * 管理密码
-     */
-    @TableField(value = "s_admin_pwd")
-    private String adminPwd;
-
-    /**
-     * 设备备注
-     */
-    @TableField(value = "s_remark")
-    private String remark;
-
-    /**
-     * 创建人账号Id
-     */
-    @TableField(value = "l_create_account_id")
-    private Long createAccountId;
-
-    /**
-     * 修改时间
-     */
-    @TableField(value = "t_update_date")
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    private Date updateDate;
-}

sptg-device/sptg-device-api/src/main/java/com/sptg/device/api/feigns/DeviceFeign.java

@@ -6,7 +6,6 @@ import com.sptg.common.core.beans.ResultBean;
 import com.sptg.common.core.entity.DispatchTask;
 import com.sptg.device.api.dto.*;
 import com.sptg.device.api.entity.Device;
-import com.sptg.device.api.entity.DeviceRemoteInfo;
 import com.sptg.device.api.feigns.fallback.DeviceFeignFallbackFactory;
 import com.sptg.device.api.vo.DeviceVO;
 import com.sptg.device.api.vo.ManualPushDevicesTask;

sptg-device/sptg-device-api/src/main/java/com/sptg/device/api/feigns/DeviceOptionsFeign.java

@@ -1,66 +0,0 @@
-package com.sptg.device.api.feigns;
-
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.device.api.dto.DeviceOptionsDto;
-import com.sptg.device.api.entity.DeviceOptions;
-import com.sptg.device.api.feigns.fallback.DeviceOptionsFeignFallbackFactory;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-
-@FeignClient(value = "smart-house-device",fallbackFactory = DeviceOptionsFeignFallbackFactory.class)
-public interface DeviceOptionsFeign {
-
-    /**
-     * 添加设备配置
-     * @param deviceOptionsDto 设备配置
-     * @return ResultBean<Boolean>
-     */
-    @PostMapping(value = "/device/options/add")
-    Boolean add(@RequestBody DeviceOptionsDto deviceOptionsDto);
-
-    /**
-     * 修改设备配置
-     * @param deviceOptionsDto 设备配置
-     * @return ResultBean<Boolean>
-     */
-    @PostMapping(value = "/device/options/edit")
-    Boolean edit(@RequestBody DeviceOptionsDto deviceOptionsDto);
-
-    /**
-     * 删除设备配置
-     * @param deviceOptionsDto 设备配置
-     * @return ResultBean<Boolean>
-     */
-    @PostMapping(value = "/device/options/deleteOptions")
-    Boolean deleteOptions(@RequestBody DeviceOptionsDto deviceOptionsDto);
-    @PostMapping(value = "/device/options/deleteByOptionsId")
-    Boolean deleteByOptionsId(@RequestBody Long id);
-
-    /**
-     * 根据设备序列号获取记录
-     * @param serialNumber 设备序列号
-     * @return DeviceOptions
-     */
-    @GetMapping(value = "/device/options/getBySerialNumber")
-    DeviceOptions getBySerialNumber(@RequestBody String serialNumber);
-
-    /**
-     * 根据设备id获取记录
-     * @param deviceId 设备id
-     * @return DeviceOptions
-     */
-    @GetMapping(value = "/device/options/getByDeviceId/{deviceId}")
-    DeviceOptions getByDeviceId(@PathVariable(value = "deviceId") Long deviceId);
-
-    /**
-     * 获取一条记录
-     * @param deviceOptionsDto 设备配置
-     * @return DeviceOptions
-     */
-    @GetMapping(value = "/device/options/getOne")
-    DeviceOptions getOne(@RequestBody DeviceOptionsDto deviceOptionsDto);
-}

sptg-device/sptg-device-api/src/main/java/com/sptg/device/api/feigns/DeviceRemoteInfoFeign.java

@@ -1,84 +0,0 @@
-package com.sptg.device.api.feigns;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.device.api.dto.DevicePathDto;
-import com.sptg.device.api.dto.DeviceRemoteInfoDto;
-import com.sptg.device.api.entity.DevicePath;
-import com.sptg.device.api.entity.DeviceRemoteInfo;
-import com.sptg.device.api.feigns.fallback.DevicePathFeignFallbackFactory;
-import com.sptg.device.api.feigns.fallback.DeviceRemoteInfoFeignFallbackFactory;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
-
-/**
- * title: DeviceRemoteInfo
- * package: com.sptg.device.api.feigns
- * description:: 设备位置-服务接口
- */
-@FeignClient(value = "smart-house-device",fallbackFactory = DeviceRemoteInfoFeignFallbackFactory.class)
-public interface DeviceRemoteInfoFeign {
-
-    /**
-     * 功能描述:分页查询设备远程信息
-     *
-     * @param dto
-     * @return  ResultBean<Page>
-     */
-    @PostMapping(value = "/deviceRemoteInfo/pagingQuery")
-    ResultBean<Page> pagingQuery(@RequestBody DeviceRemoteInfoDto dto);
-
-    /**
-     * 功能描述:添加设备远程信息
-     * @param dto
-     * @return  ResultBean<Boolean>
-     */
-    @PostMapping(value = "/deviceRemoteInfo/add")
-    ResultBean<Boolean> add(@RequestBody DeviceRemoteInfoDto dto);
-
-    /**
-     * 功能描述:获取设备远程信息
-     * @param dto
-     * @return com.sptg.device.api.entity.DevicePath
-     */
-    @PostMapping(value = "/deviceRemoteInfo/findDeviceRemoteInfo")
-    DeviceRemoteInfo findDeviceRemoteInfo(@RequestBody DeviceRemoteInfoDto dto);
-
-    /**
-     * 功能描述:获取设备远程信息，根据设备序列号
-     * @param serialNumber
-     * @return com.sptg.device.api.entity.DevicePath
-     */
-    @GetMapping(value = "/deviceRemoteInfo/getEntityBySerialNumber/{serialNumber}")
-    DeviceRemoteInfo getBySerialNumber(@PathVariable("serialNumber") String serialNumber);
-
-    /**
-     * 功能描述: 根据Id获取设备远程信息
-     * @param id
-     * @return DevicePath
-     */
-    @GetMapping(value = "/deviceRemoteInfo/getEntityById/{id}")
-    DeviceRemoteInfo getById(@PathVariable(value = "id") Long id);
-
-    /**
-     * 功能描述:修改设备远程信息
-     * @param deviceRemoteInfo
-     * @return  ResultBean<Boolean>
-     */
-    @PostMapping(value = "/deviceRemoteInfo/edit")
-    ResultBean<Boolean> edit(@RequestBody DeviceRemoteInfo deviceRemoteInfo);
-
-    /**
-     * 功能描述:删除设备远程信息
-     * @param dto
-     * @return ResultBean<Boolean>
-     */
-    @PostMapping(value = "/deviceRemoteInfo/delete")
-    ResultBean<Boolean> delete(@RequestBody DeviceRemoteInfoDto dto);
-
-}

sptg-device/sptg-device-api/src/main/java/com/sptg/device/api/feigns/DeviceTemplateFeign.java

@@ -1,77 +0,0 @@
-package com.sptg.device.api.feigns;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.device.api.dto.DeviceTemplateDto;
-import com.sptg.device.api.entity.DeviceTemplate;
-import com.sptg.device.api.feigns.fallback.DeviceTemplateFeignFallbackFactory;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
-
-
-@FeignClient(value = "smart-house-device",fallbackFactory = DeviceTemplateFeignFallbackFactory.class)
-public interface DeviceTemplateFeign {
-
-    /**
-     * 分页查询
-     * @param deviceTemplateDto 查询条件
-     * @return Page<DeviceTemplate>
-     */
-    @PostMapping(value = "/deviceTemplate/pagingQuery")
-    ResultBean<Page<DeviceTemplate>> pagingQuery(@RequestBody DeviceTemplateDto deviceTemplateDto);
-
-    /**
-     * 添加设备配置
-     * @param deviceTemplateDto 设备配置
-     * @return Boolean
-     */
-    @PostMapping(value = "/deviceTemplate/addDeviceTemplate")
-    ResultBean<Boolean> addDeviceTemplate(@RequestBody DeviceTemplateDto deviceTemplateDto);
-
-    /**
-     * 修改设备配置
-     * @param deviceTemplateDto 设备配置
-     * @return Boolean
-     */
-    @PostMapping(value = "/deviceTemplate/updateDeviceTemplate")
-    ResultBean<Boolean> updateDeviceTemplate(@RequestBody DeviceTemplateDto deviceTemplateDto);
-    /**
-     * 删除设备配置
-     * @param deviceTemplateDto 设备配置
-     * @return Boolean
-     */
-    @PostMapping(value = "/deviceTemplate/deleteDeviceTemplate")
-    ResultBean<Boolean> deleteDeviceTemplate(@RequestBody DeviceTemplateDto deviceTemplateDto);
-
-    /**
-     * 获取一条记录
-     * @param deviceTemplateDto 查询条件
-     * @return DeviceTemplate
-     */
-    @PostMapping(value = "/deviceTemplate/getOne")
-    DeviceTemplate getOne(@RequestBody DeviceTemplateDto deviceTemplateDto);
-
-    /**
-     * 根据条件获取列表
-     * @param deviceTemplateDto 查询条件
-     * @return List<DeviceTemplate>
-     */
-    @PostMapping(value = "/deviceTemplate/getListByCondition")
-    List<DeviceTemplate> getListByCondition(@RequestBody DeviceTemplateDto deviceTemplateDto);
-
-    @PostMapping(value = "/deviceTemplate/getOneById/{id}")
-    DeviceTemplate getOneById(@PathVariable(value = "id") Long id);
-
-    /**
-     * 功能描述: 根据名称模糊查询
-     * @param deviceTemplateDto
-     * @return List<Residential>
-     *
-     */
-    @PostMapping(value = "/residential/getListByLikeTypeCode")
-    List<DeviceTemplate> getListByLikeTypeCode(@RequestBody DeviceTemplateDto deviceTemplateDto);
-}

sptg-device/sptg-device-api/src/main/java/com/sptg/device/api/feigns/fallback/DeviceFeignFallbackFactory.java

@@ -9,7 +9,6 @@ import com.sptg.device.api.dto.AccessCardSimpleDto;
 import com.sptg.device.api.dto.DeviceDto;
 import com.sptg.device.api.dto.FaceInfoDto;
 import com.sptg.device.api.entity.Device;
-import com.sptg.device.api.entity.DeviceRemoteInfo;
 import com.sptg.device.api.feigns.DeviceFeign;
 import com.sptg.device.api.vo.DeviceVO;
 import com.sptg.device.api.vo.ManualPushDevicesTask;

sptg-device/sptg-device-api/src/main/java/com/sptg/device/api/feigns/fallback/DeviceOptionsFeignFallbackFactory.java

@@ -1,61 +0,0 @@
-package com.sptg.device.api.feigns.fallback;
-
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.common.core.beans.ResultEnum;
-import com.sptg.device.api.dto.DeviceOptionsDto;
-import com.sptg.device.api.entity.DeviceOptions;
-import com.sptg.device.api.feigns.DeviceOptionsFeign;
-import feign.hystrix.FallbackFactory;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-@Component
-@Slf4j
-public class DeviceOptionsFeignFallbackFactory implements FallbackFactory<DeviceOptionsFeign> {
-    @Override
-    public DeviceOptionsFeign create(Throwable cause) {
-        return new DeviceOptionsFeign() {
-            @Override
-            public Boolean add(DeviceOptionsDto deviceOptionsDto) {
-                log.error(cause.getMessage());
-                return false;
-            }
-
-            @Override
-            public Boolean edit(DeviceOptionsDto deviceOptionsDto) {
-                log.error(cause.getMessage());
-                return false;
-            }
-
-            @Override
-            public Boolean deleteOptions(DeviceOptionsDto deviceOptionsDto) {
-                log.error(cause.getMessage());
-                return false;
-            }
-            @Override
-            public Boolean deleteByOptionsId(Long id) {
-                log.error(cause.getMessage());
-                return false;
-            }
-
-            @Override
-            public DeviceOptions getBySerialNumber(String serialNumber) {
-                log.error(cause.getMessage());
-                return null;
-            }
-
-            @Override
-            public DeviceOptions getByDeviceId(Long deviceId) {
-                log.error(cause.getMessage());
-                return null;
-            }
-
-            @Override
-            public DeviceOptions getOne(DeviceOptionsDto deviceOptionsDto) {
-                log.error(cause.getMessage());
-                return null;
-            }
-
-        };
-    }
-}

sptg-device/sptg-device-api/src/main/java/com/sptg/device/api/feigns/fallback/DeviceRemoteInfoFeignFallbackFactory.java

@@ -1,75 +0,0 @@
-package com.sptg.device.api.feigns.fallback;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.common.core.beans.ResultEnum;
-import com.sptg.common.core.constant.OperationConstant;
-import com.sptg.device.api.dto.DevicePathDto;
-import com.sptg.device.api.dto.DeviceRemoteInfoDto;
-import com.sptg.device.api.entity.DevicePath;
-import com.sptg.device.api.entity.DeviceRemoteInfo;
-import com.sptg.device.api.feigns.DevicePathFeign;
-import com.sptg.device.api.feigns.DeviceRemoteInfoFeign;
-import feign.hystrix.FallbackFactory;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * title: DevicePathFeignFallbackFactory
- * package: com.sptg.device.api.feigns.fallback
- * description:设备位置对外服务接口容错处理
- */
-@Component
-@Slf4j
-public class DeviceRemoteInfoFeignFallbackFactory implements FallbackFactory<DeviceRemoteInfoFeign> {
-
-    @Override
-    public DeviceRemoteInfoFeign create(Throwable cause) {
-        return new DeviceRemoteInfoFeign() {
-            @Override
-            public ResultBean<Page> pagingQuery(DeviceRemoteInfoDto dto) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public ResultBean<Boolean> add(DeviceRemoteInfoDto dto) {
-                log.error(cause.getMessage());
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public DeviceRemoteInfo findDeviceRemoteInfo(DeviceRemoteInfoDto dto) {
-                log.error(cause.getMessage());
-                return null;
-            }
-
-            @Override
-            public DeviceRemoteInfo getBySerialNumber(String serialNumber) {
-                log.error(cause.getMessage());
-                return null;
-            }
-
-            @Override
-            public DeviceRemoteInfo getById(Long id) {
-                log.error(cause.getMessage());
-                return null;
-            }
-
-            @Override
-            public ResultBean<Boolean> edit(DeviceRemoteInfo deviceRemoteInfo) {
-                log.error(cause.getMessage());
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public ResultBean<Boolean> delete(DeviceRemoteInfoDto dto) {
-                log.error(cause.getMessage());
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-        };
-    }
-}

sptg-device/sptg-device-api/src/main/java/com/sptg/device/api/feigns/fallback/DeviceTemplateFeignFallbackFactory.java

@@ -1,72 +0,0 @@
-package com.sptg.device.api.feigns.fallback;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.common.core.beans.PageBean;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.common.core.beans.ResultEnum;
-import com.sptg.device.api.dto.DeviceTemplateDto;
-import com.sptg.device.api.entity.DeviceTemplate;
-import com.sptg.device.api.feigns.DeviceTemplateFeign;
-import feign.hystrix.FallbackFactory;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Component
-@Slf4j
-public class DeviceTemplateFeignFallbackFactory implements FallbackFactory<DeviceTemplateFeign> {
-    @Override
-    public DeviceTemplateFeign create(Throwable cause) {
-        return new DeviceTemplateFeign() {
-            @Override
-            public ResultBean<Page<DeviceTemplate>> pagingQuery(DeviceTemplateDto deviceTemplateDto) {
-                log.error(cause.getMessage(),cause);
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public ResultBean<Boolean> addDeviceTemplate(DeviceTemplateDto deviceTemplateDto) {
-                log.error(cause.getMessage());
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public ResultBean<Boolean> updateDeviceTemplate(DeviceTemplateDto deviceTemplateDto) {
-                log.error(cause.getMessage());
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public ResultBean<Boolean> deleteDeviceTemplate(DeviceTemplateDto deviceTemplateDto) {
-                log.error(cause.getMessage());
-                return new ResultBean<>(ResultEnum.ERROR);
-            }
-
-            @Override
-            public DeviceTemplate getOne(DeviceTemplateDto deviceTemplateDto) {
-                log.error(cause.getMessage());
-                return null;
-            }
-
-            @Override
-            public List<DeviceTemplate> getListByCondition(DeviceTemplateDto deviceTemplateDto) {
-                log.error(cause.getMessage());
-                return new ArrayList<>(0);
-            }
-
-            @Override
-            public DeviceTemplate getOneById(Long id) {
-                log.error(cause.getMessage());
-                return null;
-            }
-
-            @Override
-            public List<DeviceTemplate> getListByLikeTypeCode(DeviceTemplateDto deviceTemplateDto) {
-                log.error(cause.getMessage());
-                return new ArrayList<>(0);
-            }
-        };
-    }
-}

sptg-device/sptg-device-biz/src/main/java/com/sptg/device/biz/controller/DeviceOptionsController.java

@@ -1,103 +0,0 @@
-package com.sptg.device.biz.controller;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.common.core.enums.Instruct;
-import com.sptg.device.api.dto.DeviceOptionsDto;
-import com.sptg.device.api.dto.DeviceTemplateDto;
-import com.sptg.device.api.entity.Device;
-import com.sptg.device.api.entity.DeviceOptions;
-import com.sptg.device.api.entity.DeviceTemplate;
-import com.sptg.device.api.feigns.DeviceOptionsFeign;
-import com.sptg.device.api.feigns.DeviceTemplateFeign;
-import com.sptg.device.biz.service.DeviceOptionsServiceInterface;
-import com.sptg.device.biz.service.DeviceServiceInterface;
-import com.sptg.device.biz.service.DeviceTemplateServiceInterface;
-import com.sptg.device.biz.service.MsgPublishService;
-import lombok.RequiredArgsConstructor;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@RestController
-@RequiredArgsConstructor
-public class DeviceOptionsController implements DeviceOptionsFeign {
-    private final DeviceOptionsServiceInterface deviceOptionsServiceInterface;
-    private final MsgPublishService msgPublishService;
-    private final DeviceServiceInterface deviceServiceInterface;
-
-    @Override
-    @PostMapping(value = "/device/options/add")
-    public Boolean add(@RequestBody DeviceOptionsDto deviceOptionsDto) {
-        Boolean add = this.deviceOptionsServiceInterface.add(deviceOptionsDto);
-        if(add){
-            //  下发远程更新设备配置信息指令
-            //  通知设备信息被修改
-            DeviceOptions deviceOptions = this.deviceOptionsServiceInterface.getBySerialNumber(deviceOptionsDto.getSerialNumber());
-            Device device = this.deviceServiceInterface.selectBySerialNumber(deviceOptions.getSerialNumber());
-            if(deviceOptions != null && device != null){
-                Map<String,String> map = new HashMap<>();
-                //小区
-                map.put("xqName", device.getXqName());
-                //单元
-                map.put("unitName", device.getDyName());
-                this.msgPublishService.asyncPublish(deviceOptions, device, Instruct.remote_update_device_setting, map);
-            }
-        }
-        return add;
-    }
-
-    @Override
-    @PostMapping(value = "/device/options/edit")
-    public Boolean edit(@RequestBody DeviceOptionsDto deviceOptionsDto) {
-        Boolean edit = this.deviceOptionsServiceInterface.edit(deviceOptionsDto);
-        if(edit){
-            //  下发远程更新设备配置信息指令
-            //  通知设备信息被修改
-            Device device = this.deviceServiceInterface.selectBySerialNumber(deviceOptionsDto.getSerialNumber());
-            DeviceOptions deviceOptions = this.deviceOptionsServiceInterface.getBySerialNumber(deviceOptionsDto.getSerialNumber());
-            if(deviceOptions != null && device != null){
-                Map<String,String> map = new HashMap<>();
-                //小区
-                map.put("xqName", device.getXqName());
-                //单元
-                map.put("unitName", device.getDyName());
-                this.msgPublishService.asyncPublish(deviceOptions, device, Instruct.remote_update_device_setting, map);
-            }
-        }
-        return edit;
-    }
-
-    @Override
-    @PostMapping(value = "/device/options/deleteOptions")
-    public Boolean deleteOptions(@RequestBody DeviceOptionsDto deviceOptionsDto) {
-        return this.deviceOptionsServiceInterface.deleteOptions(deviceOptionsDto);
-    }
-
-    @Override
-    @PostMapping(value = "/device/options/deleteByOptionsId")
-    public Boolean deleteByOptionsId(@RequestBody Long id) {
-        return this.deviceOptionsServiceInterface.deleteByOptionsId(id);
-    }
-
-    @Override
-    @GetMapping(value = "/device/options/getBySerialNumber")
-    public DeviceOptions getBySerialNumber(@RequestBody String serialNumber) {
-        return this.deviceOptionsServiceInterface.getBySerialNumber(serialNumber);
-    }
-
-    @Override
-    @GetMapping(value = "/device/options/getByDeviceId/{deviceId}")
-    public DeviceOptions getByDeviceId(@PathVariable(value = "deviceId") Long deviceId) {
-        return this.deviceOptionsServiceInterface.getByDeviceId(deviceId);
-    }
-
-    @Override
-    @GetMapping(value = "/device/options/getOne")
-    public DeviceOptions getOne(@RequestBody DeviceOptionsDto deviceOptionsDto) {
-        return this.deviceOptionsServiceInterface.getOne(deviceOptionsDto);
-    }
-}

sptg-device/sptg-device-biz/src/main/java/com/sptg/device/biz/controller/DevicePathController.java

@@ -54,6 +54,8 @@ public class DevicePathController implements DevicePathFeign {
         Date date =new Date();
         dto.setCreateDate(date);
         dto.setUpdateDate(date);
+        //默认是一般位置10
+        dto.setPathUse(10);
 
         //生成设备位置编号
         //获取日期字符串

sptg-device/sptg-device-biz/src/main/java/com/sptg/device/biz/controller/DeviceRemoteInfoController.java

@@ -1,77 +0,0 @@
-package com.sptg.device.biz.controller;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.common.core.beans.ResultEnum;
-import com.sptg.device.api.dto.DeviceRemoteInfoDto;
-import com.sptg.device.api.entity.DeviceRemoteInfo;
-import com.sptg.device.api.feigns.DeviceRemoteInfoFeign;
-import com.sptg.device.biz.service.DeviceRemoteInfoServiceInterface;
-import lombok.RequiredArgsConstructor;
-import org.springframework.util.Assert;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @author zwx
- * @create 2020/9/29 17:43
- */
-@RestController
-@RequiredArgsConstructor
-public class DeviceRemoteInfoController implements DeviceRemoteInfoFeign {
-
-    private final DeviceRemoteInfoServiceInterface deviceRemoteInfoServiceInterface;
-
-    @Override
-    @PostMapping(value = "/deviceRemoteInfo/pagingQuery")
-    public ResultBean<Page> pagingQuery(@RequestBody DeviceRemoteInfoDto dto) {
-        Page<DeviceRemoteInfo> deviceRemoteInfoPage = this.deviceRemoteInfoServiceInterface.pagingQuery(dto);
-        return new ResultBean<>(ResultEnum.SUCCESS, deviceRemoteInfoPage);
-    }
-
-    @Override
-    @PostMapping(value = "/deviceRemoteInfo/add")
-    public ResultBean<Boolean> add(@RequestBody DeviceRemoteInfoDto dto) {
-        String serialNumber = dto.getSerialNumber();
-        Assert.notNull(serialNumber != null, "设备序列号不能为空");
-        return this.deviceRemoteInfoServiceInterface.add(dto);
-    }
-
-    @Override
-    @PostMapping(value = "/deviceRemoteInfo/edit")
-    public ResultBean<Boolean> edit(@RequestBody DeviceRemoteInfo deviceRemoteInfo) {
-        Long id = deviceRemoteInfo.getId();
-        Assert.notNull(id, "设备远程信息ID不能为空");
-        return this.deviceRemoteInfoServiceInterface.edit(deviceRemoteInfo);
-    }
-
-    @Override
-    @PostMapping(value = "/deviceRemoteInfo/findDeviceRemoteInfo")
-    public DeviceRemoteInfo findDeviceRemoteInfo(@RequestBody DeviceRemoteInfoDto dto) {
-        Long id = dto.getId();
-        String serialNumber = dto.getSerialNumber();
-        Assert.isTrue(id != null || serialNumber != null, "设备远程信息ID或者设备序列号不能为空");
-        return deviceRemoteInfoServiceInterface.findDeviceRemoteInfo(dto);
-    }
-
-    @Override
-    @GetMapping(value = "/deviceRemoteInfo/getEntityBySerialNumber/{serialNumber}")
-    public DeviceRemoteInfo getBySerialNumber(@PathVariable(value = "serialNumber") String serialNumber) {
-        Assert.notNull(serialNumber, "设备序列号不能为空");
-        DeviceRemoteInfo deviceRemoteInfo = this.deviceRemoteInfoServiceInterface.getBySerialNumber(serialNumber);
-        return deviceRemoteInfo;
-    }
-
-    @Override
-    @GetMapping(value = "/deviceRemoteInfo/getEntityById/{id}")
-    public DeviceRemoteInfo getById(@PathVariable(value = "id") Long id) {
-        Assert.notNull(id, "设备远程信息ID不能为空");
-        DeviceRemoteInfo deviceRemoteInfo = this.deviceRemoteInfoServiceInterface.getById(id);
-        return deviceRemoteInfo;
-    }
-
-    @Override
-    @PostMapping(value = "/deviceRemoteInfo/delete")
-    public ResultBean<Boolean> delete(@RequestBody DeviceRemoteInfoDto dto) {
-        return this.deviceRemoteInfoServiceInterface.delete(dto);
-    }
-}

sptg-device/sptg-device-biz/src/main/java/com/sptg/device/biz/controller/DeviceTemplateController.java

@@ -1,68 +0,0 @@
-package com.sptg.device.biz.controller;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.device.api.dto.DeviceTemplateDto;
-import com.sptg.device.api.entity.DeviceTemplate;
-import com.sptg.device.api.feigns.DeviceTemplateFeign;
-import com.sptg.device.biz.service.DeviceTemplateServiceInterface;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-@RestController
-@RequiredArgsConstructor
-public class DeviceTemplateController implements DeviceTemplateFeign {
-    private final DeviceTemplateServiceInterface deviceTemplateServiceInterface;
-
-    @Override
-    @PostMapping(value = "/deviceTemplate/pagingQuery")
-    public ResultBean<Page<DeviceTemplate>> pagingQuery(@RequestBody DeviceTemplateDto deviceTemplateDto) {
-        return this.deviceTemplateServiceInterface.pagingQuery(deviceTemplateDto);
-    }
-
-    @Override
-    @PostMapping(value = "/deviceTemplate/addDeviceTemplate")
-    public ResultBean<Boolean> addDeviceTemplate(@RequestBody DeviceTemplateDto deviceTemplateDto) {
-        return this.deviceTemplateServiceInterface.addDeviceTemplate(deviceTemplateDto);
-    }
-
-    @Override
-    @PostMapping(value = "/deviceTemplate/updateDeviceTemplate")
-    public ResultBean<Boolean> updateDeviceTemplate(@RequestBody DeviceTemplateDto deviceTemplateDto) {
-        return this.deviceTemplateServiceInterface.updateDeviceTemplate(deviceTemplateDto);
-    }
-
-    @Override
-    @PostMapping(value = "/deviceTemplate/deleteDeviceTemplate")
-    public ResultBean<Boolean> deleteDeviceTemplate(@RequestBody DeviceTemplateDto deviceTemplateDto) {
-        return this.deviceTemplateServiceInterface.deleteDeviceTemplate(deviceTemplateDto);
-    }
-
-    @Override
-    @PostMapping(value = "/deviceTemplate/getOne")
-    public DeviceTemplate getOne(@RequestBody DeviceTemplateDto deviceTemplateDto) {
-        return this.deviceTemplateServiceInterface.getOne(deviceTemplateDto);
-    }
-
-    @Override
-    @PostMapping(value = "/deviceTemplate/getListByCondition")
-    public List<DeviceTemplate> getListByCondition(@RequestBody DeviceTemplateDto deviceTemplateDto) {
-        return this.deviceTemplateServiceInterface.getListByCondition(deviceTemplateDto);
-    }
-
-    @Override
-    @PostMapping(value = "/deviceTemplate/getOneById/{id}")
-    public DeviceTemplate getOneById(@PathVariable(value = "id") Long id) {
-        return this.deviceTemplateServiceInterface.selectById(id);
-    }
-
-    @Override
-    public List<DeviceTemplate> getListByLikeTypeCode(@RequestBody DeviceTemplateDto deviceTemplateDto) {
-        return this.deviceTemplateServiceInterface.getListByLikeTypeCode(deviceTemplateDto);
-    }
-}

sptg-device/sptg-device-biz/src/main/java/com/sptg/device/biz/mapper/DeviceOptionsMapper.java

@@ -1,8 +0,0 @@
-package com.sptg.device.biz.mapper;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.sptg.device.api.entity.DeviceOptions;
-import com.sptg.device.api.entity.DeviceTemplate;
-
-public interface DeviceOptionsMapper extends BaseMapper<DeviceOptions> {
-}

sptg-device/sptg-device-biz/src/main/java/com/sptg/device/biz/mapper/DeviceRemoteInfoMapper.java

@@ -1,15 +0,0 @@
-package com.sptg.device.biz.mapper;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.sptg.device.api.entity.DeviceRemoteInfo;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * @author zwx
- * @create 2020/9/29 17:56
- */
-public interface DeviceRemoteInfoMapper extends BaseMapper<DeviceRemoteInfo> {
-
-    DeviceRemoteInfo findDeviceRemoteInfo(@Param(value = "ew") Wrapper<DeviceRemoteInfo> wrapper);
-}

sptg-device/sptg-device-biz/src/main/java/com/sptg/device/biz/mapper/DeviceTemplateMapper.java

@@ -1,7 +0,0 @@
-package com.sptg.device.biz.mapper;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.sptg.device.api.entity.DeviceTemplate;
-
-public interface DeviceTemplateMapper extends BaseMapper<DeviceTemplate> {
-}

sptg-device/sptg-device-biz/src/main/java/com/sptg/device/biz/service/DeviceOptionsServiceInterface.java

@@ -1,56 +0,0 @@
-package com.sptg.device.biz.service;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.service.IService;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.device.api.dto.DeviceOptionsDto;
-import com.sptg.device.api.entity.DeviceOptions;
-import com.sptg.device.api.entity.DeviceTemplate;
-
-import java.util.List;
-
-public interface DeviceOptionsServiceInterface extends IService<DeviceOptions> {
-    
-    /**
-     * 添加设备配置
-     * @param deviceOptionsDto 设备配置
-     * @return Boolean
-     */
-    Boolean add(DeviceOptionsDto deviceOptionsDto);
-
-    /**
-     * 修改设备配置
-     * @param deviceOptionsDto 设备配置
-     * @return Boolean
-     */
-    Boolean edit(DeviceOptionsDto deviceOptionsDto);
-
-    /**
-     * 删除设备配置
-     * @param deviceOptionsDto 设备配置
-     * @return Boolean
-     */
-    Boolean deleteOptions(DeviceOptionsDto deviceOptionsDto);
-    Boolean deleteByOptionsId(Long id);
-
-    /**
-     * 根据设备序列号获取记录
-     * @param serialNumber 设备序列号
-     * @return DeviceOptions
-     */
-    DeviceOptions getBySerialNumber(String serialNumber);
-
-    /**
-     * 根据设备id获取记录
-     * @param deviceId 设备序列号
-     * @return DeviceOptions
-     */
-    DeviceOptions getByDeviceId(Long deviceId);
-
-    /**
-     * 获取一条记录
-     * @param deviceOptionsDto 设备配置
-     * @return DeviceOptions
-     */
-    DeviceOptions getOne(DeviceOptionsDto deviceOptionsDto);
-}

sptg-device/sptg-device-biz/src/main/java/com/sptg/device/biz/service/DeviceRemoteInfoServiceInterface.java

@@ -1,28 +0,0 @@
-package com.sptg.device.biz.service;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.service.IService;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.device.api.dto.DeviceRemoteInfoDto;
-import com.sptg.device.api.entity.DeviceRemoteInfo;
-
-/**
- * @author zwx
- * @create 2020/9/29 17:51
- */
-public interface DeviceRemoteInfoServiceInterface extends IService<DeviceRemoteInfo> {
-
-    Page<DeviceRemoteInfo> pagingQuery(DeviceRemoteInfoDto dto);
-
-    ResultBean<Boolean> add(DeviceRemoteInfoDto dto);
-
-    DeviceRemoteInfo findDeviceRemoteInfo(DeviceRemoteInfoDto dto);
-
-    DeviceRemoteInfo getBySerialNumber(String serialNumber);
-
-    DeviceRemoteInfo getById(Long id);
-
-    ResultBean<Boolean> edit(DeviceRemoteInfo deviceRemoteInfo);
-
-    ResultBean<Boolean> delete(DeviceRemoteInfoDto dto);
-}

sptg-device/sptg-device-biz/src/main/java/com/sptg/device/biz/service/DeviceTemplateServiceInterface.java

@@ -1,67 +0,0 @@
-package com.sptg.device.biz.service;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.service.IService;
-import com.sptg.common.core.beans.PageBean;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.device.api.dto.DeviceTemplateDto;
-import com.sptg.device.api.entity.DeviceTemplate;
-import com.sptg.device.api.entity.DeviceTemplate;
-import com.sptg.estate.api.dto.ResidentialDto;
-import com.sptg.estate.api.entity.Residential;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
-
-public interface DeviceTemplateServiceInterface extends IService<DeviceTemplate> {
-
-    /**
-     * 分页查询
-     * @param deviceTemplateDto 查询条件
-     * @return Page<DeviceTemplate>
-     */
-    ResultBean<Page<DeviceTemplate>> pagingQuery(DeviceTemplateDto deviceTemplateDto);
-
-    /**
-     * 添加设备配置
-     * @param deviceTemplateDto 设备配置
-     * @return Boolean
-     */
-    ResultBean<Boolean> addDeviceTemplate(DeviceTemplateDto deviceTemplateDto);
-
-    /**
-     * 修改设备配置
-     * @param deviceTemplateDto 设备配置
-     * @return Boolean
-     */
-    ResultBean<Boolean> updateDeviceTemplate(DeviceTemplateDto deviceTemplateDto);
-
-    /**
-     * 删除设备配置
-     * @param deviceTemplateDto 设备配置
-     * @return Boolean
-     */
-    ResultBean<Boolean> deleteDeviceTemplate(DeviceTemplateDto deviceTemplateDto);
-
-    /**
-     * 获取一条记录
-     * @param deviceTemplateDto 查询条件
-     * @return DeviceTemplate
-     */
-    DeviceTemplate getOne(DeviceTemplateDto deviceTemplateDto);
-
-    /**
-     * 根据条件获取列表
-     * @param deviceTemplateDto 查询条件
-     * @return List<DeviceTemplate>
-     */
-    List<DeviceTemplate> getListByCondition(DeviceTemplateDto deviceTemplateDto);
-
-    /**
-     * 根据设备厂商和型号获取记录
-     * @param deviceTemplateDto
-     * @return
-     */
-    List<DeviceTemplate> getListByLikeTypeCode(DeviceTemplateDto deviceTemplateDto);
-}

sptg-device/sptg-device-biz/src/main/java/com/sptg/device/biz/service/impl/DeviceOptionsServiceImpl.java

@@ -1,84 +0,0 @@
-package com.sptg.device.biz.service.impl;
-
-import com.baomidou.mybatisplus.enums.SqlLike;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.common.core.beans.ResultEnum;
-import com.sptg.common.core.constant.OperationConstant;
-import com.sptg.device.api.dto.DeviceOptionsDto;
-import com.sptg.device.api.dto.DeviceTemplateDto;
-import com.sptg.device.api.entity.DeviceOptions;
-import com.sptg.device.api.entity.DeviceTemplate;
-import com.sptg.device.biz.mapper.DeviceOptionsMapper;
-import com.sptg.device.biz.mapper.DeviceTemplateMapper;
-import com.sptg.device.biz.service.DeviceOptionsServiceInterface;
-import com.sptg.device.biz.service.DeviceTemplateServiceInterface;
-import lombok.AllArgsConstructor;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.util.Assert;
-
-import java.util.Date;
-import java.util.List;
-
-@Service
-@AllArgsConstructor
-public class DeviceOptionsServiceImpl extends ServiceImpl<DeviceOptionsMapper, DeviceOptions> implements DeviceOptionsServiceInterface {
-
-    @Override
-    public Boolean add(DeviceOptionsDto deviceOptionsDto) {
-        deviceOptionsDto.setStatus(OperationConstant.ZERO);
-        return this.insert(deviceOptionsDto);
-    }
-
-    @Override
-    public Boolean edit(DeviceOptionsDto deviceOptionsDto) {
-        deviceOptionsDto.setUpdateDate(new Date());
-        return this.updateById(deviceOptionsDto);
-    }
-
-    @Override
-    public Boolean deleteOptions(DeviceOptionsDto deviceOptionsDto) {
-        Wrapper<DeviceOptions> wrapper = new EntityWrapper<>();
-        wrapper.eq(deviceOptionsDto.getDeviceId() != null,"l_device_id",deviceOptionsDto.getDeviceId());
-        wrapper.eq(deviceOptionsDto.getSerialNumber() != null,"s_serial_number",deviceOptionsDto.getSerialNumber());
-        if (deviceOptionsDto.getDeviceIds() != null && deviceOptionsDto.getDeviceIds().size() >0){
-            wrapper.in("l_device_id",deviceOptionsDto.getDeviceIds());
-        }
-        return this.delete(wrapper);
-    }
-
-    @Override
-    public Boolean deleteByOptionsId(Long id) {
-        return this.deleteById(id);
-    }
-
-    @Override
-    public DeviceOptions getBySerialNumber(String serialNumber) {
-        Wrapper<DeviceOptions> wrapper = new EntityWrapper<>();
-        wrapper.eq("i_status",OperationConstant.ZERO);
-        wrapper.eq("s_serial_number",serialNumber);
-        return this.selectOne(wrapper);
-    }
-
-    @Override
-    public DeviceOptions getByDeviceId(Long deviceId) {
-        Wrapper<DeviceOptions> wrapper = new EntityWrapper<>();
-        wrapper.eq("i_status",OperationConstant.ZERO);
-        wrapper.eq("l_device_id",deviceId);
-        return this.selectOne(wrapper);
-    }
-
-    @Override
-    public DeviceOptions getOne(DeviceOptionsDto deviceOptionsDto) {
-        Wrapper<DeviceOptions> wrapper = new EntityWrapper<>();
-        wrapper.notIn("i_status",OperationConstant.MINUS_ONE);
-        wrapper.eq(deviceOptionsDto.getDeviceId() != null,"l_device_id",deviceOptionsDto.getDeviceId());
-        wrapper.eq(deviceOptionsDto.getSerialNumber() != null,"s_serial_number",deviceOptionsDto.getSerialNumber());
-        return this.selectOne(wrapper);
-    }
-}

sptg-device/sptg-device-biz/src/main/java/com/sptg/device/biz/service/impl/DeviceRemoteInfoServiceImpl.java

@@ -1,99 +0,0 @@
-package com.sptg.device.biz.service.impl;
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.common.core.beans.ResultEnum;
-import com.sptg.common.core.constant.OperationConstant;
-import com.sptg.device.api.dto.DeviceRemoteInfoDto;
-import com.sptg.device.api.entity.DevicePath;
-import com.sptg.device.api.entity.DeviceRemoteInfo;
-import com.sptg.device.biz.mapper.DeviceRemoteInfoMapper;
-import com.sptg.device.biz.service.DeviceRemoteInfoServiceInterface;
-import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
-
-/**
- * @author zwx
- * @create 2020/9/29 17:55
- */
-@Service
-public class DeviceRemoteInfoServiceImpl extends ServiceImpl<DeviceRemoteInfoMapper, DeviceRemoteInfo> implements DeviceRemoteInfoServiceInterface {
-    @Override
-    public Page<DeviceRemoteInfo> pagingQuery(DeviceRemoteInfoDto dto) {
-        Page<DeviceRemoteInfo> page = dto.getPage();
-        EntityWrapper wrapper=new EntityWrapper<DevicePath>();
-        wrapper.eq("i_status", OperationConstant.ZERO);
-        if(StringUtils.hasText(dto.getSerialNumber())){
-            wrapper.like("s_serialNumber",dto.getSerialNumber());
-        }
-        //排序
-        if (dto.getSortField() != null && dto.getSortOrder() != null){
-            wrapper.orderBy(dto.getSortField(),dto.getSortOrder().equals("asc"));
-        }else {
-            //  排序字段 时间降序
-            wrapper.orderBy("t_update_date",false);
-        }
-        Page<DeviceRemoteInfo> deviceRemoteInfoPage = this.selectPage(page,wrapper);
-        return deviceRemoteInfoPage;
-    }
-
-    @Override
-    public ResultBean<Boolean> add(DeviceRemoteInfoDto dto) {
-        boolean insert = this.insert(dto);
-        if(insert){
-            return new ResultBean<>(ResultEnum.SUCCESS, true);
-        }else{
-            return new ResultBean<>(ResultEnum.ERROR, false);
-        }
-    }
-
-    @Override
-    public ResultBean<Boolean> edit(DeviceRemoteInfo deviceRemoteInfo) {
-        boolean b = this.updateById(deviceRemoteInfo);
-        if(b){
-            return new ResultBean<>(ResultEnum.SUCCESS, true);
-        }else{
-            return new ResultBean<>(ResultEnum.ERROR, false);
-        }
-    }
-
-    @Override
-    public DeviceRemoteInfo findDeviceRemoteInfo(DeviceRemoteInfoDto dto) {
-        Wrapper<DeviceRemoteInfo> wrapper = new EntityWrapper<>();
-        wrapper.eq("i_status", OperationConstant.ZERO);
-        return this.selectOne(wrapper);
-    }
-
-    @Override
-    public DeviceRemoteInfo getBySerialNumber(String serialNumber) {
-        Wrapper<DeviceRemoteInfo> wrapper = new EntityWrapper<>();
-        wrapper.eq("s_serial_number", serialNumber);
-        return this.selectOne(wrapper);
-    }
-
-    @Override
-    public DeviceRemoteInfo getById(Long id) {
-        return this.selectById(id);
-    }
-
-    @Override
-    public ResultBean<Boolean> delete(DeviceRemoteInfoDto dto) {
-        Wrapper<DeviceRemoteInfo> wrapper = new EntityWrapper<>();
-        if(dto.getId() != null){
-            wrapper.eq("l_id", dto.getId());
-        }
-        if(StringUtils.hasText(dto.getSerialNumber())){
-            wrapper.eq("s_serialNumber", dto.getSerialNumber());
-        }
-        Integer delete = this.baseMapper.delete(wrapper);
-
-        if(delete > 0){
-            return new ResultBean<>(ResultEnum.SUCCESS, true);
-        }else{
-            return new ResultBean<>(ResultEnum.ERROR, false);
-        }
-    }
-}

sptg-device/sptg-device-biz/src/main/java/com/sptg/device/biz/service/impl/DeviceTemplateServiceImpl.java

@@ -1,118 +0,0 @@
-package com.sptg.device.biz.service.impl;
-
-import com.baomidou.mybatisplus.enums.SqlLike;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.sptg.common.core.beans.PageBean;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.common.core.beans.ResultEnum;
-import com.sptg.common.core.constant.OperationConstant;
-import com.sptg.device.api.dto.DeviceTemplateDto;
-import com.sptg.device.api.entity.DeviceTemplate;
-import com.sptg.device.biz.mapper.DeviceTemplateMapper;
-import com.sptg.device.biz.service.DeviceTemplateServiceInterface;
-import com.sptg.estate.api.dto.ResidentialDto;
-import com.sptg.estate.api.entity.Residential;
-import lombok.AllArgsConstructor;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.util.Assert;
-
-import java.util.Date;
-import java.util.List;
-
-@Service
-@AllArgsConstructor
-public class DeviceTemplateServiceImpl extends ServiceImpl<DeviceTemplateMapper, DeviceTemplate> implements DeviceTemplateServiceInterface {
-
-    @Override
-    public ResultBean<Page<DeviceTemplate>> pagingQuery(DeviceTemplateDto dto) {
-        Wrapper<DeviceTemplate> wrapper = new EntityWrapper<>();
-        wrapper.eq("i_status", OperationConstant.ZERO);
-        //排序
-        if (dto.getSortField() != null && dto.getSortOrder() != null){
-            wrapper.orderBy(dto.getSortField(),dto.getSortOrder().equals("asc"));
-        }else {
-            wrapper.orderBy("t_create_date",false);
-        }
-        return new ResultBean<>(ResultEnum.SUCCESS,this.selectPage(dto.getPage(),wrapper));
-    }
-
-    @Override
-    public ResultBean<Boolean> addDeviceTemplate(DeviceTemplateDto deviceTemplateDto) {
-        DeviceTemplate deviceTemplate = new DeviceTemplate();
-        deviceTemplate.setTypeCode(deviceTemplateDto.getTypeCode());
-        deviceTemplate.setDeviceFactory(deviceTemplateDto.getDeviceFactory());
-        List<DeviceTemplate> list = this.getListByCondition(deviceTemplateDto);
-        Assert.isTrue(list == null || list.size() == 0, "相同型号和厂家的模板配置已存在,请勿重复创建");
-        BeanUtils.copyProperties(deviceTemplateDto,deviceTemplate);
-        deviceTemplate.setCreateDate(new Date());
-        deviceTemplate.setStatus(OperationConstant.ZERO);
-        return new ResultBean<>(ResultEnum.SUCCESS,this.insert(deviceTemplate));
-    }
-
-    @Override
-    public ResultBean<Boolean> updateDeviceTemplate(DeviceTemplateDto deviceTemplateDto) {
-        DeviceTemplate deviceTemplate = this.selectById(deviceTemplateDto.getId());
-        Assert.notNull(deviceTemplate,"修改失败，该配置不存在");
-        BeanUtils.copyProperties(deviceTemplateDto,deviceTemplate);
-        deviceTemplate.setUpdateDate(new Date());
-        return new ResultBean<>(ResultEnum.SUCCESS,this.updateById(deviceTemplate));
-    }
-
-    @Override
-    public ResultBean<Boolean> deleteDeviceTemplate(DeviceTemplateDto deviceTemplateDto) {
-        DeviceTemplate deviceTemplate = this.selectById(deviceTemplateDto.getId());
-        Assert.notNull(deviceTemplate,"删除失败，该配置不存在");
-        deviceTemplate.setStatus(OperationConstant.MINUS_ONE);
-        return new ResultBean<>(ResultEnum.SUCCESS,this.updateById(deviceTemplate));
-    }
-
-    @Override
-    public DeviceTemplate getOne(DeviceTemplateDto deviceTemplateDto) {
-        Wrapper<DeviceTemplate> wrapper = new EntityWrapper<>();
-        wrapper.eq("i_status",OperationConstant.ZERO);
-        if (deviceTemplateDto.getDeviceFactory() != null){
-            wrapper.eq("s_device_factory",deviceTemplateDto.getDeviceFactory());
-        }
-        if (deviceTemplateDto.getTypeCode() != null){
-            wrapper.eq("s_type_code",deviceTemplateDto.getTypeCode());
-        }
-        return this.selectOne(wrapper) ;
-    }
-
-    @Override
-    public List<DeviceTemplate> getListByCondition(DeviceTemplateDto deviceTemplateDto) {
-        Wrapper<DeviceTemplate> wrapper = new EntityWrapper<>();
-        wrapper.eq("i_status",OperationConstant.ZERO);
-        if (StringUtils.isNotBlank(deviceTemplateDto.getDeviceFactory())){
-            wrapper.eq("s_device_factory",deviceTemplateDto.getDeviceFactory());
-        }
-        if (deviceTemplateDto.getTypeCode() != null){
-            wrapper.like("s_type_code",deviceTemplateDto.getTypeCode(), SqlLike.DEFAULT);
-        }
-        if (deviceTemplateDto.getIsSelect()){
-            wrapper.last("limit 10");
-        }
-        return this.selectList(wrapper);
-    }
-
-    @Override
-    public List<DeviceTemplate> getListByLikeTypeCode(DeviceTemplateDto deviceTemplateDto) {
-        Wrapper<DeviceTemplate> wrapper = new EntityWrapper<>();
-        wrapper.eq("i_status",OperationConstant.ZERO);
-        if (StringUtils.isNotBlank(deviceTemplateDto.getDeviceFactory())){
-            wrapper.eq("s_device_factory",deviceTemplateDto.getDeviceFactory());
-        }
-        if (deviceTemplateDto.getTypeCode() != null){
-            wrapper.like("s_type_code",deviceTemplateDto.getTypeCode(), SqlLike.DEFAULT);
-        }
-        if (deviceTemplateDto.getIsSelect()){
-            wrapper.last("limit 10");
-        }
-        return this.selectList(wrapper);
-    }
-}

sptg-device/sptg-device-biz/src/main/resources/mapper/DeviceRemoteInfoMapper.xml

@@ -1,34 +0,0 @@
-<?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.sptg.device.biz.mapper.DeviceRemoteInfoMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="baseResultMap" type="com.sptg.device.api.entity.DeviceRemoteInfo">
-        <id column="l_id" property="id"/>
-        <result column="s_serial_number" property="serialNumber"/>
-        <result column="s_face_threshold" property="faceThreshold"/>
-        <result column="s_live_detect" property="liveDetect"/>
-        <result column="s_timing_open_screen" property="timingOpenScreen"/>
-        <result column="s_remote_ip" property="remoteIp"/>
-        <result column="s_remote_port" property="remotePort"/>
-        <result column="s_disk_space_usage" property="diskSpaceUsage"/>
-        <result column="s_cpu_temperature" property="cpuTemperature"/>
-        <result column="s_imei" property="imei"/>
-        <result column="s_card_total" property="cardTotal"/>
-        <result column="s_face_total" property="faceTotal"/>
-        <result column="s_screen_brightness" property="screenBrightness"/>
-        <result column="s_restore_pkg_version" property="restorePkgVersion"/>
-        <result column="s_pkg_version" property="pkgVersion"/>
-        <result column="s_disable_info" property="disableInfo"/>
-        <result column="s_volume" property="volume"/>
-        <result column="i_status" property="status"/>
-        <result column="t_create_date" property="createDate"/>
-        <result column="t_update_date" property="updateDate"/>
-    </resultMap>
-
-    <select id="findDeviceRemoteInfo" resultMap="baseResultMap">
-        SELECT * FROM device_remote_info
-        WHERE i_status = 0
-         ${ew.sqlSegment} ORDER BY  t_update_date  DESC
-    </select>
-</mapper>

sptg-gateway/sptg-device-gateway/src/main/java/com/sptg/gateway/controller/DeviceController.java

@@ -11,7 +11,6 @@ import com.sptg.common.core.beans.ResultEnum;
 import com.sptg.common.core.constant.OperationConstant;
 import com.sptg.common.core.constant.UserFlagConstant;
 import com.sptg.common.core.util.JsonUtils;
-import com.sptg.device.api.dto.DeviceRemoteInfoDto;
 import com.sptg.device.api.entity.*;
 import com.sptg.device.api.feigns.*;
 import com.sptg.estate.api.dto.*;
@@ -28,8 +27,6 @@ import com.sptg.statistics.api.feigns.SysDeviceLogFeign;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
-import org.omg.CORBA.OBJ_ADAPTER;
-import org.springframework.beans.BeanUtils;
 import org.springframework.data.redis.core.HashOperations;
 import org.springframework.data.redis.core.ListOperations;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -64,7 +61,6 @@ public class DeviceController {
     private final DeviceLogFeign deviceLogFeign;
     private final DeviceRegisterFeign deviceRegisterFeign;
     private final SysDeviceLogFeign sysDeviceLogFeign;
-    private final DeviceRemoteInfoFeign deviceRemoteInfoFeign;
     private final FastFileStorageClient fastFileStorageClient;
     private final UserFeign userFeign;
     private final RedisTemplate<String, String> redisTemplate;
@@ -250,31 +246,31 @@ public class DeviceController {
      * @param deviceRemoteInfoDto
      * @return
      */
-    @PostMapping(value = "/device/remote/info/upload")
-    public ResultBean<Boolean> remoteInfoUpload(@RequestBody DeviceRemoteInfoDto deviceRemoteInfoDto){
-        Assert.notNull(deviceRemoteInfoDto.getSerialNumber(),"设备序列号不能为空");
-        ResultBean<Boolean> resultBean;
-        Date today = new Date();
-        DeviceRemoteInfo deviceRemoteInfo = this.deviceRemoteInfoFeign.getBySerialNumber(deviceRemoteInfoDto.getSerialNumber());
-        if(deviceRemoteInfo == null){
-            deviceRemoteInfoDto.setCreateDate(today);
-            deviceRemoteInfoDto.setUpdateDate(today);
-            deviceRemoteInfoDto.setStatus(OperationConstant.ZERO);
-            resultBean = this.deviceRemoteInfoFeign.add(deviceRemoteInfoDto);
-        }else{
-            deviceRemoteInfoDto.setId(deviceRemoteInfo.getId());
-            deviceRemoteInfoDto.setCreateDate(deviceRemoteInfo.getCreateDate());
-            deviceRemoteInfoDto.setUpdateDate(today);
-            deviceRemoteInfoDto.setStatus(deviceRemoteInfo.getStatus());
-            BeanUtils.copyProperties(deviceRemoteInfoDto, deviceRemoteInfo);
-            resultBean = this.deviceRemoteInfoFeign.edit(deviceRemoteInfo);
-        }
-        if(resultBean.getData()){
-            return new ResultBean<>(ResultEnum.SUCCESS, true);
-        }else{
-            return new ResultBean<>(ResultEnum.ERROR, false);
-        }
-    }
+//    @PostMapping(value = "/device/remote/info/upload")
+//    public ResultBean<Boolean> remoteInfoUpload(@RequestBody DeviceRemoteInfoDto deviceRemoteInfoDto){
+//        Assert.notNull(deviceRemoteInfoDto.getSerialNumber(),"设备序列号不能为空");
+//        ResultBean<Boolean> resultBean;
+//        Date today = new Date();
+//        DeviceRemoteInfo deviceRemoteInfo = this.deviceRemoteInfoFeign.getBySerialNumber(deviceRemoteInfoDto.getSerialNumber());
+//        if(deviceRemoteInfo == null){
+//            deviceRemoteInfoDto.setCreateDate(today);
+//            deviceRemoteInfoDto.setUpdateDate(today);
+//            deviceRemoteInfoDto.setStatus(OperationConstant.ZERO);
+//            resultBean = this.deviceRemoteInfoFeign.add(deviceRemoteInfoDto);
+//        }else{
+//            deviceRemoteInfoDto.setId(deviceRemoteInfo.getId());
+//            deviceRemoteInfoDto.setCreateDate(deviceRemoteInfo.getCreateDate());
+//            deviceRemoteInfoDto.setUpdateDate(today);
+//            deviceRemoteInfoDto.setStatus(deviceRemoteInfo.getStatus());
+//            BeanUtils.copyProperties(deviceRemoteInfoDto, deviceRemoteInfo);
+//            resultBean = this.deviceRemoteInfoFeign.edit(deviceRemoteInfo);
+//        }
+//        if(resultBean.getData()){
+//            return new ResultBean<>(ResultEnum.SUCCESS, true);
+//        }else{
+//            return new ResultBean<>(ResultEnum.ERROR, false);
+//        }
+//    }
 
     /**
      * 事件推送

sptg-gateway/sptg-housekeeper-gateway/src/main/java/com/sptg/gateway/controller/device/DeviceController.java

@@ -15,11 +15,7 @@ import com.sptg.common.security.service.SecurityServiceInterface;
 import com.sptg.device.api.constant.DeviceConstants;
 import com.sptg.device.api.constant.DeviceSecurityToken;
 import com.sptg.device.api.dto.DeviceDto;
-import com.sptg.device.api.dto.DeviceOptionsDto;
-import com.sptg.device.api.dto.DeviceTemplateDto;
 import com.sptg.device.api.entity.Device;
-import com.sptg.device.api.entity.DeviceOptions;
-import com.sptg.device.api.entity.DeviceTemplate;
 import com.sptg.device.api.entity.InstructPublishLog;
 import com.sptg.device.api.feigns.*;
 import com.sptg.device.api.stream.DeviceDeleteProduceInterface;
@@ -38,7 +34,6 @@ import com.sptg.statistics.api.feigns.SysOperationLogFeign;
 import feign.Param;
 import lombok.AllArgsConstructor;
 import org.apache.http.util.Asserts;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.support.MessageBuilder;
 import org.springframework.util.Assert;
@@ -48,7 +43,6 @@ import org.springframework.web.servlet.ModelAndView;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -67,8 +61,6 @@ public class DeviceController {
     private final SysOperationLogFeign sysOperationLogFeign;
     private final ResidentialFeign residentialFeign;
     private final InstructPublishLogFeign instructPublishLogFeign;
-    private final DeviceTemplateFeign deviceTemplateFeign;
-    private final DeviceOptionsFeign deviceOptionsFeign;
     private final AccessCardFeign accessCardFeign;
     private final MsgPublishFeign msgPublishFeign;
 
@@ -146,6 +138,8 @@ public class DeviceController {
         Assert.notNull(residential, "请填写正确的小区信息");
         Organization rootOrg = this.orgFeign.getOrgById(residential.getRootOrgId());
         Assert.notNull(rootOrg, "数据异常");
+        //默认设备厂商
+        dto.setDeviceFactory("ZONGHENG");
         //  设置小区名称
         dto.setXqName(residential.getName());
         dto.setOrgPosition(residential.getOrgPosition());
@@ -178,31 +172,31 @@ public class DeviceController {
             return resultBean;
         }else{
             //获取设备模板
-            DeviceTemplateDto deviceTemplateDto = new DeviceTemplateDto();
-            deviceTemplateDto.setTypeCode(dto.getDeviceModelNumber());
-            deviceTemplateDto.setDeviceFactory(dto.getDeviceFactory());
-            DeviceTemplate deviceTemplate = this.deviceTemplateFeign.getOne(deviceTemplateDto);
-            Assert.notNull(deviceTemplate, "没有与该设备型号匹配的配置模板");
-            dto.setHaveCard(deviceTemplate.getHaveCard());
-            dto.setHaveFace(deviceTemplate.getHaveFace());
-            dto.setHaveCall(deviceTemplate.getHaveCall());
-            dto.setHaveKeyboard(deviceTemplate.getHaveKeyboard());
-            dto.setHaveAd(deviceTemplate.getHaveAd());
-            dto.setReboot(deviceTemplate.getReboot());
-            dto.setSize(deviceTemplate.getSize());
-            dto.setOpenDoorPwd(deviceTemplate.getOpenDoorPwd());
-            if(StringUtils.hasText(deviceTemplate.getAdminPwd())){
-                dto.setAdminPwd(deviceTemplate.getAdminPwd());
-            }else{
-                dto.setAdminPwd("123456");
-            }
+//            DeviceTemplateDto deviceTemplateDto = new DeviceTemplateDto();
+//            deviceTemplateDto.setTypeCode(dto.getDeviceModelNumber());
+//            deviceTemplateDto.setDeviceFactory(dto.getDeviceFactory());
+//            DeviceTemplate deviceTemplate = this.deviceTemplateFeign.getOne(deviceTemplateDto);
+//            Assert.notNull(deviceTemplate, "没有与该设备型号匹配的配置模板");
+//            dto.setHaveCard(deviceTemplate.getHaveCard());
+//            dto.setHaveFace(deviceTemplate.getHaveFace());
+//            dto.setHaveCall(deviceTemplate.getHaveCall());
+//            dto.setHaveKeyboard(deviceTemplate.getHaveKeyboard());
+//            dto.setHaveAd(deviceTemplate.getHaveAd());
+//            dto.setReboot(deviceTemplate.getReboot());
+//            dto.setSize(deviceTemplate.getSize());
+//            dto.setOpenDoorPwd(deviceTemplate.getOpenDoorPwd());
+//            if(StringUtils.hasText(deviceTemplate.getAdminPwd())){
+//                dto.setAdminPwd(deviceTemplate.getAdminPwd());
+//            }else{
+//                dto.setAdminPwd("123456");
+//            }
             resultBean = this.deviceFeign.addEntity(dto);
-            Device device = this.deviceFeign.getEntityBySerialNumber(dto.getSerialNumber());
+//            Device device = this.deviceFeign.getEntityBySerialNumber(dto.getSerialNumber());
             //生成设备配置记录
-            DeviceOptionsDto deviceOptionsDto = this.generateOptions(deviceTemplate, device);
-            if (!this.deviceOptionsFeign.add(deviceOptionsDto)){
-                return new ResultBean<>(ResultEnum.PARAMETER_ANOMALY,false);
-            }
+//            DeviceOptionsDto deviceOptionsDto = this.generateOptions(deviceTemplate, device);
+//            if (!this.deviceOptionsFeign.add(deviceOptionsDto)){
+//                return new ResultBean<>(ResultEnum.PARAMETER_ANOMALY,false);
+//            }
         }
         if (null != resultBean.getData() && resultBean.getData()) {
             /*---------------------------------------------------记录日志--------------------------------------------------------*/
@@ -277,29 +271,29 @@ public class DeviceController {
         dto.setCreateAccountId(onLineUser.getId());
 //        dto.setOldOpenDoorPwd(dto.getOpenDoorPwd());
         //获取设备模板
-        DeviceTemplateDto deviceTemplateDto = new DeviceTemplateDto();
-        deviceTemplateDto.setTypeCode(dto.getDeviceModelNumber());
-        deviceTemplateDto.setDeviceFactory(dto.getDeviceFactory());
-        DeviceTemplate deviceTemplate = deviceTemplateFeign.getOne(deviceTemplateDto);
-        Assert.notNull(deviceTemplate, "没有与该设备型号匹配的配置模板");
-        dto.setHaveCard(deviceTemplate.getHaveCard());
-        dto.setHaveFace(deviceTemplate.getHaveFace());
-        dto.setHaveCall(deviceTemplate.getHaveCall());
-        dto.setReboot(deviceTemplate.getReboot());
-        dto.setHaveKeyboard(deviceTemplate.getHaveKeyboard());
-        dto.setHaveAd(deviceTemplate.getHaveAd());
-        dto.setSize(deviceTemplate.getSize());
-        dto.setOpenDoorPwd(deviceTemplate.getOpenDoorPwd());
-        if(StringUtils.hasText(deviceTemplate.getAdminPwd())){
-            dto.setAdminPwd(deviceTemplate.getAdminPwd());
-        }
+//        DeviceTemplateDto deviceTemplateDto = new DeviceTemplateDto();
+//        deviceTemplateDto.setTypeCode(dto.getDeviceModelNumber());
+//        deviceTemplateDto.setDeviceFactory(dto.getDeviceFactory());
+//        DeviceTemplate deviceTemplate = deviceTemplateFeign.getOne(deviceTemplateDto);
+//        Assert.notNull(deviceTemplate, "没有与该设备型号匹配的配置模板");
+//        dto.setHaveCard(deviceTemplate.getHaveCard());
+//        dto.setHaveFace(deviceTemplate.getHaveFace());
+//        dto.setHaveCall(deviceTemplate.getHaveCall());
+//        dto.setReboot(deviceTemplate.getReboot());
+//        dto.setHaveKeyboard(deviceTemplate.getHaveKeyboard());
+//        dto.setHaveAd(deviceTemplate.getHaveAd());
+//        dto.setSize(deviceTemplate.getSize());
+//        dto.setOpenDoorPwd(deviceTemplate.getOpenDoorPwd());
+//        if(StringUtils.hasText(deviceTemplate.getAdminPwd())){
+//            dto.setAdminPwd(deviceTemplate.getAdminPwd());
+//        }
         ResultBean<Boolean> resultBean = this.deviceFeign.completeEntity(dto);
-        Device device = this.deviceFeign.getEntityBySerialNumber(dto.getSerialNumber());
+//        Device device = this.deviceFeign.getEntityBySerialNumber(dto.getSerialNumber());
 		//生成设备配置记录
-        DeviceOptionsDto deviceOptionsDto = this.generateOptions(deviceTemplate, device);
-        if (!this.deviceOptionsFeign.add(deviceOptionsDto)) {
-            return new ResultBean<>(ResultEnum.PARAMETER_ANOMALY, false);
-        }
+//        DeviceOptionsDto deviceOptionsDto = this.generateOptions(deviceTemplate, device);
+//        if (!this.deviceOptionsFeign.add(deviceOptionsDto)) {
+//            return new ResultBean<>(ResultEnum.PARAMETER_ANOMALY, false);
+//        }
         if (null != resultBean.getData() && resultBean.getData()) {
 			/*---------------------------------------------------记录日志--------------------------------------------------------*/
             SysOperationLog sysOperationLog = new SysOperationLog(SysLogMenuConstant.DEVICE_INFO_MANAGE, SysLogConstant.ADD_EVENT,
@@ -356,22 +350,22 @@ public class DeviceController {
         name.append(dto.getInstallPath());
         dto.setName(name.toString());
         //获取设备模板
-        DeviceTemplateDto deviceTemplateDto = new DeviceTemplateDto();
-        deviceTemplateDto.setTypeCode(dto.getDeviceModelNumber());
-        deviceTemplateDto.setDeviceFactory(dto.getDeviceFactory());
-        DeviceTemplate deviceTemplate = deviceTemplateFeign.getOne(deviceTemplateDto);
-        Assert.notNull(deviceTemplate, "没有与该设备型号匹配的配置模板");
-        dto.setHaveCard(deviceTemplate.getHaveCard());
-        dto.setHaveFace(deviceTemplate.getHaveFace());
-        dto.setHaveCall(deviceTemplate.getHaveCall());
-        dto.setReboot(deviceTemplate.getReboot());
+//        DeviceTemplateDto deviceTemplateDto = new DeviceTemplateDto();
+//        deviceTemplateDto.setTypeCode(dto.getDeviceModelNumber());
+//        deviceTemplateDto.setDeviceFactory(dto.getDeviceFactory());
+//        DeviceTemplate deviceTemplate = deviceTemplateFeign.getOne(deviceTemplateDto);
+//        Assert.notNull(deviceTemplate, "没有与该设备型号匹配的配置模板");
+//        dto.setHaveCard(deviceTemplate.getHaveCard());
+//        dto.setHaveFace(deviceTemplate.getHaveFace());
+//        dto.setHaveCall(deviceTemplate.getHaveCall());
+//        dto.setReboot(deviceTemplate.getReboot());
         ResultBean<Boolean> resultBean=this.deviceFeign.relateEntity(dto);
-        Device device = this.deviceFeign.getEntityBySerialNumber(dto.getSerialNumber());
+//        Device device = this.deviceFeign.getEntityBySerialNumber(dto.getSerialNumber());
         //生成设备配置记录
-        DeviceOptionsDto deviceOptionsDto = this.generateOptions(deviceTemplate, device);
-        if (!this.deviceOptionsFeign.add(deviceOptionsDto)){
-            return new ResultBean<>(ResultEnum.PARAMETER_ANOMALY,false);
-        }
+//        DeviceOptionsDto deviceOptionsDto = this.generateOptions(deviceTemplate, device);
+//        if (!this.deviceOptionsFeign.add(deviceOptionsDto)){
+//            return new ResultBean<>(ResultEnum.PARAMETER_ANOMALY,false);
+//        }
         if(null!=resultBean.getData()&&resultBean.getData()){
             /*---------------------------------------------------记录日志--------------------------------------------------------*/
             Device newObj = this.deviceFeign.getEntityById(dto.getId());
@@ -390,20 +384,20 @@ public class DeviceController {
      * @param deviceTemplate 设备模板
      * @param deviceOptions  设备配置
      */
-    private void deviceSetOptions(DeviceTemplate deviceTemplate, DeviceOptions deviceOptions) {
-        deviceOptions.setCallVolume(deviceTemplate.getCallVolume());
-        deviceOptions.setAdVolume(deviceTemplate.getAdVolume());
-        deviceOptions.setScreenBrightness(deviceTemplate.getScreenBrightness());
-        deviceOptions.setDelay(deviceTemplate.getDelay());
-        deviceOptions.setIsShowUsername(deviceTemplate.getIsShowUsername());
-        deviceOptions.setFaceResolution(deviceTemplate.getFaceResolution());
-        deviceOptions.setFillLight(deviceTemplate.getFillLight());
-        deviceOptions.setLiveDetect(deviceTemplate.getLiveDetect());
-        deviceOptions.setDiscernBoxPosition(deviceTemplate.getDiscernBoxPosition());
-        deviceOptions.setPlayModel(deviceTemplate.getPlayModel());
-        deviceOptions.setOpenDoorPwd(deviceTemplate.getOpenDoorPwd());
-        deviceOptions.setAdminPwd(deviceTemplate.getAdminPwd());
-    }
+//    private void deviceSetOptions(DeviceTemplate deviceTemplate, DeviceOptions deviceOptions) {
+//        deviceOptions.setCallVolume(deviceTemplate.getCallVolume());
+//        deviceOptions.setAdVolume(deviceTemplate.getAdVolume());
+//        deviceOptions.setScreenBrightness(deviceTemplate.getScreenBrightness());
+//        deviceOptions.setDelay(deviceTemplate.getDelay());
+//        deviceOptions.setIsShowUsername(deviceTemplate.getIsShowUsername());
+//        deviceOptions.setFaceResolution(deviceTemplate.getFaceResolution());
+//        deviceOptions.setFillLight(deviceTemplate.getFillLight());
+//        deviceOptions.setLiveDetect(deviceTemplate.getLiveDetect());
+//        deviceOptions.setDiscernBoxPosition(deviceTemplate.getDiscernBoxPosition());
+//        deviceOptions.setPlayModel(deviceTemplate.getPlayModel());
+//        deviceOptions.setOpenDoorPwd(deviceTemplate.getOpenDoorPwd());
+//        deviceOptions.setAdminPwd(deviceTemplate.getAdminPwd());
+//    }
 
     /**
      * 生成设备配置记录
@@ -411,51 +405,51 @@ public class DeviceController {
      * @param device            设备
      * @return DeviceOptions
      */
-    private DeviceOptionsDto generateOptions(DeviceTemplate deviceTemplate, Device device){
-        DeviceOptionsDto deviceOptionsDto = new DeviceOptionsDto();
-        deviceOptionsDto.setStatus(OperationConstant.ZERO);
-        deviceOptionsDto.setUpdateDate(new Date());
-        //device
-        deviceOptionsDto.setDeviceId(device.getId());
-        deviceOptionsDto.setSerialNumber(device.getSerialNumber());
-        deviceOptionsDto.setTypeCode(device.getDeviceModelNumber());
-        deviceOptionsDto.setDeviceFactory(device.getDeviceFactory());
-        deviceOptionsDto.setTimeStrategyIsEnable(device.getTimeStrategyIsEnable());
-        //deviceTemplate
-        deviceOptionsDto.setCallVolume(deviceTemplate.getCallVolume());
-        deviceOptionsDto.setAdVolume(deviceTemplate.getAdVolume());
-        deviceOptionsDto.setScreenBrightness(deviceTemplate.getScreenBrightness());
-        deviceOptionsDto.setFillLight(deviceTemplate.getFillLight());
-        deviceOptionsDto.setFaceResolution(deviceTemplate.getFaceResolution());
-        deviceOptionsDto.setDelay(deviceTemplate.getDelay());
-        deviceOptionsDto.setIsShowUsername(deviceTemplate.getIsShowUsername());
-        deviceOptionsDto.setLiveDetect(deviceTemplate.getLiveDetect());
-        deviceOptionsDto.setDiscernBoxPosition(deviceTemplate.getDiscernBoxPosition());
-        deviceOptionsDto.setPlayModel(deviceTemplate.getPlayModel());
-        deviceOptionsDto.setOpenDoorPwd(deviceTemplate.getOpenDoorPwd());
-        deviceOptionsDto.setAdminPwd(deviceTemplate.getAdminPwd());
-        //设备配置功能
-        deviceOptionsDto.setCardOpenDoor(OperationConstant.ONE);
-        deviceOptionsDto.setFaceOpenDoor(OperationConstant.ONE);
-        deviceOptionsDto.setPwdOpenDoor(OperationConstant.ONE);
-        deviceOptionsDto.setRemoteOpenDoor(OperationConstant.ONE);
-        deviceOptionsDto.setKeyboard(OperationConstant.ONE);
-        deviceOptionsDto.setAdPlay(OperationConstant.ONE);
-        if(device.getHaveCard() != OperationConstant.ONE){
-            deviceOptionsDto.setCardOpenDoor(OperationConstant.TWO);
-        }
-        if(device.getHaveFace() != OperationConstant.ONE){
-            deviceOptionsDto.setFaceOpenDoor(OperationConstant.TWO);
-        }
-        if(device.getHaveKeyboard() != OperationConstant.ONE){
-            deviceOptionsDto.setPwdOpenDoor(OperationConstant.TWO);
-            deviceOptionsDto.setKeyboard(OperationConstant.TWO);
-        }
-        if(device.getHaveAd() != OperationConstant.ONE){
-            deviceOptionsDto.setAdPlay(OperationConstant.TWO);
-        }
-        return deviceOptionsDto;
-    }
+//    private DeviceOptionsDto generateOptions(DeviceTemplate deviceTemplate, Device device){
+//        DeviceOptionsDto deviceOptionsDto = new DeviceOptionsDto();
+//        deviceOptionsDto.setStatus(OperationConstant.ZERO);
+//        deviceOptionsDto.setUpdateDate(new Date());
+//        //device
+//        deviceOptionsDto.setDeviceId(device.getId());
+//        deviceOptionsDto.setSerialNumber(device.getSerialNumber());
+//        deviceOptionsDto.setTypeCode(device.getDeviceModelNumber());
+//        deviceOptionsDto.setDeviceFactory(device.getDeviceFactory());
+//        deviceOptionsDto.setTimeStrategyIsEnable(device.getTimeStrategyIsEnable());
+//        //deviceTemplate
+//        deviceOptionsDto.setCallVolume(deviceTemplate.getCallVolume());
+//        deviceOptionsDto.setAdVolume(deviceTemplate.getAdVolume());
+//        deviceOptionsDto.setScreenBrightness(deviceTemplate.getScreenBrightness());
+//        deviceOptionsDto.setFillLight(deviceTemplate.getFillLight());
+//        deviceOptionsDto.setFaceResolution(deviceTemplate.getFaceResolution());
+//        deviceOptionsDto.setDelay(deviceTemplate.getDelay());
+//        deviceOptionsDto.setIsShowUsername(deviceTemplate.getIsShowUsername());
+//        deviceOptionsDto.setLiveDetect(deviceTemplate.getLiveDetect());
+//        deviceOptionsDto.setDiscernBoxPosition(deviceTemplate.getDiscernBoxPosition());
+//        deviceOptionsDto.setPlayModel(deviceTemplate.getPlayModel());
+//        deviceOptionsDto.setOpenDoorPwd(deviceTemplate.getOpenDoorPwd());
+//        deviceOptionsDto.setAdminPwd(deviceTemplate.getAdminPwd());
+//        //设备配置功能
+//        deviceOptionsDto.setCardOpenDoor(OperationConstant.ONE);
+//        deviceOptionsDto.setFaceOpenDoor(OperationConstant.ONE);
+//        deviceOptionsDto.setPwdOpenDoor(OperationConstant.ONE);
+//        deviceOptionsDto.setRemoteOpenDoor(OperationConstant.ONE);
+//        deviceOptionsDto.setKeyboard(OperationConstant.ONE);
+//        deviceOptionsDto.setAdPlay(OperationConstant.ONE);
+//        if(device.getHaveCard() != OperationConstant.ONE){
+//            deviceOptionsDto.setCardOpenDoor(OperationConstant.TWO);
+//        }
+//        if(device.getHaveFace() != OperationConstant.ONE){
+//            deviceOptionsDto.setFaceOpenDoor(OperationConstant.TWO);
+//        }
+//        if(device.getHaveKeyboard() != OperationConstant.ONE){
+//            deviceOptionsDto.setPwdOpenDoor(OperationConstant.TWO);
+//            deviceOptionsDto.setKeyboard(OperationConstant.TWO);
+//        }
+//        if(device.getHaveAd() != OperationConstant.ONE){
+//            deviceOptionsDto.setAdPlay(OperationConstant.TWO);
+//        }
+//        return deviceOptionsDto;
+//    }
 
     /**
      * 功能描述: 获取设备信息

sptg-gateway/sptg-housekeeper-gateway/src/main/java/com/sptg/gateway/controller/device/DeviceOptionsController.java

@@ -1,44 +0,0 @@
-package com.sptg.gateway.controller.device;
-
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.common.core.beans.ResultEnum;
-import com.sptg.common.security.annotation.Security;
-import com.sptg.common.security.enums.DataFormatEnum;
-import com.sptg.device.api.constant.DeviceSecurityToken;
-import com.sptg.device.api.dto.DeviceOptionsDto;
-import com.sptg.device.api.entity.DeviceOptions;
-import com.sptg.device.api.feigns.DeviceOptionsFeign;
-import lombok.AllArgsConstructor;
-import org.springframework.util.Assert;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-
-@RestController
-@AllArgsConstructor
-public class DeviceOptionsController {
-    private final DeviceOptionsFeign deviceOptionsFeign;
-
-    @PostMapping(value = "/device/options/add")
-    @Security(token = DeviceSecurityToken.DEVICE_INFO_UPDATE,format = DataFormatEnum.JSON)
-    public ResultBean<Boolean> add(DeviceOptionsDto deviceOptionsDto){
-        return new ResultBean<>(ResultEnum.SUCCESS,this.deviceOptionsFeign.add(deviceOptionsDto));
-    }
-
-    @PostMapping(value = "/device/options/edit")
-    @Security(token = DeviceSecurityToken.DEVICE_INFO_UPDATE,format = DataFormatEnum.JSON)
-    public ResultBean<Boolean> update(DeviceOptionsDto deviceOptionsDto){
-        return new ResultBean<>(ResultEnum.SUCCESS,this.deviceOptionsFeign.edit(deviceOptionsDto));
-    }
-
-    @GetMapping(value = "/device/options/getByDeviceId/{deviceId}")
-    public ResultBean<DeviceOptions> getByDeviceId(@PathVariable(value = "deviceId") Long deviceId){
-        if (deviceId == null){
-            return new ResultBean<>(ResultEnum.NOT_FIND);
-        }
-        DeviceOptions deviceOptions = this.deviceOptionsFeign.getByDeviceId(deviceId);
-        return new ResultBean<>(ResultEnum.SUCCESS,deviceOptions);
-    }
-}

sptg-gateway/sptg-housekeeper-gateway/src/main/java/com/sptg/gateway/controller/device/DeviceRemoteInfoController.java

@@ -1,23 +0,0 @@
-package com.sptg.gateway.controller.device;
-
-
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.common.core.beans.ResultEnum;
-import com.sptg.device.api.entity.DeviceRemoteInfo;
-import com.sptg.device.api.feigns.DeviceRemoteInfoFeign;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@AllArgsConstructor
-public class DeviceRemoteInfoController {
-
-    private final DeviceRemoteInfoFeign deviceRemoteInfoFeign;
-
-    @GetMapping(value = "/deviceRemoteInfo/getEntityBySerialNumber/{serialNumber}")
-    public ResultBean<DeviceRemoteInfo> getEntityBySerialNumber(@PathVariable(value = "serialNumber") String serialNumber){
-        return new ResultBean<>(ResultEnum.SUCCESS,this.deviceRemoteInfoFeign.getBySerialNumber(serialNumber));
-    }
-}

sptg-gateway/sptg-housekeeper-gateway/src/main/java/com/sptg/gateway/controller/device/DeviceTemplateController.java

@@ -1,144 +0,0 @@
-package com.sptg.gateway.controller.device;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.common.core.beans.ResultEnum;
-import com.sptg.common.core.constant.SysLogConstant;
-import com.sptg.common.core.util.WebUtils;
-import com.sptg.common.security.annotation.Security;
-import com.sptg.common.security.enums.DataFormatEnum;
-import com.sptg.common.security.service.SecurityServiceInterface;
-import com.sptg.device.api.constant.DeviceSecurityToken;
-import com.sptg.device.api.dto.DeviceTemplateDto;
-import com.sptg.device.api.entity.DeviceTemplate;
-import com.sptg.device.api.feigns.DeviceTemplateFeign;
-import com.sptg.permissions.api.entity.Account;
-import com.sptg.statistics.api.constant.SysLogMenuConstant;
-import com.sptg.statistics.api.entity.SysOperationLog;
-import com.sptg.statistics.api.feigns.SysOperationLogFeign;
-import lombok.AllArgsConstructor;
-import org.springframework.util.Assert;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.servlet.ModelAndView;
-
-import java.util.List;
-
-@RestController
-@AllArgsConstructor
-public class DeviceTemplateController {
-    private final DeviceTemplateFeign deviceTemplateFeign;
-    private final SecurityServiceInterface<Account> securityServiceInterface;
-    private final SysOperationLogFeign sysOperationLogFeign;
-
-
-
-    @GetMapping(value = "/deviceTemplate/manage")
-    @Security(token = DeviceSecurityToken.DEVICE_TEMPLATE_MANAGE,format = DataFormatEnum.JSON)
-    public ModelAndView deviceTemplateManage(){
-        return new ModelAndView("device/device-template-manage");
-    }
-
-    @GetMapping(value = "/deviceTemplate/add")
-    @Security(token = DeviceSecurityToken.DEVICE_TEMPLATE_ADD,format = DataFormatEnum.JSON)
-    public ModelAndView add(){
-        return new ModelAndView("device/device-template-add");
-    }
-
-    @GetMapping(value = "/deviceTemplate/edit/{id}")
-    @Security(token = DeviceSecurityToken.DEVICE_TEMPLATE_UPDATE,format = DataFormatEnum.JSON)
-    public ModelAndView edit(@PathVariable Long id){
-        ModelAndView modelAndView = new ModelAndView("device/device-template-edit");
-        DeviceTemplate deviceTemplate = this.deviceTemplateFeign.getOneById(id);
-        Assert.notNull(deviceTemplate,"该记录不存在");
-        modelAndView.addObject("deviceTemplate",deviceTemplate);
-        return modelAndView;
-    }
-
-    @PostMapping(value = "/deviceTemplate/manage/pagingQuery")
-    @Security(token = DeviceSecurityToken.DEVICE_TEMPLATE_MANAGE,format = DataFormatEnum.JSON)
-    public ResultBean<Page<DeviceTemplate>> pagingQuery(DeviceTemplateDto deviceTemplateDto, Page<DeviceTemplate> page){
-        deviceTemplateDto.setPage(page);
-        return this.deviceTemplateFeign.pagingQuery(deviceTemplateDto);
-    }
-
-    @PostMapping(value = "/deviceTemplate/manage/addDeviceTemplate")
-    @Security(token = DeviceSecurityToken.DEVICE_TEMPLATE_ADD,format = DataFormatEnum.JSON)
-    public ResultBean<Boolean> addDeviceTemplate(DeviceTemplateDto deviceTemplateDto){
-        Account onLineUser = this.securityServiceInterface.getOnLineUser();
-        ResultBean<Boolean> resultBean = this.deviceTemplateFeign.addDeviceTemplate(deviceTemplateDto);
-        if(null!=resultBean.getData()&&resultBean.getData()){
-            /*---------------------------------------------------记录日志--------------------------------------------------------*/
-            SysOperationLog sysOperationLog=new SysOperationLog(SysLogMenuConstant.DEVICE_TEMPLATE_MANAGE, SysLogConstant.ADD_EVENT,
-                    WebUtils.getIp(),deviceTemplateDto,onLineUser,deviceTemplateDto);
-            sysOperationLogFeign.info(sysOperationLog);
-            /*-------------------------------------------------------------------------------------------------------------------*/
-        }
-        return resultBean;
-    }
-
-    @PostMapping(value = "/deviceTemplate/manage/updateDeviceTemplate")
-    @Security(token = DeviceSecurityToken.DEVICE_TEMPLATE_UPDATE,format = DataFormatEnum.JSON)
-    public ResultBean<Boolean> updateDeviceTemplate(DeviceTemplateDto deviceTemplateDto){
-        DeviceTemplate oldObj = this.deviceTemplateFeign.getOneById(deviceTemplateDto.getId());
-        Account onLineUser = this.securityServiceInterface.getOnLineUser();
-        ResultBean<Boolean> resultBean = this.deviceTemplateFeign.updateDeviceTemplate(deviceTemplateDto);
-        if(null!=resultBean.getData()&&resultBean.getData()){
-            /*---------------------------------------------------记录日志--------------------------------------------------------*/
-            DeviceTemplate newObj = this.deviceTemplateFeign.getOneById(deviceTemplateDto.getId());
-            SysOperationLog sysOperationLog=new SysOperationLog(SysLogMenuConstant.DEVICE_TEMPLATE_MANAGE, SysLogConstant.ALTER_EVENT,
-                    WebUtils.getIp(),deviceTemplateDto,onLineUser,oldObj,newObj);
-            sysOperationLogFeign.info(sysOperationLog);
-            /*-------------------------------------------------------------------------------------------------------------------*/
-        }
-        return resultBean;
-    }
-
-    @PostMapping(value = "/deviceTemplate/manage/deleteDeviceTemplate")
-    @Security(token = DeviceSecurityToken.DEVICE_TEMPLATE_DELETE,format = DataFormatEnum.JSON)
-    public ResultBean<Boolean> deleteDeviceTemplate(DeviceTemplateDto deviceTemplateDto){
-        DeviceTemplate oldObj = this.deviceTemplateFeign.getOneById(deviceTemplateDto.getId());
-        Account onLineUser = this.securityServiceInterface.getOnLineUser();
-        ResultBean<Boolean> resultBean = this.deviceTemplateFeign.deleteDeviceTemplate(deviceTemplateDto);
-        if(null!=resultBean.getData()&&resultBean.getData()){
-            /*---------------------------------------------------记录日志--------------------------------------------------------*/
-            SysOperationLog sysOperationLog=new SysOperationLog(SysLogMenuConstant.DEVICE_TEMPLATE_MANAGE, SysLogConstant.DELETE_EVENT,
-                    WebUtils.getIp(),deviceTemplateDto,onLineUser,oldObj);
-            sysOperationLogFeign.info(sysOperationLog);
-            /*-------------------------------------------------------------------------------------------------------------------*/
-        }
-        return resultBean;
-    }
-
-    @GetMapping(value = "/deviceTemplate/manage/getOne")
-    @Security(token = DeviceSecurityToken.DEVICE_TEMPLATE_MANAGE,format = DataFormatEnum.JSON)
-    public DeviceTemplate getOne(DeviceTemplateDto deviceTemplateDto){
-        return this.deviceTemplateFeign.getOne(deviceTemplateDto);
-    }
-
-    @GetMapping(value = "/deviceTemplate/manage/getOneById/{id}")
-    @Security(token = DeviceSecurityToken.DEVICE_TEMPLATE_MANAGE,format = DataFormatEnum.JSON)
-    public DeviceTemplate getOne(@PathVariable(value = "id") Long id){
-        return this.deviceTemplateFeign.getOneById(id);
-    }
-
-    @GetMapping(value = "/deviceTemplate/manage/getListByCondition")
-    @Security(token = DeviceSecurityToken.DEVICE_TEMPLATE_MANAGE,format = DataFormatEnum.JSON)
-    public List<DeviceTemplate> getListByCondition(DeviceTemplateDto deviceTemplateDto){
-        return this.deviceTemplateFeign.getListByCondition(deviceTemplateDto);
-    }
-
-    /**
-     * 功能描述: 根据设备型号模糊查询
-     * @param deviceTemplateDto
-     * @return ResultBean<Organization>
-     *
-     */
-    @GetMapping(value = "/deviceTemplate/manage/getListByLikeTypeCode")
-    @Security(token = DeviceSecurityToken.DEVICE_TEMPLATE_MANAGE, format = DataFormatEnum.JSON)
-    public ResultBean<DeviceTemplate> getListByLikeName(DeviceTemplateDto deviceTemplateDto){
-        return new ResultBean<>(ResultEnum.SUCCESS,this.deviceTemplateFeign.getListByLikeTypeCode(deviceTemplateDto));
-    }
-}

sptg-gateway/sptg-housekeeper-gateway/src/main/java/com/sptg/gateway/controller/device/DeviceViewController.java

@@ -7,7 +7,6 @@ import com.sptg.device.api.entity.*;
 import com.sptg.device.api.feigns.*;
 import com.sptg.permissions.api.entity.Account;
 import lombok.AllArgsConstructor;
-import org.apache.commons.lang.StringUtils;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Controller;
 import org.springframework.util.Assert;
@@ -30,8 +29,6 @@ public class DeviceViewController {
     private final SecurityServiceInterface<Account> securityServiceInterface;
     private final FlowCardFeign flowCardFeign;
     private final DeviceFeign deviceFeign;
-    private final DeviceOptionsFeign deviceOptionsFeign;
-    private final DeviceRemoteInfoFeign deviceRemoteInfoFeign;
 
     @GetMapping(value = "/device/instruct/log")
     @Security(token = DeviceSecurityToken.DEVICE_INFO_MANAGE)
@@ -92,18 +89,18 @@ public class DeviceViewController {
     public ModelAndView editDevice(@PathVariable(value = "id")Long id){
         ModelAndView modelAndView = new ModelAndView("device/device-edit");
         Device device = this.deviceFeign.getEntityById(id);
-        DeviceOptions deviceOptions = this.deviceOptionsFeign.getByDeviceId(id);
+//        DeviceOptions deviceOptions = this.deviceOptionsFeign.getByDeviceId(id);
         modelAndView.addObject("device",device);
-        if (deviceOptions != null){
-            modelAndView.addObject("deviceOptions",deviceOptions);
-            if (deviceOptions.getFaceOpenDoor() == 1 && deviceOptions.getCardOpenDoor() == 1 && deviceOptions.getRemoteOpenDoor() == 1 && deviceOptions.getPwdOpenDoor() == 1 && deviceOptions.getKeyboard() == 1 && deviceOptions.getAdPlay() == 1){
-                modelAndView.addObject("all",1);
-            }else if (deviceOptions.getFaceOpenDoor() == 2 && deviceOptions.getCardOpenDoor() == 2 && deviceOptions.getRemoteOpenDoor() == 2 && deviceOptions.getPwdOpenDoor() == 2 && deviceOptions.getKeyboard() == 2 && deviceOptions.getAdPlay() == 2){
-                modelAndView.addObject("all",2);
-            }else {
-                modelAndView.addObject("all",0);
-            }
-        }
+//        if (deviceOptions != null){
+//            modelAndView.addObject("deviceOptions",deviceOptions);
+//            if (deviceOptions.getFaceOpenDoor() == 1 && deviceOptions.getCardOpenDoor() == 1 && deviceOptions.getRemoteOpenDoor() == 1 && deviceOptions.getPwdOpenDoor() == 1 && deviceOptions.getKeyboard() == 1 && deviceOptions.getAdPlay() == 1){
+//                modelAndView.addObject("all",1);
+//            }else if (deviceOptions.getFaceOpenDoor() == 2 && deviceOptions.getCardOpenDoor() == 2 && deviceOptions.getRemoteOpenDoor() == 2 && deviceOptions.getPwdOpenDoor() == 2 && deviceOptions.getKeyboard() == 2 && deviceOptions.getAdPlay() == 2){
+//                modelAndView.addObject("all",2);
+//            }else {
+//                modelAndView.addObject("all",0);
+//            }
+//        }
         return modelAndView;
     }
     @GetMapping(value = "/device/manage/complete/{id}")
@@ -148,16 +145,16 @@ public class DeviceViewController {
      * typeCode 设备型号
      * @return ModelAndView
      */
-    @GetMapping(value = "/device/manage/batch/selectUpgrade/{deviceFactory}/{deviceModelNumber}")
-    @Security(token = DeviceSecurityToken.DEVICE_INFO_BATCH_UPDATE)
-    public ModelAndView selectUpgrade(@PathVariable(value = "deviceFactory") String deviceFactory, @PathVariable(value = "deviceModelNumber") String deviceModelNumber){
-        Assert.notNull(deviceFactory,"设备厂商不能为空");
-        Assert.notNull(deviceModelNumber,"设备型号不能为空");
-        ModelAndView modelAndView = new ModelAndView("device/device-select-version-upgrade");
-        modelAndView.addObject("deviceFactory",deviceFactory);
-        modelAndView.addObject("deviceModelNumber",deviceModelNumber);
-        return modelAndView;
-    }
+//    @GetMapping(value = "/device/manage/batch/selectUpgrade/{deviceFactory}/{deviceModelNumber}")
+//    @Security(token = DeviceSecurityToken.DEVICE_INFO_BATCH_UPDATE)
+//    public ModelAndView selectUpgrade(@PathVariable(value = "deviceFactory") String deviceFactory, @PathVariable(value = "deviceModelNumber") String deviceModelNumber){
+//        Assert.notNull(deviceFactory,"设备厂商不能为空");
+//        Assert.notNull(deviceModelNumber,"设备型号不能为空");
+//        ModelAndView modelAndView = new ModelAndView("device/device-select-version-upgrade");
+//        modelAndView.addObject("deviceFactory",deviceFactory);
+//        modelAndView.addObject("deviceModelNumber",deviceModelNumber);
+//        return modelAndView;
+//    }
 
     /**
      * 功能描述: 设备详情页面
@@ -178,10 +175,10 @@ public class DeviceViewController {
         }
         modelAndView.addObject("id",id);
         modelAndView.addObject("device",device);
-        DeviceRemoteInfo deviceRemoteInfo = this.deviceRemoteInfoFeign.getBySerialNumber(device.getSerialNumber());
-        if (deviceRemoteInfo != null){
-            modelAndView.addObject("deviceRemoteInfo",deviceRemoteInfo);
-        }
+//        DeviceRemoteInfo deviceRemoteInfo = this.deviceRemoteInfoFeign.getBySerialNumber(device.getSerialNumber());
+//        if (deviceRemoteInfo != null){
+//            modelAndView.addObject("deviceRemoteInfo",deviceRemoteInfo);
+//        }
         return modelAndView;
     }
 
@@ -230,11 +227,11 @@ public class DeviceViewController {
      *
      *
      */
-    @GetMapping(value = "/device/flowCard/manage/index")
-    @Security(token = DeviceSecurityToken.DEVICE_FLOWCARD_MANAGE)
-    public ModelAndView deviceFlowCardManage(){
-        return new ModelAndView("device/device-flowcard-manage");
-    }
+//    @GetMapping(value = "/device/flowCard/manage/index")
+//    @Security(token = DeviceSecurityToken.DEVICE_FLOWCARD_MANAGE)
+//    public ModelAndView deviceFlowCardManage(){
+//        return new ModelAndView("device/device-flowcard-manage");
+//    }
 
     /**
      * 功能描述:添加流量卡页面
@@ -242,11 +239,11 @@ public class DeviceViewController {
      *
      *
      */
-    @GetMapping(value = "/device/flowCard/add")
-    @Security(token = DeviceSecurityToken.DEVICE_FLOWCARD_ADD)
-    public ModelAndView addFlowCard(){
-        return new ModelAndView("device/device-flowcard-add");
-    }
+//    @GetMapping(value = "/device/flowCard/add")
+//    @Security(token = DeviceSecurityToken.DEVICE_FLOWCARD_ADD)
+//    public ModelAndView addFlowCard(){
+//        return new ModelAndView("device/device-flowcard-add");
+//    }
 
     /**
      * 功能描述:修改流量卡页面
@@ -254,17 +251,17 @@ public class DeviceViewController {
      *
      *
      */
-    @GetMapping(value = "/device/flowCard/edit/{id}")
-    @Security(token = DeviceSecurityToken.DEVICE_FLOWCARD_UPDATE)
-    public ModelAndView edit(@PathVariable(value = "id")Long id){
-        FlowCard flowCard = flowCardFeign.getById(id);
-        if (flowCard == null){
-            return new ModelAndView("common/404");
-        }
-        ModelAndView modelAndView = new ModelAndView("device/device-flowcard-edit");
-        modelAndView.addObject("flowCard",flowCard);
-        return modelAndView;
-    }
+//    @GetMapping(value = "/device/flowCard/edit/{id}")
+//    @Security(token = DeviceSecurityToken.DEVICE_FLOWCARD_UPDATE)
+//    public ModelAndView edit(@PathVariable(value = "id")Long id){
+//        FlowCard flowCard = flowCardFeign.getById(id);
+//        if (flowCard == null){
+//            return new ModelAndView("common/404");
+//        }
+//        ModelAndView modelAndView = new ModelAndView("device/device-flowcard-edit");
+//        modelAndView.addObject("flowCard",flowCard);
+//        return modelAndView;
+//    }
 
     /**
      * 功能描述:流量卡绑定页面
@@ -272,36 +269,36 @@ public class DeviceViewController {
      *
      *
      */
-    @GetMapping(value = "/device/flowCard/bind/{id}")
-    @Security(token = DeviceSecurityToken.DEVICE_FLOWCARD_BIND)
-    public ModelAndView bind(@PathVariable(value = "id")Long id){
-        FlowCard flowCard = this.flowCardFeign.getById(id);
-        if (flowCard == null){
-            return new ModelAndView("common/404");
-        }
-
-        ModelAndView modelAndView = new ModelAndView("device/device-flowcard-bind");
-        modelAndView.addObject("id",id);
-        modelAndView.addObject("orgId",flowCard.getOrgId());
-        return modelAndView;
-    }
+//    @GetMapping(value = "/device/flowCard/bind/{id}")
+//    @Security(token = DeviceSecurityToken.DEVICE_FLOWCARD_BIND)
+//    public ModelAndView bind(@PathVariable(value = "id")Long id){
+//        FlowCard flowCard = this.flowCardFeign.getById(id);
+//        if (flowCard == null){
+//            return new ModelAndView("common/404");
+//        }
+//
+//        ModelAndView modelAndView = new ModelAndView("device/device-flowcard-bind");
+//        modelAndView.addObject("id",id);
+//        modelAndView.addObject("orgId",flowCard.getOrgId());
+//        return modelAndView;
+//    }
     /**
      * 功能描述:设备绑定流量卡页面
      * @return ModelAndView
      *
      *
      */
-    @GetMapping(value = "/device/flowCard/device/bind/{id}")
-    @Security(token = DeviceSecurityToken.DEVICE_FLOWCARD_MANAGE)
-    public ModelAndView FlowCardBind(@PathVariable(value = "id")Long id){
-        Device device = this.deviceFeign.getEntityById(id);
-        if (device == null){
-            return new ModelAndView("common/404");
-        }
-        ModelAndView modelAndView = new ModelAndView("device/flow-card-bind");
-        modelAndView.addObject("device",device);
-        return modelAndView;
-    }
+//    @GetMapping(value = "/device/flowCard/device/bind/{id}")
+//    @Security(token = DeviceSecurityToken.DEVICE_FLOWCARD_MANAGE)
+//    public ModelAndView FlowCardBind(@PathVariable(value = "id")Long id){
+//        Device device = this.deviceFeign.getEntityById(id);
+//        if (device == null){
+//            return new ModelAndView("common/404");
+//        }
+//        ModelAndView modelAndView = new ModelAndView("device/flow-card-bind");
+//        modelAndView.addObject("device",device);
+//        return modelAndView;
+//    }
 
     /**
      * 功能描述:设备升级页面

sptg-gateway/sptg-housekeeper-gateway/src/main/resources/static/js/device/device-add.js

@@ -37,7 +37,7 @@ layui.extend({
     var $node = {
         //  取消按钮
         resetBtn        :   $('button[type="reset"]'),
-        deviceFactoryInput  :   $('input[name="deviceFactory"]'),
+        // deviceFactoryInput  :   $('input[name="deviceFactory"]'),
         deviceModelNumberInput  :   $('input[name="deviceModelNumber"]'),
         serialNumberInput   :   $('input[name="serialNumber"]'),
     };
@@ -48,99 +48,99 @@ layui.extend({
         flag : $('#flag').val()
     };
 
-    if ($node.deviceFactoryInput.val() === undefined){
-        $.ajax({
-            type: 'GET',
-            url: '/permissions/dict/getByCode/deviceFactory',
-            success: function (result) {
-                deviceFactoryDict.update({data:result.list})
-            },
-        });
-        var deviceFactoryDict = xmSelect.render({
-            el: '#factory',
-            name: 'deviceFactory',
-            layVerify: 'required',
-            radio: true,
-            clickClose: true,
-            prop: {
-                name: 'dictValue',
-                value: 'dictKey',
-            },
-            on: function (data) {
-                deviceModelNumberSelect.update({data : initDeviceTemplateFn(data),disabled: false});
-            },
-            model: {
-                label: {
-                    type: 'text',
-                    text: {
-                        left: '',
-                        right: '',
-                        separator: ', ',
-                    },
-                }
-            },
-        });
+    // if ($node.deviceFactoryInput.val() === undefined){
+    //     $.ajax({
+    //         type: 'GET',
+    //         url: '/permissions/dict/getByCode/deviceFactory',
+    //         success: function (result) {
+    //             deviceFactoryDict.update({data:result.list})
+    //         },
+    //     });
+    //     var deviceFactoryDict = xmSelect.render({
+    //         el: '#factory',
+    //         name: 'deviceFactory',
+    //         layVerify: 'required',
+    //         radio: true,
+    //         clickClose: true,
+    //         prop: {
+    //             name: 'dictValue',
+    //             value: 'dictKey',
+    //         },
+    //         on: function (data) {
+    //             deviceModelNumberSelect.update({data : initDeviceTemplateFn(data),disabled: false});
+    //         },
+    //         model: {
+    //             label: {
+    //                 type: 'text',
+    //                 text: {
+    //                     left: '',
+    //                     right: '',
+    //                     separator: ', ',
+    //                 },
+    //             }
+    //         },
+    //     });
     //设备型号下拉
-    var deviceModelNumberSelect = xmSelect.render({
-        el:'#device_model_number',
-        name:'deviceModelNumber',
-        tips:'请先选择设备厂商',
-        empty:'暂时没有该设备厂商的设备配置与型号，请先添加该设备厂商的设备配置',
-        disabled:true,
-        radio: true,
-        prop: {
-            name: 'typeCode',
-            value: 'typeCode'
-        },
-        clickClose: true,
-        filterable: true,
-        remoteSearch: true,
-        remoteMethod:function (val,cb,show) {
-            $.ajax({
-                type: 'GET',
-                url: '/deviceTemplate/manage/getListByLikeTypeCode',
-                data: {
-                        deviceFactory : deviceFactoryDict.getValue('keyStr'),
-                    typeCode : val,
-                    isSelect : true,
-                },
-                success:function (result) {
-                    cb(result.list);
-                },
-                error:function () {
-                    cb([]);
-                }
-            })
-        },
-        //显示方式
-        model: {
-            label: {
-                type: 'text',
-                text: {
-                    //左边拼接的字符
-                    left: '',
-                    //右边拼接的字符
-                    right: '',
-                    //中间的分隔符
-                    separator: ', ',
-                },
-            }
-        },
-    });
+    // var deviceModelNumberSelect = xmSelect.render({
+    //     el:'#device_model_number',
+    //     name:'deviceModelNumber',
+    //     tips:'请先选择设备厂商',
+    //     empty:'暂时没有该设备厂商的设备配置与型号，请先添加该设备厂商的设备配置',
+    //     disabled:true,
+    //     radio: true,
+    //     prop: {
+    //         name: 'typeCode',
+    //         value: 'typeCode'
+    //     },
+    //     clickClose: true,
+    //     filterable: true,
+    //     remoteSearch: true,
+    //     remoteMethod:function (val,cb,show) {
+    //         $.ajax({
+    //             type: 'GET',
+    //             url: '/deviceTemplate/manage/getListByLikeTypeCode',
+    //             data: {
+    //                     deviceFactory : deviceFactoryDict.getValue('keyStr'),
+    //                 typeCode : val,
+    //                 isSelect : true,
+    //             },
+    //             success:function (result) {
+    //                 cb(result.list);
+    //             },
+    //             error:function () {
+    //                 cb([]);
+    //             }
+    //         })
+    //     },
+    //     //显示方式
+    //     model: {
+    //         label: {
+    //             type: 'text',
+    //             text: {
+    //                 //左边拼接的字符
+    //                 left: '',
+    //                 //右边拼接的字符
+    //                 right: '',
+    //                 //中间的分隔符
+    //                 separator: ', ',
+    //             },
+    //         }
+    //     },
+    // });
 
     //监听设备厂商选择
-    }
+    // }
 
-    function initDeviceTemplateFn(data) {
-        var deviceTemplateList;
-        common.sendSyncRequest("/deviceTemplate/manage/getListByLikeTypeCode", 'get', {
-            deviceFactory : data.change[0].dictKey,
-            isSelect : true,
-        }, function (result) {
-            deviceTemplateList = result.list;
-        });
-        return deviceTemplateList;
-    }
+    // function initDeviceTemplateFn(data) {
+    //     var deviceTemplateList;
+    //     common.sendSyncRequest("/deviceTemplate/manage/getListByLikeTypeCode", 'get', {
+    //         deviceFactory : data.change[0].dictKey,
+    //         isSelect : true,
+    //     }, function (result) {
+    //         deviceTemplateList = result.list;
+    //     });
+    //     return deviceTemplateList;
+    // }
 
     //小区查询下拉列表
     var residentialSelect = xmSelect.render({

sptg-gateway/sptg-housekeeper-gateway/src/main/resources/static/js/device/device-info.js

@@ -29,31 +29,31 @@ layui.extend({
                 }
             });
             //获取设备配置
-            $.ajax({
-                url     :   '/device/options/getByDeviceId/' + $node.idInput.val(),
-                type    :   'GET',
-                success :   function(result){
-                    if (result.data){
-                        data.options = result.data
-                    }
-                },
-                error : function (result) {
-                    let s = result
-                }
-            });
+            // $.ajax({
+            //     url     :   '/device/options/getByDeviceId/' + $node.idInput.val(),
+            //     type    :   'GET',
+            //     success :   function(result){
+            //         if (result.data){
+            //             data.options = result.data
+            //         }
+            //     },
+            //     error : function (result) {
+            //         let s = result
+            //     }
+            // });
             //获取流量卡信息
-            if(data.flowCardId){
-                $.ajax({
-                    url     :   '/device/flowCard/get/' + data.flowCardId,
-                    success :   function(result){
-                        if (result.data){
-                            data.flowCardNum = result.data.cardNum;
-                            data.flowCardBeginDate = result.data.beginDate;
-                            data.flowCardEndDate = result.data.endDate;
-                        }
-                    }
-                });
-            }
+            // if(data.flowCardId){
+            //     $.ajax({
+            //         url     :   '/device/flowCard/get/' + data.flowCardId,
+            //         success :   function(result){
+            //             if (result.data){
+            //                 data.flowCardNum = result.data.cardNum;
+            //                 data.flowCardBeginDate = result.data.beginDate;
+            //                 data.flowCardEndDate = result.data.endDate;
+            //             }
+            //         }
+            //     });
+            // }
             //  数据渲染
             layui.laytpl($('#device_info_template').html()).render({ data : data }, function(htmlText){
                 $('#device_info').html(htmlText);

sptg-gateway/sptg-housekeeper-gateway/src/main/resources/static/js/device/device-manage.js

@@ -57,7 +57,7 @@ layui.extend({
             , {title: '是否支持人脸识别', align: 'center', templet: '#have_face', width: 100}
             , {field: 'xqName', title: '所属小区', align: 'center', width: 100}
             , {field: 'installPath', title: '安装位置', align: 'center', width: 100}
-            , {field: 'isOut',title: '朝向', align: 'center',sort: true, templet: '#device_is_out', width: 60}
+            // , {field: 'isOut',title: '朝向', align: 'center',sort: true, templet: '#device_is_out', width: 60}
             , {
                 title: '在线状态', align: 'center',  event: 'status', width: 80, templet: function (entity) {
                     if (entity['onlineStatus'] === 1 || entity['deviceFactory'] == "qinlin") {
@@ -73,7 +73,7 @@ layui.extend({
                     return null == entity['lastHeartbeat'] ? '' : layui.util.toDateString(new Date(parseInt(entity['lastHeartbeat'])), 'yyyy-MM-dd HH:mm:ss');
                 }
             }
-            , {field: 'versionNumber', title: '版本号', align: 'center',sort: true}
+            // , {field: 'versionNumber', title: '版本号', align: 'center',sort: true}
             , {title: '操作', width: 180, align: 'center', toolbar: '#table-operate'}
         ]]
         , page: true
@@ -559,25 +559,25 @@ layui.extend({
                 });
                 break;
             //  远程恢复版本
-            case 'obtainInfo':
-                if(!canClick("obtainInfo")){
-                    break;
-                }
-                $.ajax({
-                    url: '/device/manage/info/obtain',
-                    type: 'POST',
-                    data: {
-                        id: obj.data.id
-                },
-                    success: function (result) {
-                        if (result.code === '200') {
-                            layer.msg("远程获取设备信息指令已下发");
-                        } else {
-                            layer.msg(result.msg);
-                        }
-                    }
-                });
-                break;
+            // case 'obtainInfo':
+            //     if(!canClick("obtainInfo")){
+            //         break;
+            //     }
+            //     $.ajax({
+            //         url: '/device/manage/info/obtain',
+            //         type: 'POST',
+            //         data: {
+            //             id: obj.data.id
+            //     },
+            //         success: function (result) {
+            //             if (result.code === '200') {
+            //                 layer.msg("远程获取设备信息指令已下发");
+            //             } else {
+            //                 layer.msg(result.msg);
+            //             }
+            //         }
+            //     });
+            //     break;
                 //  更换设备
             case 'replace':
                 common.openDefaultIframe({

sptg-gateway/sptg-housekeeper-gateway/src/main/resources/static/js/device/device-path-add.js

@@ -75,35 +75,35 @@ layui.extend({
             }
         },
     });
-    $.ajax({
-        type: 'GET',
-        url: '/permissions/dict/getByCode/pathUse',
-        success: function (result) {
-            pathUseDict.update({data:result.list})
-        },
-    });
-    var pathUseDict = xmSelect.render({
-        el: '#path_use',
-        name: 'pathUse',
-        layVerify: 'required',
-        radio: true,
-        clickClose: true,
-        prop: {
-            name: 'dictValue',
-            value: 'dictKey',
-        },
-        on: function (data) {},
-        model: {
-            label: {
-                type: 'text',
-                text: {
-                    left: '',
-                    right: '',
-                    separator: ', ',
-                },
-            }
-        },
-    });
+    // $.ajax({
+    //     type: 'GET',
+    //     url: '/permissions/dict/getByCode/pathUse',
+    //     success: function (result) {
+    //         pathUseDict.update({data:result.list})
+    //     },
+    // });
+    // var pathUseDict = xmSelect.render({
+    //     el: '#path_use',
+    //     name: 'pathUse',
+    //     layVerify: 'required',
+    //     radio: true,
+    //     clickClose: true,
+    //     prop: {
+    //         name: 'dictValue',
+    //         value: 'dictKey',
+    //     },
+    //     on: function (data) {},
+    //     model: {
+    //         label: {
+    //             type: 'text',
+    //             text: {
+    //                 left: '',
+    //                 right: '',
+    //                 separator: ', ',
+    //             },
+    //         }
+    //     },
+    // });
     /**
      * 初始化所属小区下拉框（列表）
      */

sptg-gateway/sptg-housekeeper-gateway/src/main/resources/static/js/device/device-path-edit.js

@@ -50,7 +50,7 @@ layui.extend({
         type: 'GET',
         url: '/permissions/dict/getByCode/pathUse',
         success: function (result) {
-            pathUseDict.update({data:result.list})
+            // pathUseDict.update({data:result.list})
     //  初始化
     $.ajax({
         url     :   '/device/path/get/' + $node.idInput.val(),
@@ -63,35 +63,35 @@ layui.extend({
                         $node.pathUse.val(data.pathUse);*/
                         $node.residential.val(data.xqId);
                         pathTypeDict.setValue([data.type]);
-                        pathUseDict.setValue([data.pathUse]);
+                        // pathUseDict.setValue([data.pathUse]);
                         layui.form.render('select');
                     }
                 }
             });
         },
     });
-    var pathUseDict = xmSelect.render({
-        el: '#path_use',
-        name: 'pathUse',
-        layVerify: 'required',
-        radio: true,
-        clickClose: true,
-        prop: {
-            name: 'dictValue',
-            value: 'dictKey',
-        },
-        on: function (data) {},
-        model: {
-            label: {
-                type: 'text',
-                text: {
-                    left: '',
-                    right: '',
-                    separator: ', ',
-                },
-            }
-        },
-    });
+    // var pathUseDict = xmSelect.render({
+    //     el: '#path_use',
+    //     name: 'pathUse',
+    //     layVerify: 'required',
+    //     radio: true,
+    //     clickClose: true,
+    //     prop: {
+    //         name: 'dictValue',
+    //         value: 'dictKey',
+    //     },
+    //     on: function (data) {},
+    //     model: {
+    //         label: {
+    //             type: 'text',
+    //             text: {
+    //                 left: '',
+    //                 right: '',
+    //                 separator: ', ',
+    //             },
+    //         }
+    //     },
+    // });
 
     //  绑定表单提交事件
     layui.form.on("submit(entity_submit_event)",function(data){

sptg-gateway/sptg-housekeeper-gateway/src/main/resources/templates/device/device-add.html

@@ -56,23 +56,23 @@
                                     </div>
                                     <div class="layui-form-mid layui-word-aux">提示：只能输入英文字母、数字、-和_</div>
                                 </div>
-                                <div class="layui-form-item">
-                                    <label class="layui-form-label">
-                                        <span class="must">*</span>
-                                        <span>设备厂商:</span>
-                                    </label>
-                                    <!-- 设备厂商 -->
-                                    <div class="layui-input-inline">
-                                        <div id="factory"></div>
-                                    </div>
-                                </div>
-                                <div class="layui-form-item">
-                                    <!-- 设备型号 -->
-                                    <label class="layui-form-label"><span>设备型号:</span></label>
-                                    <div class="layui-input-inline">
-                                        <div id="device_model_number"></div>
-                                    </div>
-                                </div>
+<!--                                <div class="layui-form-item">-->
+<!--                                    <label class="layui-form-label">-->
+<!--                                        <span class="must">*</span>-->
+<!--                                        <span>设备厂商:</span>-->
+<!--                                    </label>-->
+<!--                                    &lt;!&ndash; 设备厂商 &ndash;&gt;-->
+<!--                                    <div class="layui-input-inline">-->
+<!--                                        <div id="factory"></div>-->
+<!--                                    </div>-->
+<!--                                </div>-->
+<!--                                <div class="layui-form-item">-->
+<!--                                    &lt;!&ndash; 设备型号 &ndash;&gt;-->
+<!--                                    <label class="layui-form-label"><span>设备型号:</span></label>-->
+<!--                                    <div class="layui-input-inline">-->
+<!--                                        <div id="device_model_number"></div>-->
+<!--                                    </div>-->
+<!--                                </div>-->
                                 <div class="layui-form-item">
                                     <label class="layui-form-label"><span class="must">*</span><span>安装位置:</span></label>
                                     <!-- 小区 -->
@@ -92,22 +92,22 @@
                                     </div>
                                 </div>
                                 <!-- 是否启用时间策略 -->
-                                <div class="layui-form-item">
-                                    <label class="layui-form-label">
-                                        <span>启用策略:</span>
-                                    </label>
-                                    <div class="layui-input-inline">
-                                        <input type="radio" name="timeStrategyIsEnable" value="1" title="是" checked>
-                                        <input type="radio" name="timeStrategyIsEnable" value="2" title="否">
-                                    </div>
-                                    <label class="layui-form-label">
-                                        <span>设备朝向:</span>
-                                    </label>
-                                    <div class="layui-input-inline">
-                                        <input type="radio" name="isOut" value="1" title="进" checked>
-                                        <input type="radio" name="isOut" value="2" title="出">
-                                    </div>
-                                </div>
+<!--                                <div class="layui-form-item">-->
+<!--                                    <label class="layui-form-label">-->
+<!--                                        <span>启用策略:</span>-->
+<!--                                    </label>-->
+<!--                                    <div class="layui-input-inline">-->
+<!--                                        <input type="radio" name="timeStrategyIsEnable" value="1" title="是" checked>-->
+<!--                                        <input type="radio" name="timeStrategyIsEnable" value="2" title="否">-->
+<!--                                    </div>-->
+<!--                                    <label class="layui-form-label">-->
+<!--                                        <span>设备朝向:</span>-->
+<!--                                    </label>-->
+<!--                                    <div class="layui-input-inline">-->
+<!--                                        <input type="radio" name="isOut" value="1" title="进" checked>-->
+<!--                                        <input type="radio" name="isOut" value="2" title="出">-->
+<!--                                    </div>-->
+<!--                                </div>-->
 <!--                                <div class="layui-form-item">-->
 <!--                                    <label class="layui-form-label">-->
 <!--                                        <span class="must">*</span>-->

sptg-gateway/sptg-housekeeper-gateway/src/main/resources/templates/device/device-path-add.html

@@ -33,19 +33,19 @@
                                     </div>
                                     <div class="layui-form-mid layui-word-aux">如：大门、出口、入口</div>
                                 </div>
-                                <div class="layui-form-item">
-                                    <div class="layui-form" lay-filter="residential_filter">
-                                        <label class="layui-form-label"><span class="must">*</span>位置用途</label>
-                                        <div class="layui-input-inline">
-                                            <div id="path_use"></div>
+<!--                                <div class="layui-form-item">-->
+<!--                                    <div class="layui-form" lay-filter="residential_filter">-->
+<!--                                        <label class="layui-form-label"><span class="must">*</span>位置用途</label>-->
+<!--                                        <div class="layui-input-inline">-->
+<!--                                            <div id="path_use"></div>-->
                                             <!--<select id="path_use" name="pathUse" lay-filter="path_use_event" lay-verify="required" >
                                                 <option value="">请选择</option>
                                                 <option value="10">一般位置</option>
                                                 <option value="11">特殊位置</option>
                                             </select>-->
-                                        </div>
-                                    </div>
-                                </div>
+<!--                                        </div>-->
+<!--                                    </div>-->
+<!--                                </div>-->
                                 <div class="layui-form-item">
                                     <label class="layui-form-label">
                                         <span class="must">*</span>

sptg-gateway/sptg-housekeeper-gateway/src/main/resources/templates/device/device-path-edit.html

@@ -45,19 +45,19 @@
                                         </select>-->
                                     </div>
                                 </div>
-                                <div class="layui-form-item">
-                                    <div class="layui-form" lay-filter="residential_filter">
-                                        <label class="layui-form-label"><span class="must">*</span>位置用途</label>
-                                        <div class="layui-input-inline">
-                                            <div id="path_use"></div>
+<!--                                <div class="layui-form-item">-->
+<!--                                    <div class="layui-form" lay-filter="residential_filter">-->
+<!--                                        <label class="layui-form-label"><span class="must">*</span>位置用途</label>-->
+<!--                                        <div class="layui-input-inline">-->
+<!--                                            <div id="path_use"></div>-->
                                             <!--<select id="path_use" name="pathUse" lay-filter="path_use_event" lay-verify="required" >
                                                 <option value="">请选择</option>
                                                 <option value="10">一般位置</option>
                                                 <option value="11">特殊位置</option>
                                             </select>-->
-                                        </div>
-                                    </div>
-                                </div>
+<!--                                        </div>-->
+<!--                                    </div>-->
+<!--                                </div>-->
                                 <!-- 按钮 -->
                                 <div class="layui-form-item">
                                     <div class="layui-input-block">

sptg-gateway/sptg-housekeeper-gateway/src/main/resources/templates/device/device-template-add.html

@@ -1,253 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-    <head>
-        <script th:replace="common/head"></script>
-        <!-- 样式 -->
-        <link rel="stylesheet" th:href="@{'/css/permission/community-add.css'}" media="all">
-
-        <style>
-            .textAlign {
-                text-align: center;
-            }
-        </style>
-    </head>
-    <body>
-
-        <div class="layui-fluid">
-            <div class="layui-row layui-col-space15">
-                <div class="layui-col-md12">
-                    <div class="layui-card">
-                        <div class="layui-card-body">
-                            <div class="layui-form">
-                                <fieldset class="layui-elem-field">
-                                    <legend>配置基本信息</legend>
-                                    <div class="layui-field-box">
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label"><span class="must">*</span><span>配置名称:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input name="name" type="text" lay-verify="required|specialCharacters|length" placeholder="请输入配置名称" autocomplete="off" class="layui-input" />
-                                            </div>
-                                            <label class="layui-form-label"><span class="must">*</span><span>设备厂商:</span></label>
-                                            <!-- 设备厂商 -->
-                                            <div class="layui-input-inline">
-                                                <div class="layui-input-inline">
-                                                    <div id="deviceFactory"></div>
-                                                </div>
-                                                <!--<select name="deviceFactory" lay-filter="deviceFactory" lay-verify="required">-->
-                                                    <!--<option value="">请选择</option>-->
-                                                    <!--<option value="JVT" th:checked="true">JVT</option>-->
-                                                    <!--<option value="qinlin" th:checked="true">qinlin</option>-->
-                                                <!--</select>-->
-                                            </div>
-                                            <label class="layui-form-label"><span class="must">*</span><span>设备型号:</span></label>
-                                            <!-- 设备型号 -->
-                                            <div class="layui-input-inline">
-                                                <input name="typeCode" type="text" lay-verify="required" autocomplete="off" class="layui-input textAlign" />
-                                            </div>
-                                        </div>
-                                    </div>
-                                </fieldset>
-                                <fieldset class="layui-elem-field">
-                                    <legend>设备功能</legend>
-                                    <div class="layui-field-box">
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label"><span class="must">*</span><span>是否支持门禁卡片功能:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input type="radio" name="haveCard" lay-filter="isHaveCard" value="1" title="是" checked>
-                                                <input type="radio" name="haveCard" lay-filter="isHaveCard" value="2" title="否">
-                                            </div>
-                                            <label class="layui-form-label"><span class="must">*</span><span>是否支持人脸识别功能:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input type="radio" name="haveFace" lay-filter="isHaveFace" value="1" title="是" checked>
-                                                <input type="radio" name="haveFace" lay-filter="isHaveFace" value="2" title="否">
-                                            </div>
-                                            <label class="layui-form-label"><span class="must">*</span><span>是否支持键盘功能:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input type="radio" name="haveKeyboard" lay-filter="isHaveKeyboard" value="1" title="是" checked>
-                                                <input type="radio" name="haveKeyboard" lay-filter="isHaveKeyboard" value="2" title="否">
-                                            </div>
-                                        </div>
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label"><span class="must">*</span><span>是否支持视频通话功能:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input type="radio" name="haveCall" lay-filter="isHaveCall" value="1" title="是" checked>
-                                                <input type="radio" name="haveCall" lay-filter="isHaveCall" value="2" title="否">
-                                            </div>
-                                            <label class="layui-form-label"><span class="must">*</span><span>是否支持一键重启功能:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input type="radio" name="reboot" lay-filter="reboot" value="1" title="是" checked>
-                                                <input type="radio" name="reboot" lay-filter="reboot" value="2" title="否" >
-                                            </div>
-                                            <label class="layui-form-label"><span class="must">*</span><span>是否支持广告功能:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input type="radio" name="haveAd" lay-filter="isHaveAd" value="1" title="是" checked>
-                                                <input type="radio" name="haveAd" lay-filter="isHaveAd" value="2" title="否" >
-                                            </div>
-                                        </div>
-                                    </div>
-                                </fieldset>
-                                <fieldset class="layui-elem-field">
-                                    <legend>设备基本配置</legend>
-                                    <div class="layui-field-box">
-                                        <div class="layui-form-item">
-                                            <!-- 设备尺寸 -->
-                                            <label class="layui-form-label"><span class="must">*</span><span>设备尺寸:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input name="size" type="number" lay-verify="required" placeholder=""
-                                                       autocomplete="off" class="layui-input textAlign" />
-                                            </div>
-                                            <!-- 屏幕亮度 -->
-                                            <label class="layui-form-label"><span class="must">*</span><span>屏幕亮度:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input name="screenBrightness" type="number" lay-verify="required|size" placeholder="提示：请输入0-100的数字"
-                                                       autocomplete="off" class="layui-input textAlign" />
-                                            </div>
-                                            <!-- 开门时长 -->
-                                            <label class="layui-form-label"><span class="must">*</span><span>开门时长:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input name="delay" type="number" lay-verify="required" value="5" autocomplete="off" class="layui-input textAlign">
-                                            </div>
-                                        </div>
-                                        <div class="layui-form-item">
-                                            <!-- 显示姓名 -->
-                                            <label class="layui-form-label"><span>显示姓名:</span></label>
-                                            <div class="layui-input-inline">
-                                                <div id="isShowUsername"></div>
-                                                <!--<select name="isShowUsername">
-                                                    <option value="1">显示</option>
-                                                    <option selected value="2">不显示</option>
-												</select>-->
-                                            </div>
-                                            <!-- 通话音量 -->
-                                            <label class="layui-form-label" id="callVolumeLabel"><span class="must">*</span><span>通话音量:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input name="callVolume" type="number" lay-verify="required|size" placeholder="提示：请输入0-100的数字"
-                                                       value="80" autocomplete="off" class="layui-input textAlign" />
-                                            </div>
-                                        </div>
-                                    </div>
-                                </fieldset>
-                                <fieldset class="layui-elem-field">
-                                    <legend>广告设置</legend>
-                                    <div class="layui-field-box">
-                                        <div class="layui-form-item">
-                                            <!-- 广告音量 -->
-                                            <label class="layui-form-label"><span class="must">*</span><span>广告音量:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input name="adVolume" type="number" lay-verify="required|size" placeholder="提示：请输入0-100的数字"
-                                                       autocomplete="off" class="layui-input textAlign" />
-                                            </div>
-                                            <!-- 播放模式 -->
-                                            <label class="layui-form-label"><span>广告播放模式:</span></label>
-                                            <div class="layui-input-inline">
-                                                <div id="playModel"></div>
-                                                <!--<select name="playModel">
-                                                    <option value="1">循环播放</option>
-                                                    <option selected value="2">靠近播放</option>
-                                                    <option value="3">按性别和年龄播放</option>
-                                                </select>-->
-                                            </div>
-                                        </div>
-                                    </div>
-                                </fieldset>
-                                <fieldset class="layui-elem-field" id="face_options">
-                                    <legend>人脸识别功能设置</legend>
-                                    <div class="layui-field-box">
-                                        <div class="layui-form-item">
-                                            <!-- 补光灯亮度 -->
-                                            <label class="layui-form-label"><span class="must">*</span><span>补光灯亮度:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input name="fillLight" type="number" lay-verify="required|size" placeholder="提示：请输入0-100的数字"
-                                                       autocomplete="off" class="layui-input textAlign" />
-                                            </div>
-                                            <label class="layui-form-label"><span>识别框位置:</span></label>
-                                            <div class="layui-input-inline">
-                                                <div id="discernBoxPosition"></div>
-                                                <!--<select name="discernBoxPosition">
-                                                    <option selected value="1">左上角</option>
-                                                    <option value="2">左下角</option>
-                                                    <option value="3">中间位置</option>
-                                                    <option value="4">右下角</option>
-												</select>-->
-                                            </div>
-                                            <!-- 人脸识别度 -->
-                                            <label class="layui-form-label"><span class="must">*</span><span>识别度达:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input name="faceResolution" type="number" placeholder="" value="75"
-                                                       class="layui-input textAlign" lay-verify="number|size" />
-                                            </div>
-                                            <div class="layui-form-mid layui-word-aux">%,时可进行开门</div>
-                                        </div>
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label"><span>活体检测:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input type="radio" name="liveDetect" value="1" title="开启" checked>
-                                                <input type="radio" name="liveDetect" value="2" title="关闭">
-                                            </div>
-                                        </div>
-                                    </div>
-                                </fieldset>
-                                <fieldset class="layui-elem-field">
-                                    <legend>密码设置</legend>
-                                    <div class="layui-field-box">
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label"><span class="must">*</span><span>开门密码:</span></label>
-                                            <div class="layui-input-inline">
-                                                    <input name="openDoorPwd" type="number" lay-verify="password" value="000000" autocomplete="off" class="layui-input">
-                                            </div>
-                                            <label class="layui-form-label"><span class="must">*</span><span>是否有管理密码:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input type="radio" name="haveAdminPwd" lay-filter="haveAdminPwd" value="1" title="是" checked>
-                                                <input type="radio" name="haveAdminPwd" lay-filter="haveAdminPwd" value="2" title="否">
-                                            </div>
-                                            <label class="layui-form-label" id="adminPwdLabel"><span class="must">*</span><span>管理密码:</span></label>
-                                            <div class="layui-input-inline" id="adminPwdInput">
-                                                <input name="adminPwd" type="number" lay-verify="adminPassword" value="123456" autocomplete="off" class="layui-input">
-                                            </div>
-                                        </div>
-                                    </div>
-                                </fieldset>
-                                <!-- 备注 -->
-                                <fieldset class="layui-elem-field">
-                                    <legend>备注</legend>
-                                    <div class="layui-field-box">
-                                        <div class="layui-input-block" style="margin-left: 10px">
-                                            <textarea name="remark" placeholder="请输入内容" class="layui-textarea w500" style="width: 1200px"></textarea>
-                                        </div>
-                                    </div>
-                                </fieldset>
-                                <!-- 按钮 -->
-                                <div class="layui-form-item">
-                                    <div class="layui-input-block">
-                                        <button class="layui-btn" lay-submit lay-filter="entity_submit_event">提交</button>
-                                        <button type="reset" class="layui-btn layui-btn-primary">取消</button>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-    </body>
-    <!-- javascript -->
-    <!--去掉input type="number"后面的箭头-->
-    <style type="text/css">
-        input::-webkit-outer-spin-button,
-        input::-webkit-inner-spin-button {
-            -webkit-appearance: none;
-        }
-        input[type="number"] {
-            -moz-appearance: textfield;
-        }
-    </style>
-
-    <script type="text/javascript" th:src="@{'/layui/layui.js'}" charset="utf-8"></script>
-    <script type="text/javascript">
-        layui.config({
-            base: '/' //静态资源所在路径
-        });
-    </script>
-    <script type="text/javascript" th:src="@{'/js/device/device-template-add.js'}" charset="utf-8"></script>
-</html>

sptg-gateway/sptg-housekeeper-gateway/src/main/resources/templates/device/device-template-edit.html

@@ -1,267 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-    <head>
-        <script th:replace="common/head"></script>
-        <!-- 样式 -->
-        <link rel="stylesheet" th:href="@{'/css/permission/community-add.css'}" media="all">
-
-        <style>
-            .textAlign {
-                text-align: center;
-            }
-        </style>
-    </head>
-    <body>
-
-        <div class="layui-fluid">
-            <div class="layui-row layui-col-space15">
-                <div class="layui-col-md12">
-                    <div class="layui-card">
-                        <div class="layui-card-body">
-                            <div class="layui-form">
-                                <fieldset class="layui-elem-field">
-                                    <legend>配置基本信息</legend>
-                                    <div class="layui-field-box">
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label"><span class="must">*</span><span>配置名称:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input name="name" type="text" lay-verify="required|specialCharacters|length"
-                                                       placeholder="请输入配置名称" autocomplete="off" class="layui-input" th:value="${deviceTemplate.name}" />
-                                            </div>
-                                            <label class="layui-form-label"><span class="must">*</span><span>设备厂商:</span></label>
-                                            <!-- 设备厂商 -->
-                                            <div class="layui-input-inline">
-                                                <div class="layui-input-inline">
-                                                    <div id="deviceFactory"></div>
-                                                </div>
-                                                <!--<div id="deviceFactory"></div>-->
-                                                <input type="hidden" th:value="${deviceTemplate.deviceFactory}" id="deviceFactoryValue">
-                                                    <!--<option value="JVT" th:selected="${deviceTemplate.deviceFactory} == 'JVT'">巨龙</option>-->
-                                                    <!--<option value="qinlin" th:selected="${deviceTemplate.deviceFactory} == 'qinlin'">亲邻</option>-->
-                                                <!--</select>-->
-                                            </div>
-                                            <label class="layui-form-label"><span class="must">*</span><span>设备型号:</span></label>
-                                            <!-- 设备序列号 -->
-                                            <div class="layui-input-inline">
-                                                <input name="typeCode" type="text" lay-verify="required" autocomplete="off"
-                                                       class="layui-input textAlign" th:value="${deviceTemplate.typeCode}" />
-                                            </div>
-                                        </div>
-                                    </div>
-                                </fieldset>
-                                <fieldset class="layui-elem-field">
-                                    <legend>设备功能</legend>
-                                    <div class="layui-field-box">
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label"><span class="must">*</span><span>是否支持门禁卡片功能:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input type="radio" name="haveCard" lay-filter="isHaveCard" value="1" title="是" th:checked="${deviceTemplate.haveCard} == 1">
-                                                <input type="radio" name="haveCard" lay-filter="isHaveCard" value="2" title="否" th:checked="${deviceTemplate.haveCard} == 2">
-                                            </div>
-                                            <label class="layui-form-label"><span class="must">*</span><span>是否支持人脸识别功能:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input type="radio" name="haveFace" lay-filter="isHaveFace" value="1" title="是" th:checked="${deviceTemplate.haveFace} == 1">
-                                                <input type="radio" name="haveFace" lay-filter="isHaveFace" value="2" title="否" th:checked="${deviceTemplate.haveFace} == 2">
-                                            </div>
-                                            <label class="layui-form-label"><span class="must">*</span><span>是否支持键盘功能:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input type="radio" name="haveKeyboard" lay-filter="isHaveKeyboard" value="1" title="是" th:checked="${deviceTemplate.haveKeyboard} == 1">
-                                                <input type="radio" name="haveKeyboard" lay-filter="isHaveKeyboard" value="2" title="否" th:checked="${deviceTemplate.haveKeyboard} == 2">
-                                            </div>
-                                        </div>
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label"><span class="must">*</span><span>是否支持视频通话功能:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input type="radio" name="haveCall" lay-filter="isHaveCall" value="1" title="是" th:checked="${deviceTemplate.haveCall} ==1">
-                                                <input type="radio" name="haveCall" lay-filter="isHaveCall" value="2" title="否" th:checked="${deviceTemplate.haveCall} ==2">
-                                            </div>
-                                            <label class="layui-form-label"><span class="must">*</span><span>是否支持一键重启功能:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input type="radio" name="reboot" lay-filter="reboot" value="1" title="是" th:checked="${deviceTemplate.reboot} ==1">
-                                                <input type="radio" name="reboot" lay-filter="reboot" value="2" title="否" th:checked="${deviceTemplate.reboot} ==2">
-                                            </div>
-                                            <label class="layui-form-label"><span class="must">*</span><span>是否支持广告功能:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input type="radio" name="haveAd" lay-filter="isHaveAd" value="1" title="是" th:checked="${deviceTemplate.haveAd} ==1">
-                                                <input type="radio" name="haveAd" lay-filter="isHaveAd" value="2" title="否" th:checked="${deviceTemplate.haveAd} ==2">
-                                            </div>
-                                        </div>
-                                    </div>
-                                </fieldset>
-                                <fieldset class="layui-elem-field">
-                                    <legend>设备基本配置</legend>
-                                    <div class="layui-field-box">
-                                        <div class="layui-form-item">
-                                            <!-- 设备尺寸 -->
-                                            <label class="layui-form-label"><span class="must">*</span><span>设备尺寸:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input name="size" type="number" lay-verify="required" placeholder="提示：请输入0-100的数字"
-                                                       autocomplete="off" class="layui-input textAlign" th:value="${deviceTemplate.size}" />
-                                            </div>
-                                            <!-- 屏幕亮度 -->
-                                            <label class="layui-form-label"><span class="must">*</span><span>屏幕亮度:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input name="screenBrightness" type="number" lay-verify="required|size" placeholder="提示：请输入0-100的数字"
-                                                       autocomplete="off" class="layui-input textAlign" th:value="${deviceTemplate.screenBrightness}" />
-                                            </div>
-                                            <!-- 开门时长 -->
-                                            <label class="layui-form-label"><span class="must">*</span><span>开门时长:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input name="delay" type="number" lay-verify="required" value="5" autocomplete="off"
-                                                       class="layui-input textAlign" th:value="${deviceTemplate.delay}">
-                                            </div>
-                                        </div>
-                                        <div class="layui-form-item">
-                                            <!-- 显示姓名 -->
-                                            <label class="layui-form-label"><span>显示姓名:</span></label>
-                                            <div class="layui-input-inline">
-                                                <div id="isShowUsername"></div>
-                                                <input type="hidden" th:value="${deviceTemplate.isShowUsername}" id="isShowUsernameValue">
-												<!--<select name="isShowUsername" >
-                                                    <option value="1" th:selected="${deviceTemplate.isShowUsername == 1}">显示</option>
-                                                    <option value="2" th:selected="${deviceTemplate.isShowUsername == 2}">不显示</option>
-                                                </select>-->
-                                            </div>
-                                            <!-- 通话音量 -->
-                                            <label class="layui-form-label" id="callVolumeLabel"><span class="must">*</span><span>通话音量:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input name="callVolume" type="number" lay-verify="required|size" placeholder="提示：请输入0-100的数字"
-                                                       autocomplete="off" class="layui-input textAlign" th:value="${deviceTemplate.callVolume}" />
-                                            </div>
-                                        </div>
-                                    </div>
-                                </fieldset>
-                                <fieldset class="layui-elem-field">
-                                    <legend>广告设置</legend>
-                                    <div class="layui-field-box">
-                                        <div class="layui-form-item">
-                                            <!-- 广告音量 -->
-                                            <label class="layui-form-label"><span class="must">*</span><span>广告音量:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input name="adVolume" type="number" lay-verify="required|size" placeholder="提示：请输入0-100的数字"
-                                                       autocomplete="off" class="layui-input textAlign" th:value="${deviceTemplate.adVolume}" />
-                                            </div>
-                                            <!-- 播放模式 -->
-                                            <label class="layui-form-label"><span>广告播放模式:</span></label>
-                                            <div class="layui-input-inline">
-                                                <div id="playModel"></div>
-                                                <input type="hidden" th:value="${deviceTemplate.playModel}" id="playModelValue">
-												<!--<select name="playModel">
-                                                    <option value="1" th:selected="${deviceTemplate.playModel}==1">循环播放</option>
-                                                    <option value="2" th:selected="${deviceTemplate.playModel}==2">靠近播放</option>
-                                                    <option value="3" th:selected="${deviceTemplate.playModel}==3">按性别和年龄播放</option>
-                                                </select>-->
-                                            </div>
-                                        </div>
-                                    </div>
-                                </fieldset>
-                                <fieldset class="layui-elem-field" id="face_Template" th:styleappend="'display:' + (${deviceTemplate.haveFace}==1?'block':'none')">
-                                    <legend>人脸识别功能设置</legend>
-                                    <div class="layui-field-box">
-                                        <div class="layui-form-item">
-                                            <!-- 补光灯亮度 -->
-                                            <label class="layui-form-label"><span class="must">*</span><span>补光灯亮度:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input name="fillLight" type="number" lay-verify="required|size" placeholder="提示：请输入0-100的数字"
-                                                       autocomplete="off" class="layui-input textAlign" th:value="${deviceTemplate.fillLight}" />
-                                            </div>
-                                            <label class="layui-form-label"><span>识别框位置:</span></label>
-                                            <div class="layui-input-inline">
-                                                <div id="discernBoxPosition"></div>
-                                                <input type="hidden" th:value="${deviceTemplate.discernBoxPosition}" id="discernBoxPositionValue">
-												<!--<select name="discernBoxPosition">
-                                                    <option value="1" th:selected="${deviceTemplate.discernBoxPosition} ==1">左上角</option>
-                                                    <option value="2" th:selected="${deviceTemplate.discernBoxPosition} ==2">左下角</option>
-                                                    <option value="3" th:selected="${deviceTemplate.discernBoxPosition} ==3">中间位置</option>
-                                                    <option value="4" th:selected="${deviceTemplate.discernBoxPosition} ==4">右下角</option>
-                                                </select>-->
-                                            </div>
-                                            <!-- 人脸识别度 -->
-                                            <label class="layui-form-label"><span class="must">*</span><span>识别度达:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input name="faceResolution" type="number" placeholder="" class="layui-input textAlign"
-                                                       lay-verify="number|size" th:value="${deviceTemplate.faceResolution}" />
-                                            </div>
-                                            <div class="layui-form-mid layui-word-aux">%,时可进行开门</div>
-                                        </div>
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label"><span>活体检测:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input type="radio" name="liveDetect" value="1" title="开启" th:checked="${deviceTemplate.liveDetect} ==1">
-                                                <input type="radio" name="liveDetect" value="0" title="关闭" th:checked="${deviceTemplate.liveDetect} ==0">
-                                            </div>
-                                        </div>
-                                    </div>
-                                </fieldset>
-                                <fieldset class="layui-elem-field">
-                                    <legend>密码设置</legend>
-                                    <div class="layui-field-box">
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label"><span class="must">*</span><span>开门密码:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input name="openDoorPwd" type="number" lay-verify="password" th:value="${deviceTemplate.openDoorPwd}"
-                                                       autocomplete="off" class="layui-input">
-                                            </div>
-                                            <label class="layui-form-label"><span class="must">*</span><span>是否有管理密码:</span></label>
-                                            <div class="layui-input-inline">
-                                                <input type="radio" name="haveAdminPwd" lay-filter="haveAdminPwd"
-                                                       value="1" title="是" th:checked="${deviceTemplate.adminPwd} != ''">
-                                                <input type="radio" name="haveAdminPwd" lay-filter="haveAdminPwd"
-                                                       value="2" title="否" th:checked="${deviceTemplate.adminPwd} == ''">
-                                            </div>
-                                            <label class="layui-form-label" id="adminPwdLabel" th:styleappend="'display:' + (${deviceTemplate.adminPwd}!=''?'block':'none')">
-                                                <span class="must">*</span><span>管理密码:</span>
-                                            </label>
-                                            <div class="layui-input-inline" id="adminPwdInput" th:styleappend="'display:' + (${deviceTemplate.adminPwd}!=''?'block':'none')">
-                                                <input name="adminPwd" type="number" lay-verify="adminPassword"
-                                                       th:value="${deviceTemplate.adminPwd} != ''? ${deviceTemplate.adminPwd}:'123456' " autocomplete="off" class="layui-input">
-                                            </div>
-                                        </div>
-                                    </div>
-                                </fieldset>
-                                <!-- 备注 -->
-                                <fieldset class="layui-elem-field">
-                                    <legend>备注</legend>
-                                    <div class="layui-field-box">
-                                        <div class="layui-input-block" style="margin-left: 10px">
-                                            <textarea name="remark" placeholder="请输入内容" class="layui-textarea w500" style="width: 1200px" th:text="${deviceTemplate.remark}"></textarea>
-                                        </div>
-                                    </div>
-                                </fieldset>
-                                <!-- 按钮 -->
-                                <div class="layui-form-item">
-                                    <div class="layui-input-block">
-                                        <button class="layui-btn" lay-submit lay-filter="entity_submit_event">提交</button>
-                                        <button type="reset" class="layui-btn layui-btn-primary">取消</button>
-                                    </div>
-                                </div>
-                                <!-- 隐藏表单 -->
-                                <input type="hidden" name="id" th:value="${deviceTemplate.id}">
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-    </body>
-    <!-- javascript -->
-    <!--去掉input type="number"后面的箭头-->
-    <style type="text/css">
-        input::-webkit-outer-spin-button,
-        input::-webkit-inner-spin-button {
-            -webkit-appearance: none;
-        }
-        input[type="number"] {
-            -moz-appearance: textfield;
-        }
-    </style>
-
-    <script type="text/javascript" th:src="@{'/layui/layui.js'}" charset="utf-8"></script>
-    <script type="text/javascript">
-        layui.config({
-            base: '/' //静态资源所在路径
-        });
-    </script>
-    <script type="text/javascript" th:src="@{'/js/device/device-template-edit.js'}" charset="utf-8"></script>
-</html>

sptg-gateway/sptg-housekeeper-gateway/src/main/resources/templates/device/device-template-manage.html

@@ -1,87 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org" xmlns:sptg="http://www.thymeleaf.org">
-    <head>
-        <script th:replace="common/head"></script>
-        <style>
-            .layui-layer.alert_content .layui-layer-content {
-                padding: 0;
-            }
-            .layui-layer.alert_content .layui-layer-btn{
-                padding: 0 30px 12px;
-            }
-        </style>
-    </head>
-
-    <body style="position: absolute;top:0;bottom: 0;left:0;right: 0;">
-        <div class="layui-fluid">
-            <div class="layui-card">
-                <!-- 查询条件 -->
-                <div class="layui-form layui-card-header layuiadmin-card-header-auto"  style="padding:0;">
-                    <div class="layui-form-item border-b">
-                            <!--<div class="layui-inline" style="margin-left: 38px;">
-                                <button class="layui-btn layuiadmin-btn-useradmin"  lay-submit lay-filter="query">查询</button>
-                                <button class="layui-btn  layui-btn-primary"  lay-submit lay-filter="reset">重置</button>
-                            </div>-->
-                        </div>
-
-                        <!-- 表格+头部按钮 -->
-                        <div class="layui-card-body" style="padding:0;">
-                            <div style="padding-bottom: 10px;">
-                                <button class="layui-btn" lay-submit lay-filter="add" sptg:security="device:template:add">添加配置</button>
-                            </div>
-                            <table id="data_table" lay-filter="data_event"></table>
-                        </div>
-                    </div>
-                </div>
-            <!--/*@thymesVar id="onLineUser" type="com.sptg.permissions.api.entity.Account"*/-->
-            <input type="hidden" id="user_org_id" th:value="${onLineUser.orgId}" />
-        </div>
-
-        <!-- javascript -->
-        <script type="text/javascript" th:src="@{'/layui/layui.js'}" charset="utf-8"></script>
-        <script type="text/javascript">
-            layui.config({
-                base: '/' //静态资源所在路径
-            });
-        </script>
-        <script type="text/javascript" th:src="@{'/js/device/device-template-manage.js'}" charset="utf-8"></script>
-
-        <!-- 是否支持门禁卡 -->
-        <script type="text/html" id="have_card">
-            {{#  if(d.haveCard == 1){ }}
-            <span class="layui-badge layui-bg-green">支持</span>
-            {{# } else if(d.haveCard == 2){ }}
-            <span class="layui-badge layui-bg-black">不支持</span>
-            {{#  } }}
-        </script>
-
-        <!-- 是否支持人脸识别 -->
-        <script type="text/html" id="have_face">
-            {{#  if(d.haveFace == 1){ }}
-            <span class="layui-badge layui-bg-green">支持</span>
-            {{# } else if(d.haveFace == 2){ }}
-            <span class="layui-badge layui-bg-black">不支持</span>
-            {{#  } }}
-        </script>
-        <!-- 设备厂商 -->
-        <script type="text/html" id="device_factory">
-            {{#  if(d.deviceFactory == "JVT"){ }}
-            <span class="layui-badge layui-bg-black">巨龙</span>
-            {{#  } }}
-            {{#  if(d.deviceFactory == "qinlin"){ }}
-            <span class="layui-badge layui-bg-black">亲邻</span>
-            {{#  } }}
-            {{#  if(d.deviceFactory == "ZONGHENG"){ }}
-            <span class="layui-badge layui-bg-black">纵横</span>
-            {{#  } }}
-        </script>
-
-        <!--操作-->
-        <script type="text/html" id="table-operate">
-            <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit" sptg:security="device:template:update">修改</a>
-            <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete" sptg:security="device:template:delete">删除</a>
-        </script>
-
-    </body>
-
-</html>

sptg-gateway/sptg-housekeeper-gateway/src/main/resources/templates/estate/user-manage.html

@@ -113,13 +113,13 @@
                         <div class="layui-card-body" style="padding:0;" id="layPhotosTbImg">
                             <div style="padding-bottom: 10px;">
                                 <button class="layui-btn layuiadmin-btn-useradmin" lay-submit lay-filter="add" sptg:security="estate:user:add">添加住户</button>
-                                <button class="layui-btn layuiadmin-btn-useradmin" lay-submit lay-filter="batchdel" sptg:security="estate:user:delete">批量删除</button>
-                                <button class="layui-btn layuiadmin-btn-useradmin" lay-submit lay-filter="import" sptg:security="estate:user:import">信息导入</button>
-                                <button class="layui-btn layuiadmin-btn-useradmin" lay-submit lay-filter="thirdImport" sptg:security="estate:user:import">第三方信息导入</button>
-                                <button class="layui-btn layuiadmin-btn-useradmin" lay-submit lay-filter="faceImport" sptg:security="estate:user:import">人脸导入</button>
-                                <button class="layui-btn layuiadmin-btn-useradmin" lay-submit lay-filter="export" sptg:security="estate:user:export">导出</button>
-                                <button class="layui-btn layuiadmin-btn-useradmin" lay-submit lay-filter="sync" sptg:security="estate:user:sync">同步第三方信息</button>
-                                <button class="layui-btn layuiadmin-btn-useradmin" lay-submit lay-filter="desensitize" sptg:security="estate:user:desensitize" id="desensitize">查看敏感数据</button>
+<!--                                <button class="layui-btn layuiadmin-btn-useradmin" lay-submit lay-filter="batchdel" sptg:security="estate:user:delete">批量删除</button>-->
+<!--                                <button class="layui-btn layuiadmin-btn-useradmin" lay-submit lay-filter="import" sptg:security="estate:user:import">信息导入</button>-->
+<!--                                <button class="layui-btn layuiadmin-btn-useradmin" lay-submit lay-filter="thirdImport" sptg:security="estate:user:import">第三方信息导入</button>-->
+<!--                                <button class="layui-btn layuiadmin-btn-useradmin" lay-submit lay-filter="faceImport" sptg:security="estate:user:import">人脸导入</button>-->
+<!--                                <button class="layui-btn layuiadmin-btn-useradmin" lay-submit lay-filter="export" sptg:security="estate:user:export">导出</button>-->
+<!--                                <button class="layui-btn layuiadmin-btn-useradmin" lay-submit lay-filter="sync" sptg:security="estate:user:sync">同步第三方信息</button>-->
+<!--                                <button class="layui-btn layuiadmin-btn-useradmin" lay-submit lay-filter="desensitize" sptg:security="estate:user:desensitize" id="desensitize">查看敏感数据</button>-->
                             </div>
                             <table id="table_id" lay-filter="table_event"></table>
                         </div>

sptg-permissions/sptg-permissions-biz/src/main/java/com/sptg/permissions/biz/receiver/DeviceDeleteReceiver.java

@@ -1,50 +0,0 @@
-package com.sptg.permissions.biz.receiver;
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.sptg.device.api.dto.DeviceOptionsDto;
-import com.sptg.device.api.entity.DeviceOptions;
-import com.sptg.device.api.feigns.DeviceOptionsFeign;
-import com.sptg.device.api.stream.DeviceDeleteReceiverInterface;
-import com.sptg.permissions.api.entity.DeviceAuthorize;
-import com.sptg.permissions.biz.service.DeviceAuthorizeServiceInterface;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.cloud.stream.annotation.EnableBinding;
-import org.springframework.cloud.stream.annotation.StreamListener;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * title: DeviceDeleteReceiver
- * description: 设备删除消费者
- *
- *                  
- *            
- */
-@Component
-@Slf4j
-@RequiredArgsConstructor
-@EnableBinding(value = { DeviceDeleteReceiverInterface.class})
-public class DeviceDeleteReceiver {
-
-    private final DeviceAuthorizeServiceInterface deviceAuthorizeServiceInterface;
-    private final DeviceOptionsFeign deviceOptionsFeign;
-
-    @StreamListener(value = DeviceDeleteReceiverInterface.INPUT)
-    public void input(List<Long> idList){
-        if (null == idList || idList.size() == 0){
-            return;
-        }
-        //  删除设备配置
-        DeviceOptionsDto deviceOptionsDto = new DeviceOptionsDto();
-        deviceOptionsDto.setDeviceIds(idList);
-        this.deviceOptionsFeign.deleteOptions(deviceOptionsDto);
-        //  删除设备的所有授权记录
-        Wrapper<DeviceAuthorize> wrapper = new EntityWrapper<>();
-        wrapper.in("l_device_id",idList);
-        this.deviceAuthorizeServiceInterface.delete(wrapper);
-    }
-
-}