设备信息代码优化01

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/deviceLesm/mapper/DeviceInformationLesmMapper.java → zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/deviceLesm/mapper/DeviceInformationMapper.java

@@ -9,6 +9,6 @@ import org.jeecg.modules.deviceLesm.entity.DeviceInformation;
  * @Date:   2024-09-19
  * @Version: V1.0
  */
-public interface DeviceInformationLesmMapper extends BaseMapper<DeviceInformation> {
+public interface DeviceInformationMapper extends BaseMapper<DeviceInformation> {
 
 }

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/deviceLesm/mapper/xml/DeviceInformationMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.deviceLesm.mapper.DeviceInformationLesmMapper">
+<mapper namespace="org.jeecg.modules.deviceLesm.mapper.DeviceInformationMapper">
 
 </mapper>

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/deviceLesm/service/impl/DeviceInformationServiceImpl.java

@@ -3,7 +3,7 @@ package org.jeecg.modules.deviceLesm.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.modules.deviceLesm.entity.DeviceInformation;
-import org.jeecg.modules.deviceLesm.mapper.DeviceInformationLesmMapper;
+import org.jeecg.modules.deviceLesm.mapper.DeviceInformationMapper;
 import org.jeecg.modules.deviceLesm.service.IDeviceInformationService;
 import org.springframework.stereotype.Service;
 
@@ -14,6 +14,6 @@ import org.springframework.stereotype.Service;
  * @Version: V1.0
  */
 @Service
-public class DeviceInformationServiceImpl extends ServiceImpl<DeviceInformationLesmMapper, DeviceInformation> implements IDeviceInformationService {
+public class DeviceInformationServiceImpl extends ServiceImpl<DeviceInformationMapper, DeviceInformation> implements IDeviceInformationService {
 
 }

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/events/entity/DeviceInformation.java

@@ -1,152 +0,0 @@
-package org.jeecg.modules.events.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecg.common.aspect.annotation.Dict;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @Description: 设备管理信息表
- * @Author: jeecg-boot
- * @Date:   2024-09-19
- * @Version: V1.0
- */
-@Data
-@TableName("device_information")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="device_information对象", description="设备管理信息表")
-public class DeviceInformation implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
-    @ApiModelProperty(value = "主键")
-    private String id;
-	/**区域名称*/
-	@Excel(name = "区域名称", width = 15)
-    @ApiModelProperty(value = "区域名称")
-    @Dict(dicCode = "id",dictTable="device_region",dicText="region_title")
-    private String deviceRegionId;
-	/**设备名称*/
-	@Excel(name = "设备名称", width = 15)
-    @ApiModelProperty(value = "设备名称")
-    private String deviceTitle;
-	/**设备类型*/
-	@Excel(name = "设备类型", width = 15, dicCode = "equipment_model")
-    @ApiModelProperty(value = "设备类型")
-    @Dict(dicCode = "equipment_model")
-    private String s7Model;
-	/**设备编码*/
-	@Excel(name = "设备编码", width = 15)
-    @ApiModelProperty(value = "设备编码")
-    private String deviceCode;
-	/**ip*/
-	@Excel(name = "ip", width = 15)
-    @ApiModelProperty(value = "ip")
-    private String deviceIp;
-	/**端口*/
-	@Excel(name = "端口", width = 15)
-    @ApiModelProperty(value = "端口")
-    private String devicePort;
-	/**机架号*/
-	@Excel(name = "机架号", width = 15)
-    @ApiModelProperty(value = "机架号")
-    private Integer s7Rack;
-	/**槽号*/
-	@Excel(name = "槽号", width = 15)
-    @ApiModelProperty(value = "槽号")
-    private String s7Slot;
-	/**安装地址*/
-	@Excel(name = "安装地址", width = 15)
-    @ApiModelProperty(value = "安装地址")
-    private String deviceAddress;
-	/**最长位宽*/
-	@Excel(name = "最长位宽", width = 15)
-    @ApiModelProperty(value = "最长位宽")
-    private String s7LongestWidth;
-	/**备注*/
-	@Excel(name = "备注", width = 15)
-    @ApiModelProperty(value = "备注")
-    private String deviceRemark;
-	/**采集通道*/
-	@Excel(name = "采集通道", width = 15, dicCode = "device_information_gather")
-    @ApiModelProperty(value = "采集通道")
-    @Dict(dicCode = "device_information_gather")
-    private String deviceGather;
-	/**从站号*/
-	@Excel(name = "从站号", width = 15)
-    @ApiModelProperty(value = "从站号")
-    private Integer modbusDeviceNum;
-	/**运行状态*/
-	@Excel(name = "运行状态", width = 15, dicCode = "sfqy")
-    @ApiModelProperty(value = "运行状态")
-    @Dict(dicCode = "sfqy")
-    private String status;
-	/**所在部门*/
-    @ApiModelProperty(value = "所在部门")
-    private String sysOrgCode;
-	/**创建人*/
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-	/**更新人*/
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-	/**创建日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "创建日期")
-    private Date createTime;
-	/**更新日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "更新日期")
-    private Date updateTime;
-	/**clsid*/
-	@Excel(name = "clsid", width = 15)
-    @ApiModelProperty(value = "clsid")
-    private String opcClsid;
-	/**用户名*/
-	@Excel(name = "用户名", width = 15)
-    @ApiModelProperty(value = "用户名")
-    private String opcUsername;
-	/**密码*/
-	@Excel(name = "密码", width = 15)
-    @ApiModelProperty(value = "密码")
-    private String opcPassword;
-	/**注册表中的名称*/
-	@Excel(name = "注册表中的名称", width = 15)
-    @ApiModelProperty(value = "注册表中的名称")
-    private String opcRegname;
-	/**opc版本号*/
-	@Excel(name = "opc版本号", width = 15)
-    @ApiModelProperty(value = "opc版本号")
-    private String opcVersion;
-	/**opc中文名称*/
-	@Excel(name = "opc中文名称", width = 15)
-    @ApiModelProperty(value = "opc中文名称")
-    private String opcZhName;
-	/**opc英文名称*/
-	@Excel(name = "opc英文名称", width = 15)
-    @ApiModelProperty(value = "opc英文名称")
-    private String opcEnName;
-    /**opc域*/
-    @Excel(name = "opc域", width = 15)
-    @ApiModelProperty(value = "opc域")
-    private String opcDomain;
-    /**采集频率*/
-    @Excel(name = "采集频率", width = 15)
-    @ApiModelProperty(value = "采集频率")
-    @Dict(dicCode = "device_freq")
-    @TableField(updateStrategy = FieldStrategy.IGNORED)
-    private String freq;
-}

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/events/mapper/DeviceInformationMapper.java

@@ -1,14 +0,0 @@
-package org.jeecg.modules.events.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.events.entity.DeviceInformation;
-
-/**
- * @Description: 设备管理信息表
- * @Author: jeecg-boot
- * @Date:   2024-09-19
- * @Version: V1.0
- */
-public interface DeviceInformationMapper extends BaseMapper<DeviceInformation> {
-
-}

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/events/mapper/xml/DeviceInformationMapper.xml

@@ -1,5 +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="org.jeecg.modules.events.mapper.DeviceInformationMapper">
-
-</mapper>

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/events/service/impl/LeanEventsHostServiceImpl.java

@@ -3,10 +3,10 @@ package org.jeecg.modules.events.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.deviceLesm.mapper.DeviceInformationMapper;
 import org.jeecg.modules.events.entity.LeanEventsHost;
 import org.jeecg.modules.events.entity.LeanEventsHostEditParam;
 import org.jeecg.modules.events.entity.LeanEventsHostResult;
-import org.jeecg.modules.events.mapper.DeviceInformationMapper;
 import org.jeecg.modules.events.mapper.LeanEventsHostMapper;
 import org.jeecg.modules.events.service.ILeanEventsHostService;
 import org.jeecg.modules.leanEventHostConfig.entity.LeanEventsHostConfig;