调整字段

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/deviceLesm/controller/DeviceInformationController.java

@@ -260,8 +260,6 @@ public class DeviceInformationController extends JeecgController<DeviceInformati
 				list.forEach(deviceinfo -> {
 					QueryWrapper<DeviceRegion> queryWrapper = new QueryWrapper<>();
 					queryWrapper.eq("region_title", deviceinfo.getDeviceRegionId());
-					// 设备状态处理
-					deviceinfo.setStatus("1");
 					// 设备区域处理
 					DeviceRegion deviceRegion = deviceRegionService.getOne(queryWrapper);
 					if(deviceRegion == null) {
@@ -289,20 +287,4 @@ public class DeviceInformationController extends JeecgController<DeviceInformati
 		}
 		return Result.OK("文件导入失败！");
     }
-
-
-	 /**
-	  * 通过区域划分获取设备
-	  *
-	  * @return
-	  */
-	 @GetMapping(value = "/getByRegion")
-	 public Result<List<DeviceInformation>> getByRegion(@RequestParam(name = "region") String region,@RequestParam(name = "region") String type) {
-		 LambdaQueryWrapper<DeviceInformation> eq = new LambdaQueryWrapper<DeviceInformation>()
-				 .eq(DeviceInformation::getDeviceRegionId, region)
-				 .isNull(DeviceInformation::getFreq)
-				 .eq(DeviceInformation::getDeviceGather,type);
-		 return Result.OK(deviceInformationService.list(eq));
-	 }
-
 }

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

@@ -41,57 +41,14 @@ public class DeviceInformation implements Serializable {
 	@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;
@@ -111,42 +68,4 @@ public class DeviceInformation implements Serializable {
     @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;
 }