- * 红外区域测温数据表 前端控制器 - *
- * - * @author jingjing - * @since 2024-05-20 - */ -@RestController -@RequestMapping("/data-eaif-hentity") -public class DataEaifHController { - -} diff --git a/src/main/java/com/shxy/xyhkcamera/controller/ModevEaifController.java b/src/main/java/com/shxy/xyhkcamera/controller/ModevEaifController.java deleted file mode 100644 index 414ba62..0000000 --- a/src/main/java/com/shxy/xyhkcamera/controller/ModevEaifController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.shxy.xyhkcamera.controller; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *- * 前端控制器 - *
- * - * @author jingjing - * @since 2024-05-20 - */ -@RestController -@RequestMapping("/modev-eaif-entity") -public class ModevEaifController { - -} diff --git a/src/main/java/com/shxy/xyhkcamera/entity/DataEaifHEntity.java b/src/main/java/com/shxy/xyhkcamera/entity/DataEaifHEntity.java index 9167c67..99268c5 100644 --- a/src/main/java/com/shxy/xyhkcamera/entity/DataEaifHEntity.java +++ b/src/main/java/com/shxy/xyhkcamera/entity/DataEaifHEntity.java @@ -8,8 +8,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.time.LocalDateTime; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; @@ -24,55 +22,42 @@ import lombok.Setter; @Getter @Setter @TableName("data_eaif_h") -@ApiModel(value = "DataEaifHEntity对象", description = "红外区域测温数据表") public class DataEaifHEntity implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty("自动编号") @TableId(value = "data_id", type = IdType.AUTO) private Integer dataId; - @ApiModelProperty("设备ID") @TableField("eqmid") private Integer eqmid; - @ApiModelProperty("点、线、区域ID") @TableField("areaid") private Integer areaid; - @ApiModelProperty("采集时间") @TableField("capturetime") private LocalDateTime capturetime; - @ApiModelProperty("最大温度") @TableField("maxtemp") private Double maxtemp; - @ApiModelProperty("最小温度") @TableField("mintemp") private Double mintemp; - @ApiModelProperty("平均温度") @TableField("avgtemp") private Double avgtemp; - @ApiModelProperty("1=>摄氏度2=>华氏度") @TableField("unit") private Byte unit; - @ApiModelProperty("1->点2->线3->框") @TableField("type") private Byte type; - @ApiModelProperty("中间差") @TableField("mid") private Double mid; - @ApiModelProperty("标准方差值") @TableField("std") private Double std; - @TableField("isupload") private Integer isupload; } diff --git a/src/main/java/com/shxy/xyhkcamera/entity/ModevEaifEntity.java b/src/main/java/com/shxy/xyhkcamera/entity/ModevEaifEntity.java index 59f8052..7116cac 100644 --- a/src/main/java/com/shxy/xyhkcamera/entity/ModevEaifEntity.java +++ b/src/main/java/com/shxy/xyhkcamera/entity/ModevEaifEntity.java @@ -4,15 +4,15 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; + import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + import lombok.Getter; import lombok.Setter; /** *- * + * *
* * @author jingjing @@ -21,26 +21,22 @@ import lombok.Setter; @Getter @Setter @TableName("modev_eaif") -@ApiModel(value = "ModevEaifEntity对象", description = "") public class ModevEaifEntity implements Serializable { private static final long serialVersionUID = 1L; - @TableId(value = "id", type = IdType.AUTO) + @TableId(value = "id", type = IdType.AUTO) private Integer id; @TableField("eqmid") private Integer eqmid; - @ApiModelProperty("预置点id") @TableField("nPresetId") private Integer nPresetId; - @ApiModelProperty("规则编号") @TableField("nRuleId") private Integer nRuleId; - @ApiModelProperty("规则类型") @TableField("nMeterType") private Integer nMeterType; } diff --git a/src/main/java/com/shxy/xyhkcamera/entity/ModevEntity.java b/src/main/java/com/shxy/xyhkcamera/entity/ModevEntity.java new file mode 100644 index 0000000..ba02e95 --- /dev/null +++ b/src/main/java/com/shxy/xyhkcamera/entity/ModevEntity.java @@ -0,0 +1,97 @@ +package com.shxy.xyhkcamera.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serializable; +import java.time.LocalDate; + +import lombok.Getter; +import lombok.Setter; + +/** + *+ * 监测设备表 + *
+ * + * @author jingjing + * @since 2024-05-20 + */ +@Getter +@Setter +@TableName("modev") +public class ModevEntity implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @TableField("name") + private String name; + + @TableField("modevtid") + private Integer modevtid; + + @TableField("address") + private Integer address; + + @TableField("frequency") + private Integer frequency; + + @TableField("portname") + private String portname; + + @TableField("zsbid") + private Integer zsbid; + + @TableField("iedid") + private Integer iedid; + + @TableField("equipmentmodel") + private String equipmentmodel; + + @TableField("manufacture") + private String manufacture; + + @TableField("factoryint") + private String factoryint; + + @TableField("manufacturedate") + private LocalDate manufacturedate; + + @TableField("rundate") + private LocalDate rundate; + + @TableField("location") + private String location; + + @TableField("note") + private String note; + + @TableField("znxjdevid") + private String znxjdevid; + + @TableField("ip") + private String ip; + + @TableField("username") + private String username; + + @TableField("pwd") + private String pwd; + + @TableField("port") + private String port; + + @TableField("nPresetId") + private Integer nPresetId; + + @TableField("nRuleId") + private Integer nRuleId; + + @TableField("nMeterType") + private Integer nMeterType; +} diff --git a/src/main/java/com/shxy/xyhkcamera/HCNetSDK.java b/src/main/java/com/shxy/xyhkcamera/hk/HCNetSDK.java similarity index 99% rename from src/main/java/com/shxy/xyhkcamera/HCNetSDK.java rename to src/main/java/com/shxy/xyhkcamera/hk/HCNetSDK.java index 640f6ac..d183da9 100644 --- a/src/main/java/com/shxy/xyhkcamera/HCNetSDK.java +++ b/src/main/java/com/shxy/xyhkcamera/hk/HCNetSDK.java @@ -1,4 +1,4 @@ -package com.shxy.xyhkcamera; +package com.shxy.xyhkcamera.hk; import com.sun.jna.*; diff --git a/src/main/java/com/shxy/xyhkcamera/HcNetSdkUtil.java b/src/main/java/com/shxy/xyhkcamera/hk/HcNetSdkUtil.java similarity index 96% rename from src/main/java/com/shxy/xyhkcamera/HcNetSdkUtil.java rename to src/main/java/com/shxy/xyhkcamera/hk/HcNetSdkUtil.java index f803ef5..08114eb 100644 --- a/src/main/java/com/shxy/xyhkcamera/HcNetSdkUtil.java +++ b/src/main/java/com/shxy/xyhkcamera/hk/HcNetSdkUtil.java @@ -1,4 +1,4 @@ -package com.shxy.xyhkcamera; +package com.shxy.xyhkcamera.hk; import com.sun.jna.Native; import com.sun.jna.Pointer; @@ -21,22 +21,6 @@ public class HcNetSdkUtil { private HCNetSDK hCNetSDK = null; - /** - * 用户登录返回句柄 - */ - private int userID; - /** - * win32 dll文件路径 - */ - @Value("${hkconfig.winpath}") - private String winPath; - /** - * linux dll文件路径 - */ - @Value("${hkconfig.linuxpath}") - private String linuxPath; - - static FExceptionCallBack_Imp fExceptionCallBack; static class FExceptionCallBack_Imp implements HCNetSDK.FExceptionCallBack { diff --git a/src/main/java/com/shxy/xyhkcamera/OSUtils.java b/src/main/java/com/shxy/xyhkcamera/hk/OSUtils.java similarity index 99% rename from src/main/java/com/shxy/xyhkcamera/OSUtils.java rename to src/main/java/com/shxy/xyhkcamera/hk/OSUtils.java index d6d6715..3ba3c50 100644 --- a/src/main/java/com/shxy/xyhkcamera/OSUtils.java +++ b/src/main/java/com/shxy/xyhkcamera/hk/OSUtils.java @@ -1,4 +1,4 @@ -package com.shxy.xyhkcamera; +package com.shxy.xyhkcamera.hk; import com.sun.jna.Platform; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/shxy/xyhkcamera/impl/TempMeasureServiceImpl.java b/src/main/java/com/shxy/xyhkcamera/impl/TempMeasureServiceImpl.java deleted file mode 100644 index d16bdae..0000000 --- a/src/main/java/com/shxy/xyhkcamera/impl/TempMeasureServiceImpl.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.shxy.xyhkcamera.impl; - -import com.shxy.xyhkcamera.service.TempMeasureService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -@Service -@Slf4j -public class TempMeasureServiceImpl implements TempMeasureService { - @Override - public void measure() { -// hcNetSdkUtil.createSDKInstance(); - } -} diff --git a/src/main/java/com/shxy/xyhkcamera/mapper/ModevMapper.java b/src/main/java/com/shxy/xyhkcamera/mapper/ModevMapper.java new file mode 100644 index 0000000..07224b1 --- /dev/null +++ b/src/main/java/com/shxy/xyhkcamera/mapper/ModevMapper.java @@ -0,0 +1,16 @@ +package com.shxy.xyhkcamera.mapper; + +import com.shxy.xyhkcamera.entity.ModevEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *+ * 监测设备表 Mapper 接口 + *
+ * + * @author jingjing + * @since 2024-05-20 + */ +public interface ModevMapper extends BaseMapper+ * 监测设备表 服务类 + *
+ * + * @author jingjing + * @since 2024-05-20 + */ +public interface ModevService extends IService+ * 监测设备表 服务实现类 + *
+ * + * @author jingjing + * @since 2024-05-20 + */ +@Service +public class ModevServiceImp extends ServiceImpl