diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 293a8e4..49681d5 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -1262,7 +1262,7 @@ - AS logtime + AS logtime,dh.DESCN AS descn FROM data_hydrant dh JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE @@ -1277,13 +1277,13 @@ and w.DEPTID = #{deptid} - and glview.UPTIME = ]]> + and dh.LOGTIME = ]]> - and glview.UPTIME + and dh.LOGTIME diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 293a8e4..49681d5 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -1262,7 +1262,7 @@ - AS logtime + AS logtime,dh.DESCN AS descn FROM data_hydrant dh JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE @@ -1277,13 +1277,13 @@ and w.DEPTID = #{deptid} - and glview.UPTIME = ]]> + and dh.LOGTIME = ]]> - and glview.UPTIME + and dh.LOGTIME diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java index 74c91d3..35ef9bc 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java @@ -27,7 +27,7 @@ private String wellCode; @ExcelProperty("点位名称") private String wellName; - @ExcelProperty("点位深") + @ExcelProperty("井深") private Integer deep; @ExcelProperty("详细地址") private String position; diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 293a8e4..49681d5 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -1262,7 +1262,7 @@ - AS logtime + AS logtime,dh.DESCN AS descn FROM data_hydrant dh JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE @@ -1277,13 +1277,13 @@ and w.DEPTID = #{deptid} - and glview.UPTIME = ]]> + and dh.LOGTIME = ]]> - and glview.UPTIME + and dh.LOGTIME diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java index 74c91d3..35ef9bc 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java @@ -27,7 +27,7 @@ private String wellCode; @ExcelProperty("点位名称") private String wellName; - @ExcelProperty("点位深") + @ExcelProperty("井深") private Integer deep; @ExcelProperty("详细地址") private String position; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java index 455c641..7d5dfd3 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java @@ -36,4 +36,6 @@ private String status; @ExcelProperty("记录时间") private String logtime; + @ExcelProperty("描述") + private String descn; } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 293a8e4..49681d5 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -1262,7 +1262,7 @@ - AS logtime + AS logtime,dh.DESCN AS descn FROM data_hydrant dh JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE @@ -1277,13 +1277,13 @@ and w.DEPTID = #{deptid} - and glview.UPTIME = ]]> + and dh.LOGTIME = ]]> - and glview.UPTIME + and dh.LOGTIME diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java index 74c91d3..35ef9bc 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java @@ -27,7 +27,7 @@ private String wellCode; @ExcelProperty("点位名称") private String wellName; - @ExcelProperty("点位深") + @ExcelProperty("井深") private Integer deep; @ExcelProperty("详细地址") private String position; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java index 455c641..7d5dfd3 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java @@ -36,4 +36,6 @@ private String status; @ExcelProperty("记录时间") private String logtime; + @ExcelProperty("描述") + private String descn; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java index fcc035e..b27c7cd 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -12,6 +12,8 @@ import org.hibernate.validator.constraints.NotEmpty; import javax.validation.constraints.Digits; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.util.Date; /** @@ -40,15 +42,15 @@ /** * 井盖编号 */ - @ExcelProperty("井编号") - @NotEmpty(message = "闸井编号不能为空") + @ExcelProperty("点位编号") + @NotEmpty(message = "点位编号不能为空") @TableField("WELL_CODE") private String wellCode; /** * 井盖名称 */ - @ExcelProperty("井名称") - @NotEmpty(message = "闸井名称不能为空") + @ExcelProperty("点位名称") + @NotEmpty(message = "点位名称不能为空") @TableField("WELL_NAME") private String wellName; /** @@ -63,14 +65,14 @@ * 地区 */ @ExcelProperty("区") - @NotEmpty(message = "区不能为空") + @NotBlank(message = "区不能为空") @TableField(exist = false) private String qu; /** * 区域 */ @ExcelProperty("街道") - @NotEmpty(message = "街道不能为空") + @NotBlank(message = "街道不能为空") @TableField("AREA") private String area; /** @@ -113,14 +115,14 @@ * 位置 */ @ExcelProperty("详细地址") - @NotEmpty(message = "详细地址不能为空") + @NotBlank(message = "详细地址不能为空") @TableField("POSITION") private String position; /** * 部门编号 */ @ExcelProperty("权属单位代码") - @NotEmpty(message = "权属单位代码不能为空") + @NotNull(message = "权属单位代码不能为空") @TableField("DEPTID") private Long deptid; /** @@ -136,8 +138,8 @@ /** * 井类型 */ - @ExcelProperty("井类型") - @NotEmpty(message = "闸井类型不能为空") + @ExcelProperty("点位类型") + @NotBlank(message = "点位类型不能为空") @TableField("WELL_TYPE") private String wellType; @@ -180,8 +182,8 @@ /** * 维护单位/小组id */ - @ExcelProperty("井维护单位代码") - @NotEmpty(message = "闸井维护单位代码不能为空") + @ExcelProperty("点位维护单位代码") + @NotNull(message = "点位维护单位代码不能为空") @TableField("RESPONSIBLE_DEPT") private Long responsibleDept; diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 293a8e4..49681d5 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -1262,7 +1262,7 @@ - AS logtime + AS logtime,dh.DESCN AS descn FROM data_hydrant dh JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE @@ -1277,13 +1277,13 @@ and w.DEPTID = #{deptid} - and glview.UPTIME = ]]> + and dh.LOGTIME = ]]> - and glview.UPTIME + and dh.LOGTIME diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java index 74c91d3..35ef9bc 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java @@ -27,7 +27,7 @@ private String wellCode; @ExcelProperty("点位名称") private String wellName; - @ExcelProperty("点位深") + @ExcelProperty("井深") private Integer deep; @ExcelProperty("详细地址") private String position; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java index 455c641..7d5dfd3 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java @@ -36,4 +36,6 @@ private String status; @ExcelProperty("记录时间") private String logtime; + @ExcelProperty("描述") + private String descn; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java index fcc035e..b27c7cd 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -12,6 +12,8 @@ import org.hibernate.validator.constraints.NotEmpty; import javax.validation.constraints.Digits; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.util.Date; /** @@ -40,15 +42,15 @@ /** * 井盖编号 */ - @ExcelProperty("井编号") - @NotEmpty(message = "闸井编号不能为空") + @ExcelProperty("点位编号") + @NotEmpty(message = "点位编号不能为空") @TableField("WELL_CODE") private String wellCode; /** * 井盖名称 */ - @ExcelProperty("井名称") - @NotEmpty(message = "闸井名称不能为空") + @ExcelProperty("点位名称") + @NotEmpty(message = "点位名称不能为空") @TableField("WELL_NAME") private String wellName; /** @@ -63,14 +65,14 @@ * 地区 */ @ExcelProperty("区") - @NotEmpty(message = "区不能为空") + @NotBlank(message = "区不能为空") @TableField(exist = false) private String qu; /** * 区域 */ @ExcelProperty("街道") - @NotEmpty(message = "街道不能为空") + @NotBlank(message = "街道不能为空") @TableField("AREA") private String area; /** @@ -113,14 +115,14 @@ * 位置 */ @ExcelProperty("详细地址") - @NotEmpty(message = "详细地址不能为空") + @NotBlank(message = "详细地址不能为空") @TableField("POSITION") private String position; /** * 部门编号 */ @ExcelProperty("权属单位代码") - @NotEmpty(message = "权属单位代码不能为空") + @NotNull(message = "权属单位代码不能为空") @TableField("DEPTID") private Long deptid; /** @@ -136,8 +138,8 @@ /** * 井类型 */ - @ExcelProperty("井类型") - @NotEmpty(message = "闸井类型不能为空") + @ExcelProperty("点位类型") + @NotBlank(message = "点位类型不能为空") @TableField("WELL_TYPE") private String wellType; @@ -180,8 +182,8 @@ /** * 维护单位/小组id */ - @ExcelProperty("井维护单位代码") - @NotEmpty(message = "闸井维护单位代码不能为空") + @ExcelProperty("点位维护单位代码") + @NotNull(message = "点位维护单位代码不能为空") @TableField("RESPONSIBLE_DEPT") private Long responsibleDept; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java index 479eeb3..88ab771 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java @@ -100,7 +100,7 @@ @ExcelProperty("设备类型") @TableField(exist = false) private String deviceTypeName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") @TableField(exist = false) private String wellCode; @ExcelProperty("数据集中器编号") diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 293a8e4..49681d5 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -1262,7 +1262,7 @@ - AS logtime + AS logtime,dh.DESCN AS descn FROM data_hydrant dh JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE @@ -1277,13 +1277,13 @@ and w.DEPTID = #{deptid} - and glview.UPTIME = ]]> + and dh.LOGTIME = ]]> - and glview.UPTIME + and dh.LOGTIME diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java index 74c91d3..35ef9bc 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java @@ -27,7 +27,7 @@ private String wellCode; @ExcelProperty("点位名称") private String wellName; - @ExcelProperty("点位深") + @ExcelProperty("井深") private Integer deep; @ExcelProperty("详细地址") private String position; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java index 455c641..7d5dfd3 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java @@ -36,4 +36,6 @@ private String status; @ExcelProperty("记录时间") private String logtime; + @ExcelProperty("描述") + private String descn; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java index fcc035e..b27c7cd 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -12,6 +12,8 @@ import org.hibernate.validator.constraints.NotEmpty; import javax.validation.constraints.Digits; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.util.Date; /** @@ -40,15 +42,15 @@ /** * 井盖编号 */ - @ExcelProperty("井编号") - @NotEmpty(message = "闸井编号不能为空") + @ExcelProperty("点位编号") + @NotEmpty(message = "点位编号不能为空") @TableField("WELL_CODE") private String wellCode; /** * 井盖名称 */ - @ExcelProperty("井名称") - @NotEmpty(message = "闸井名称不能为空") + @ExcelProperty("点位名称") + @NotEmpty(message = "点位名称不能为空") @TableField("WELL_NAME") private String wellName; /** @@ -63,14 +65,14 @@ * 地区 */ @ExcelProperty("区") - @NotEmpty(message = "区不能为空") + @NotBlank(message = "区不能为空") @TableField(exist = false) private String qu; /** * 区域 */ @ExcelProperty("街道") - @NotEmpty(message = "街道不能为空") + @NotBlank(message = "街道不能为空") @TableField("AREA") private String area; /** @@ -113,14 +115,14 @@ * 位置 */ @ExcelProperty("详细地址") - @NotEmpty(message = "详细地址不能为空") + @NotBlank(message = "详细地址不能为空") @TableField("POSITION") private String position; /** * 部门编号 */ @ExcelProperty("权属单位代码") - @NotEmpty(message = "权属单位代码不能为空") + @NotNull(message = "权属单位代码不能为空") @TableField("DEPTID") private Long deptid; /** @@ -136,8 +138,8 @@ /** * 井类型 */ - @ExcelProperty("井类型") - @NotEmpty(message = "闸井类型不能为空") + @ExcelProperty("点位类型") + @NotBlank(message = "点位类型不能为空") @TableField("WELL_TYPE") private String wellType; @@ -180,8 +182,8 @@ /** * 维护单位/小组id */ - @ExcelProperty("井维护单位代码") - @NotEmpty(message = "闸井维护单位代码不能为空") + @ExcelProperty("点位维护单位代码") + @NotNull(message = "点位维护单位代码不能为空") @TableField("RESPONSIBLE_DEPT") private Long responsibleDept; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java index 479eeb3..88ab771 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java @@ -100,7 +100,7 @@ @ExcelProperty("设备类型") @TableField(exist = false) private String deviceTypeName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") @TableField(exist = false) private String wellCode; @ExcelProperty("数据集中器编号") diff --git a/casic-web/src/main/resources/config/export/configTemp.xlsx b/casic-web/src/main/resources/config/export/configTemp.xlsx index 151c5a4..ad46157 100644 --- a/casic-web/src/main/resources/config/export/configTemp.xlsx +++ b/casic-web/src/main/resources/config/export/configTemp.xlsx Binary files differ diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 293a8e4..49681d5 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -1262,7 +1262,7 @@ - AS logtime + AS logtime,dh.DESCN AS descn FROM data_hydrant dh JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE @@ -1277,13 +1277,13 @@ and w.DEPTID = #{deptid} - and glview.UPTIME = ]]> + and dh.LOGTIME = ]]> - and glview.UPTIME + and dh.LOGTIME diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java index 74c91d3..35ef9bc 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java @@ -27,7 +27,7 @@ private String wellCode; @ExcelProperty("点位名称") private String wellName; - @ExcelProperty("点位深") + @ExcelProperty("井深") private Integer deep; @ExcelProperty("详细地址") private String position; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java index 455c641..7d5dfd3 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java @@ -36,4 +36,6 @@ private String status; @ExcelProperty("记录时间") private String logtime; + @ExcelProperty("描述") + private String descn; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java index fcc035e..b27c7cd 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -12,6 +12,8 @@ import org.hibernate.validator.constraints.NotEmpty; import javax.validation.constraints.Digits; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.util.Date; /** @@ -40,15 +42,15 @@ /** * 井盖编号 */ - @ExcelProperty("井编号") - @NotEmpty(message = "闸井编号不能为空") + @ExcelProperty("点位编号") + @NotEmpty(message = "点位编号不能为空") @TableField("WELL_CODE") private String wellCode; /** * 井盖名称 */ - @ExcelProperty("井名称") - @NotEmpty(message = "闸井名称不能为空") + @ExcelProperty("点位名称") + @NotEmpty(message = "点位名称不能为空") @TableField("WELL_NAME") private String wellName; /** @@ -63,14 +65,14 @@ * 地区 */ @ExcelProperty("区") - @NotEmpty(message = "区不能为空") + @NotBlank(message = "区不能为空") @TableField(exist = false) private String qu; /** * 区域 */ @ExcelProperty("街道") - @NotEmpty(message = "街道不能为空") + @NotBlank(message = "街道不能为空") @TableField("AREA") private String area; /** @@ -113,14 +115,14 @@ * 位置 */ @ExcelProperty("详细地址") - @NotEmpty(message = "详细地址不能为空") + @NotBlank(message = "详细地址不能为空") @TableField("POSITION") private String position; /** * 部门编号 */ @ExcelProperty("权属单位代码") - @NotEmpty(message = "权属单位代码不能为空") + @NotNull(message = "权属单位代码不能为空") @TableField("DEPTID") private Long deptid; /** @@ -136,8 +138,8 @@ /** * 井类型 */ - @ExcelProperty("井类型") - @NotEmpty(message = "闸井类型不能为空") + @ExcelProperty("点位类型") + @NotBlank(message = "点位类型不能为空") @TableField("WELL_TYPE") private String wellType; @@ -180,8 +182,8 @@ /** * 维护单位/小组id */ - @ExcelProperty("井维护单位代码") - @NotEmpty(message = "闸井维护单位代码不能为空") + @ExcelProperty("点位维护单位代码") + @NotNull(message = "点位维护单位代码不能为空") @TableField("RESPONSIBLE_DEPT") private Long responsibleDept; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java index 479eeb3..88ab771 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java @@ -100,7 +100,7 @@ @ExcelProperty("设备类型") @TableField(exist = false) private String deviceTypeName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") @TableField(exist = false) private String wellCode; @ExcelProperty("数据集中器编号") diff --git a/casic-web/src/main/resources/config/export/configTemp.xlsx b/casic-web/src/main/resources/config/export/configTemp.xlsx index 151c5a4..ad46157 100644 --- a/casic-web/src/main/resources/config/export/configTemp.xlsx +++ b/casic-web/src/main/resources/config/export/configTemp.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/export/configTempEmp.xlsx b/casic-web/src/main/resources/config/export/configTempEmp.xlsx index ddf907e..cdffc56 100644 --- a/casic-web/src/main/resources/config/export/configTempEmp.xlsx +++ b/casic-web/src/main/resources/config/export/configTempEmp.xlsx Binary files differ diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 293a8e4..49681d5 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -1262,7 +1262,7 @@ - AS logtime + AS logtime,dh.DESCN AS descn FROM data_hydrant dh JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE @@ -1277,13 +1277,13 @@ and w.DEPTID = #{deptid} - and glview.UPTIME = ]]> + and dh.LOGTIME = ]]> - and glview.UPTIME + and dh.LOGTIME diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java index 74c91d3..35ef9bc 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java @@ -27,7 +27,7 @@ private String wellCode; @ExcelProperty("点位名称") private String wellName; - @ExcelProperty("点位深") + @ExcelProperty("井深") private Integer deep; @ExcelProperty("详细地址") private String position; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java index 455c641..7d5dfd3 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java @@ -36,4 +36,6 @@ private String status; @ExcelProperty("记录时间") private String logtime; + @ExcelProperty("描述") + private String descn; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java index fcc035e..b27c7cd 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -12,6 +12,8 @@ import org.hibernate.validator.constraints.NotEmpty; import javax.validation.constraints.Digits; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.util.Date; /** @@ -40,15 +42,15 @@ /** * 井盖编号 */ - @ExcelProperty("井编号") - @NotEmpty(message = "闸井编号不能为空") + @ExcelProperty("点位编号") + @NotEmpty(message = "点位编号不能为空") @TableField("WELL_CODE") private String wellCode; /** * 井盖名称 */ - @ExcelProperty("井名称") - @NotEmpty(message = "闸井名称不能为空") + @ExcelProperty("点位名称") + @NotEmpty(message = "点位名称不能为空") @TableField("WELL_NAME") private String wellName; /** @@ -63,14 +65,14 @@ * 地区 */ @ExcelProperty("区") - @NotEmpty(message = "区不能为空") + @NotBlank(message = "区不能为空") @TableField(exist = false) private String qu; /** * 区域 */ @ExcelProperty("街道") - @NotEmpty(message = "街道不能为空") + @NotBlank(message = "街道不能为空") @TableField("AREA") private String area; /** @@ -113,14 +115,14 @@ * 位置 */ @ExcelProperty("详细地址") - @NotEmpty(message = "详细地址不能为空") + @NotBlank(message = "详细地址不能为空") @TableField("POSITION") private String position; /** * 部门编号 */ @ExcelProperty("权属单位代码") - @NotEmpty(message = "权属单位代码不能为空") + @NotNull(message = "权属单位代码不能为空") @TableField("DEPTID") private Long deptid; /** @@ -136,8 +138,8 @@ /** * 井类型 */ - @ExcelProperty("井类型") - @NotEmpty(message = "闸井类型不能为空") + @ExcelProperty("点位类型") + @NotBlank(message = "点位类型不能为空") @TableField("WELL_TYPE") private String wellType; @@ -180,8 +182,8 @@ /** * 维护单位/小组id */ - @ExcelProperty("井维护单位代码") - @NotEmpty(message = "闸井维护单位代码不能为空") + @ExcelProperty("点位维护单位代码") + @NotNull(message = "点位维护单位代码不能为空") @TableField("RESPONSIBLE_DEPT") private Long responsibleDept; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java index 479eeb3..88ab771 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java @@ -100,7 +100,7 @@ @ExcelProperty("设备类型") @TableField(exist = false) private String deviceTypeName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") @TableField(exist = false) private String wellCode; @ExcelProperty("数据集中器编号") diff --git a/casic-web/src/main/resources/config/export/configTemp.xlsx b/casic-web/src/main/resources/config/export/configTemp.xlsx index 151c5a4..ad46157 100644 --- a/casic-web/src/main/resources/config/export/configTemp.xlsx +++ b/casic-web/src/main/resources/config/export/configTemp.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/export/configTempEmp.xlsx b/casic-web/src/main/resources/config/export/configTempEmp.xlsx index ddf907e..cdffc56 100644 --- a/casic-web/src/main/resources/config/export/configTempEmp.xlsx +++ b/casic-web/src/main/resources/config/export/configTempEmp.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/export/device.xlsx b/casic-web/src/main/resources/config/export/device.xlsx index a2aa957..79eedd9 100644 --- a/casic-web/src/main/resources/config/export/device.xlsx +++ b/casic-web/src/main/resources/config/export/device.xlsx Binary files differ diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 293a8e4..49681d5 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -1262,7 +1262,7 @@ - AS logtime + AS logtime,dh.DESCN AS descn FROM data_hydrant dh JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE @@ -1277,13 +1277,13 @@ and w.DEPTID = #{deptid} - and glview.UPTIME = ]]> + and dh.LOGTIME = ]]> - and glview.UPTIME + and dh.LOGTIME diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java index 74c91d3..35ef9bc 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java @@ -27,7 +27,7 @@ private String wellCode; @ExcelProperty("点位名称") private String wellName; - @ExcelProperty("点位深") + @ExcelProperty("井深") private Integer deep; @ExcelProperty("详细地址") private String position; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java index 455c641..7d5dfd3 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java @@ -36,4 +36,6 @@ private String status; @ExcelProperty("记录时间") private String logtime; + @ExcelProperty("描述") + private String descn; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java index fcc035e..b27c7cd 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -12,6 +12,8 @@ import org.hibernate.validator.constraints.NotEmpty; import javax.validation.constraints.Digits; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.util.Date; /** @@ -40,15 +42,15 @@ /** * 井盖编号 */ - @ExcelProperty("井编号") - @NotEmpty(message = "闸井编号不能为空") + @ExcelProperty("点位编号") + @NotEmpty(message = "点位编号不能为空") @TableField("WELL_CODE") private String wellCode; /** * 井盖名称 */ - @ExcelProperty("井名称") - @NotEmpty(message = "闸井名称不能为空") + @ExcelProperty("点位名称") + @NotEmpty(message = "点位名称不能为空") @TableField("WELL_NAME") private String wellName; /** @@ -63,14 +65,14 @@ * 地区 */ @ExcelProperty("区") - @NotEmpty(message = "区不能为空") + @NotBlank(message = "区不能为空") @TableField(exist = false) private String qu; /** * 区域 */ @ExcelProperty("街道") - @NotEmpty(message = "街道不能为空") + @NotBlank(message = "街道不能为空") @TableField("AREA") private String area; /** @@ -113,14 +115,14 @@ * 位置 */ @ExcelProperty("详细地址") - @NotEmpty(message = "详细地址不能为空") + @NotBlank(message = "详细地址不能为空") @TableField("POSITION") private String position; /** * 部门编号 */ @ExcelProperty("权属单位代码") - @NotEmpty(message = "权属单位代码不能为空") + @NotNull(message = "权属单位代码不能为空") @TableField("DEPTID") private Long deptid; /** @@ -136,8 +138,8 @@ /** * 井类型 */ - @ExcelProperty("井类型") - @NotEmpty(message = "闸井类型不能为空") + @ExcelProperty("点位类型") + @NotBlank(message = "点位类型不能为空") @TableField("WELL_TYPE") private String wellType; @@ -180,8 +182,8 @@ /** * 维护单位/小组id */ - @ExcelProperty("井维护单位代码") - @NotEmpty(message = "闸井维护单位代码不能为空") + @ExcelProperty("点位维护单位代码") + @NotNull(message = "点位维护单位代码不能为空") @TableField("RESPONSIBLE_DEPT") private Long responsibleDept; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java index 479eeb3..88ab771 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java @@ -100,7 +100,7 @@ @ExcelProperty("设备类型") @TableField(exist = false) private String deviceTypeName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") @TableField(exist = false) private String wellCode; @ExcelProperty("数据集中器编号") diff --git a/casic-web/src/main/resources/config/export/configTemp.xlsx b/casic-web/src/main/resources/config/export/configTemp.xlsx index 151c5a4..ad46157 100644 --- a/casic-web/src/main/resources/config/export/configTemp.xlsx +++ b/casic-web/src/main/resources/config/export/configTemp.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/export/configTempEmp.xlsx b/casic-web/src/main/resources/config/export/configTempEmp.xlsx index ddf907e..cdffc56 100644 --- a/casic-web/src/main/resources/config/export/configTempEmp.xlsx +++ b/casic-web/src/main/resources/config/export/configTempEmp.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/export/device.xlsx b/casic-web/src/main/resources/config/export/device.xlsx index a2aa957..79eedd9 100644 --- a/casic-web/src/main/resources/config/export/device.xlsx +++ b/casic-web/src/main/resources/config/export/device.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/export/harmfulData.xlsx b/casic-web/src/main/resources/config/export/harmfulData.xlsx index c44d528..111226a 100644 --- a/casic-web/src/main/resources/config/export/harmfulData.xlsx +++ b/casic-web/src/main/resources/config/export/harmfulData.xlsx Binary files differ diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 293a8e4..49681d5 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -1262,7 +1262,7 @@ - AS logtime + AS logtime,dh.DESCN AS descn FROM data_hydrant dh JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE @@ -1277,13 +1277,13 @@ and w.DEPTID = #{deptid} - and glview.UPTIME = ]]> + and dh.LOGTIME = ]]> - and glview.UPTIME + and dh.LOGTIME diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java index 74c91d3..35ef9bc 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java @@ -27,7 +27,7 @@ private String wellCode; @ExcelProperty("点位名称") private String wellName; - @ExcelProperty("点位深") + @ExcelProperty("井深") private Integer deep; @ExcelProperty("详细地址") private String position; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java index 455c641..7d5dfd3 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java @@ -36,4 +36,6 @@ private String status; @ExcelProperty("记录时间") private String logtime; + @ExcelProperty("描述") + private String descn; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java index fcc035e..b27c7cd 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -12,6 +12,8 @@ import org.hibernate.validator.constraints.NotEmpty; import javax.validation.constraints.Digits; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.util.Date; /** @@ -40,15 +42,15 @@ /** * 井盖编号 */ - @ExcelProperty("井编号") - @NotEmpty(message = "闸井编号不能为空") + @ExcelProperty("点位编号") + @NotEmpty(message = "点位编号不能为空") @TableField("WELL_CODE") private String wellCode; /** * 井盖名称 */ - @ExcelProperty("井名称") - @NotEmpty(message = "闸井名称不能为空") + @ExcelProperty("点位名称") + @NotEmpty(message = "点位名称不能为空") @TableField("WELL_NAME") private String wellName; /** @@ -63,14 +65,14 @@ * 地区 */ @ExcelProperty("区") - @NotEmpty(message = "区不能为空") + @NotBlank(message = "区不能为空") @TableField(exist = false) private String qu; /** * 区域 */ @ExcelProperty("街道") - @NotEmpty(message = "街道不能为空") + @NotBlank(message = "街道不能为空") @TableField("AREA") private String area; /** @@ -113,14 +115,14 @@ * 位置 */ @ExcelProperty("详细地址") - @NotEmpty(message = "详细地址不能为空") + @NotBlank(message = "详细地址不能为空") @TableField("POSITION") private String position; /** * 部门编号 */ @ExcelProperty("权属单位代码") - @NotEmpty(message = "权属单位代码不能为空") + @NotNull(message = "权属单位代码不能为空") @TableField("DEPTID") private Long deptid; /** @@ -136,8 +138,8 @@ /** * 井类型 */ - @ExcelProperty("井类型") - @NotEmpty(message = "闸井类型不能为空") + @ExcelProperty("点位类型") + @NotBlank(message = "点位类型不能为空") @TableField("WELL_TYPE") private String wellType; @@ -180,8 +182,8 @@ /** * 维护单位/小组id */ - @ExcelProperty("井维护单位代码") - @NotEmpty(message = "闸井维护单位代码不能为空") + @ExcelProperty("点位维护单位代码") + @NotNull(message = "点位维护单位代码不能为空") @TableField("RESPONSIBLE_DEPT") private Long responsibleDept; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java index 479eeb3..88ab771 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java @@ -100,7 +100,7 @@ @ExcelProperty("设备类型") @TableField(exist = false) private String deviceTypeName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") @TableField(exist = false) private String wellCode; @ExcelProperty("数据集中器编号") diff --git a/casic-web/src/main/resources/config/export/configTemp.xlsx b/casic-web/src/main/resources/config/export/configTemp.xlsx index 151c5a4..ad46157 100644 --- a/casic-web/src/main/resources/config/export/configTemp.xlsx +++ b/casic-web/src/main/resources/config/export/configTemp.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/export/configTempEmp.xlsx b/casic-web/src/main/resources/config/export/configTempEmp.xlsx index ddf907e..cdffc56 100644 --- a/casic-web/src/main/resources/config/export/configTempEmp.xlsx +++ b/casic-web/src/main/resources/config/export/configTempEmp.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/export/device.xlsx b/casic-web/src/main/resources/config/export/device.xlsx index a2aa957..79eedd9 100644 --- a/casic-web/src/main/resources/config/export/device.xlsx +++ b/casic-web/src/main/resources/config/export/device.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/export/harmfulData.xlsx b/casic-web/src/main/resources/config/export/harmfulData.xlsx index c44d528..111226a 100644 --- a/casic-web/src/main/resources/config/export/harmfulData.xlsx +++ b/casic-web/src/main/resources/config/export/harmfulData.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/export/sluicewell.xlsx b/casic-web/src/main/resources/config/export/sluicewell.xlsx index f3b267d..4a480f2 100644 --- a/casic-web/src/main/resources/config/export/sluicewell.xlsx +++ b/casic-web/src/main/resources/config/export/sluicewell.xlsx Binary files differ diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 293a8e4..49681d5 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -1262,7 +1262,7 @@ - AS logtime + AS logtime,dh.DESCN AS descn FROM data_hydrant dh JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE @@ -1277,13 +1277,13 @@ and w.DEPTID = #{deptid} - and glview.UPTIME = ]]> + and dh.LOGTIME = ]]> - and glview.UPTIME + and dh.LOGTIME diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java index 74c91d3..35ef9bc 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java @@ -27,7 +27,7 @@ private String wellCode; @ExcelProperty("点位名称") private String wellName; - @ExcelProperty("点位深") + @ExcelProperty("井深") private Integer deep; @ExcelProperty("详细地址") private String position; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java index 455c641..7d5dfd3 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java @@ -36,4 +36,6 @@ private String status; @ExcelProperty("记录时间") private String logtime; + @ExcelProperty("描述") + private String descn; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java index fcc035e..b27c7cd 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -12,6 +12,8 @@ import org.hibernate.validator.constraints.NotEmpty; import javax.validation.constraints.Digits; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.util.Date; /** @@ -40,15 +42,15 @@ /** * 井盖编号 */ - @ExcelProperty("井编号") - @NotEmpty(message = "闸井编号不能为空") + @ExcelProperty("点位编号") + @NotEmpty(message = "点位编号不能为空") @TableField("WELL_CODE") private String wellCode; /** * 井盖名称 */ - @ExcelProperty("井名称") - @NotEmpty(message = "闸井名称不能为空") + @ExcelProperty("点位名称") + @NotEmpty(message = "点位名称不能为空") @TableField("WELL_NAME") private String wellName; /** @@ -63,14 +65,14 @@ * 地区 */ @ExcelProperty("区") - @NotEmpty(message = "区不能为空") + @NotBlank(message = "区不能为空") @TableField(exist = false) private String qu; /** * 区域 */ @ExcelProperty("街道") - @NotEmpty(message = "街道不能为空") + @NotBlank(message = "街道不能为空") @TableField("AREA") private String area; /** @@ -113,14 +115,14 @@ * 位置 */ @ExcelProperty("详细地址") - @NotEmpty(message = "详细地址不能为空") + @NotBlank(message = "详细地址不能为空") @TableField("POSITION") private String position; /** * 部门编号 */ @ExcelProperty("权属单位代码") - @NotEmpty(message = "权属单位代码不能为空") + @NotNull(message = "权属单位代码不能为空") @TableField("DEPTID") private Long deptid; /** @@ -136,8 +138,8 @@ /** * 井类型 */ - @ExcelProperty("井类型") - @NotEmpty(message = "闸井类型不能为空") + @ExcelProperty("点位类型") + @NotBlank(message = "点位类型不能为空") @TableField("WELL_TYPE") private String wellType; @@ -180,8 +182,8 @@ /** * 维护单位/小组id */ - @ExcelProperty("井维护单位代码") - @NotEmpty(message = "闸井维护单位代码不能为空") + @ExcelProperty("点位维护单位代码") + @NotNull(message = "点位维护单位代码不能为空") @TableField("RESPONSIBLE_DEPT") private Long responsibleDept; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java index 479eeb3..88ab771 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java @@ -100,7 +100,7 @@ @ExcelProperty("设备类型") @TableField(exist = false) private String deviceTypeName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") @TableField(exist = false) private String wellCode; @ExcelProperty("数据集中器编号") diff --git a/casic-web/src/main/resources/config/export/configTemp.xlsx b/casic-web/src/main/resources/config/export/configTemp.xlsx index 151c5a4..ad46157 100644 --- a/casic-web/src/main/resources/config/export/configTemp.xlsx +++ b/casic-web/src/main/resources/config/export/configTemp.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/export/configTempEmp.xlsx b/casic-web/src/main/resources/config/export/configTempEmp.xlsx index ddf907e..cdffc56 100644 --- a/casic-web/src/main/resources/config/export/configTempEmp.xlsx +++ b/casic-web/src/main/resources/config/export/configTempEmp.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/export/device.xlsx b/casic-web/src/main/resources/config/export/device.xlsx index a2aa957..79eedd9 100644 --- a/casic-web/src/main/resources/config/export/device.xlsx +++ b/casic-web/src/main/resources/config/export/device.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/export/harmfulData.xlsx b/casic-web/src/main/resources/config/export/harmfulData.xlsx index c44d528..111226a 100644 --- a/casic-web/src/main/resources/config/export/harmfulData.xlsx +++ b/casic-web/src/main/resources/config/export/harmfulData.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/export/sluicewell.xlsx b/casic-web/src/main/resources/config/export/sluicewell.xlsx index f3b267d..4a480f2 100644 --- a/casic-web/src/main/resources/config/export/sluicewell.xlsx +++ b/casic-web/src/main/resources/config/export/sluicewell.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/export/wellCoverData.xlsx b/casic-web/src/main/resources/config/export/wellCoverData.xlsx index 624dde8..46c7474 100644 --- a/casic-web/src/main/resources/config/export/wellCoverData.xlsx +++ b/casic-web/src/main/resources/config/export/wellCoverData.xlsx Binary files differ diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 293a8e4..49681d5 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -1262,7 +1262,7 @@ - AS logtime + AS logtime,dh.DESCN AS descn FROM data_hydrant dh JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE @@ -1277,13 +1277,13 @@ and w.DEPTID = #{deptid} - and glview.UPTIME = ]]> + and dh.LOGTIME = ]]> - and glview.UPTIME + and dh.LOGTIME diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java index 74c91d3..35ef9bc 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java @@ -27,7 +27,7 @@ private String wellCode; @ExcelProperty("点位名称") private String wellName; - @ExcelProperty("点位深") + @ExcelProperty("井深") private Integer deep; @ExcelProperty("详细地址") private String position; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java index 455c641..7d5dfd3 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java @@ -36,4 +36,6 @@ private String status; @ExcelProperty("记录时间") private String logtime; + @ExcelProperty("描述") + private String descn; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java index fcc035e..b27c7cd 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -12,6 +12,8 @@ import org.hibernate.validator.constraints.NotEmpty; import javax.validation.constraints.Digits; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.util.Date; /** @@ -40,15 +42,15 @@ /** * 井盖编号 */ - @ExcelProperty("井编号") - @NotEmpty(message = "闸井编号不能为空") + @ExcelProperty("点位编号") + @NotEmpty(message = "点位编号不能为空") @TableField("WELL_CODE") private String wellCode; /** * 井盖名称 */ - @ExcelProperty("井名称") - @NotEmpty(message = "闸井名称不能为空") + @ExcelProperty("点位名称") + @NotEmpty(message = "点位名称不能为空") @TableField("WELL_NAME") private String wellName; /** @@ -63,14 +65,14 @@ * 地区 */ @ExcelProperty("区") - @NotEmpty(message = "区不能为空") + @NotBlank(message = "区不能为空") @TableField(exist = false) private String qu; /** * 区域 */ @ExcelProperty("街道") - @NotEmpty(message = "街道不能为空") + @NotBlank(message = "街道不能为空") @TableField("AREA") private String area; /** @@ -113,14 +115,14 @@ * 位置 */ @ExcelProperty("详细地址") - @NotEmpty(message = "详细地址不能为空") + @NotBlank(message = "详细地址不能为空") @TableField("POSITION") private String position; /** * 部门编号 */ @ExcelProperty("权属单位代码") - @NotEmpty(message = "权属单位代码不能为空") + @NotNull(message = "权属单位代码不能为空") @TableField("DEPTID") private Long deptid; /** @@ -136,8 +138,8 @@ /** * 井类型 */ - @ExcelProperty("井类型") - @NotEmpty(message = "闸井类型不能为空") + @ExcelProperty("点位类型") + @NotBlank(message = "点位类型不能为空") @TableField("WELL_TYPE") private String wellType; @@ -180,8 +182,8 @@ /** * 维护单位/小组id */ - @ExcelProperty("井维护单位代码") - @NotEmpty(message = "闸井维护单位代码不能为空") + @ExcelProperty("点位维护单位代码") + @NotNull(message = "点位维护单位代码不能为空") @TableField("RESPONSIBLE_DEPT") private Long responsibleDept; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java index 479eeb3..88ab771 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java @@ -100,7 +100,7 @@ @ExcelProperty("设备类型") @TableField(exist = false) private String deviceTypeName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") @TableField(exist = false) private String wellCode; @ExcelProperty("数据集中器编号") diff --git a/casic-web/src/main/resources/config/export/configTemp.xlsx b/casic-web/src/main/resources/config/export/configTemp.xlsx index 151c5a4..ad46157 100644 --- a/casic-web/src/main/resources/config/export/configTemp.xlsx +++ b/casic-web/src/main/resources/config/export/configTemp.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/export/configTempEmp.xlsx b/casic-web/src/main/resources/config/export/configTempEmp.xlsx index ddf907e..cdffc56 100644 --- a/casic-web/src/main/resources/config/export/configTempEmp.xlsx +++ b/casic-web/src/main/resources/config/export/configTempEmp.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/export/device.xlsx b/casic-web/src/main/resources/config/export/device.xlsx index a2aa957..79eedd9 100644 --- a/casic-web/src/main/resources/config/export/device.xlsx +++ b/casic-web/src/main/resources/config/export/device.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/export/harmfulData.xlsx b/casic-web/src/main/resources/config/export/harmfulData.xlsx index c44d528..111226a 100644 --- a/casic-web/src/main/resources/config/export/harmfulData.xlsx +++ b/casic-web/src/main/resources/config/export/harmfulData.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/export/sluicewell.xlsx b/casic-web/src/main/resources/config/export/sluicewell.xlsx index f3b267d..4a480f2 100644 --- a/casic-web/src/main/resources/config/export/sluicewell.xlsx +++ b/casic-web/src/main/resources/config/export/sluicewell.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/export/wellCoverData.xlsx b/casic-web/src/main/resources/config/export/wellCoverData.xlsx index 624dde8..46c7474 100644 --- a/casic-web/src/main/resources/config/export/wellCoverData.xlsx +++ b/casic-web/src/main/resources/config/export/wellCoverData.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/export/wellLocData.xlsx b/casic-web/src/main/resources/config/export/wellLocData.xlsx index c4cacef..846d199 100644 --- a/casic-web/src/main/resources/config/export/wellLocData.xlsx +++ b/casic-web/src/main/resources/config/export/wellLocData.xlsx Binary files differ diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 293a8e4..49681d5 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -1262,7 +1262,7 @@ - AS logtime + AS logtime,dh.DESCN AS descn FROM data_hydrant dh JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE @@ -1277,13 +1277,13 @@ and w.DEPTID = #{deptid} - and glview.UPTIME = ]]> + and dh.LOGTIME = ]]> - and glview.UPTIME + and dh.LOGTIME diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java index 74c91d3..35ef9bc 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java @@ -27,7 +27,7 @@ private String wellCode; @ExcelProperty("点位名称") private String wellName; - @ExcelProperty("点位深") + @ExcelProperty("井深") private Integer deep; @ExcelProperty("详细地址") private String position; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java index 455c641..7d5dfd3 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java @@ -36,4 +36,6 @@ private String status; @ExcelProperty("记录时间") private String logtime; + @ExcelProperty("描述") + private String descn; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java index fcc035e..b27c7cd 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -12,6 +12,8 @@ import org.hibernate.validator.constraints.NotEmpty; import javax.validation.constraints.Digits; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.util.Date; /** @@ -40,15 +42,15 @@ /** * 井盖编号 */ - @ExcelProperty("井编号") - @NotEmpty(message = "闸井编号不能为空") + @ExcelProperty("点位编号") + @NotEmpty(message = "点位编号不能为空") @TableField("WELL_CODE") private String wellCode; /** * 井盖名称 */ - @ExcelProperty("井名称") - @NotEmpty(message = "闸井名称不能为空") + @ExcelProperty("点位名称") + @NotEmpty(message = "点位名称不能为空") @TableField("WELL_NAME") private String wellName; /** @@ -63,14 +65,14 @@ * 地区 */ @ExcelProperty("区") - @NotEmpty(message = "区不能为空") + @NotBlank(message = "区不能为空") @TableField(exist = false) private String qu; /** * 区域 */ @ExcelProperty("街道") - @NotEmpty(message = "街道不能为空") + @NotBlank(message = "街道不能为空") @TableField("AREA") private String area; /** @@ -113,14 +115,14 @@ * 位置 */ @ExcelProperty("详细地址") - @NotEmpty(message = "详细地址不能为空") + @NotBlank(message = "详细地址不能为空") @TableField("POSITION") private String position; /** * 部门编号 */ @ExcelProperty("权属单位代码") - @NotEmpty(message = "权属单位代码不能为空") + @NotNull(message = "权属单位代码不能为空") @TableField("DEPTID") private Long deptid; /** @@ -136,8 +138,8 @@ /** * 井类型 */ - @ExcelProperty("井类型") - @NotEmpty(message = "闸井类型不能为空") + @ExcelProperty("点位类型") + @NotBlank(message = "点位类型不能为空") @TableField("WELL_TYPE") private String wellType; @@ -180,8 +182,8 @@ /** * 维护单位/小组id */ - @ExcelProperty("井维护单位代码") - @NotEmpty(message = "闸井维护单位代码不能为空") + @ExcelProperty("点位维护单位代码") + @NotNull(message = "点位维护单位代码不能为空") @TableField("RESPONSIBLE_DEPT") private Long responsibleDept; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java index 479eeb3..88ab771 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java @@ -100,7 +100,7 @@ @ExcelProperty("设备类型") @TableField(exist = false) private String deviceTypeName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") @TableField(exist = false) private String wellCode; @ExcelProperty("数据集中器编号") diff --git a/casic-web/src/main/resources/config/export/configTemp.xlsx b/casic-web/src/main/resources/config/export/configTemp.xlsx index 151c5a4..ad46157 100644 --- a/casic-web/src/main/resources/config/export/configTemp.xlsx +++ b/casic-web/src/main/resources/config/export/configTemp.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/export/configTempEmp.xlsx b/casic-web/src/main/resources/config/export/configTempEmp.xlsx index ddf907e..cdffc56 100644 --- a/casic-web/src/main/resources/config/export/configTempEmp.xlsx +++ b/casic-web/src/main/resources/config/export/configTempEmp.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/export/device.xlsx b/casic-web/src/main/resources/config/export/device.xlsx index a2aa957..79eedd9 100644 --- a/casic-web/src/main/resources/config/export/device.xlsx +++ b/casic-web/src/main/resources/config/export/device.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/export/harmfulData.xlsx b/casic-web/src/main/resources/config/export/harmfulData.xlsx index c44d528..111226a 100644 --- a/casic-web/src/main/resources/config/export/harmfulData.xlsx +++ b/casic-web/src/main/resources/config/export/harmfulData.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/export/sluicewell.xlsx b/casic-web/src/main/resources/config/export/sluicewell.xlsx index f3b267d..4a480f2 100644 --- a/casic-web/src/main/resources/config/export/sluicewell.xlsx +++ b/casic-web/src/main/resources/config/export/sluicewell.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/export/wellCoverData.xlsx b/casic-web/src/main/resources/config/export/wellCoverData.xlsx index 624dde8..46c7474 100644 --- a/casic-web/src/main/resources/config/export/wellCoverData.xlsx +++ b/casic-web/src/main/resources/config/export/wellCoverData.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/export/wellLocData.xlsx b/casic-web/src/main/resources/config/export/wellLocData.xlsx index c4cacef..846d199 100644 --- a/casic-web/src/main/resources/config/export/wellLocData.xlsx +++ b/casic-web/src/main/resources/config/export/wellLocData.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx index 401b722..205b270 100644 --- a/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx +++ b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx Binary files differ diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index 293a8e4..49681d5 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -1262,7 +1262,7 @@ - AS logtime + AS logtime,dh.DESCN AS descn FROM data_hydrant dh JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE @@ -1277,13 +1277,13 @@ and w.DEPTID = #{deptid} - and glview.UPTIME = ]]> + and dh.LOGTIME = ]]> - and glview.UPTIME + and dh.LOGTIME diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java index 74c91d3..35ef9bc 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java @@ -27,7 +27,7 @@ private String wellCode; @ExcelProperty("点位名称") private String wellName; - @ExcelProperty("点位深") + @ExcelProperty("井深") private Integer deep; @ExcelProperty("详细地址") private String position; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java index 455c641..7d5dfd3 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java @@ -36,4 +36,6 @@ private String status; @ExcelProperty("记录时间") private String logtime; + @ExcelProperty("描述") + private String descn; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java index fcc035e..b27c7cd 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java @@ -12,6 +12,8 @@ import org.hibernate.validator.constraints.NotEmpty; import javax.validation.constraints.Digits; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.util.Date; /** @@ -40,15 +42,15 @@ /** * 井盖编号 */ - @ExcelProperty("井编号") - @NotEmpty(message = "闸井编号不能为空") + @ExcelProperty("点位编号") + @NotEmpty(message = "点位编号不能为空") @TableField("WELL_CODE") private String wellCode; /** * 井盖名称 */ - @ExcelProperty("井名称") - @NotEmpty(message = "闸井名称不能为空") + @ExcelProperty("点位名称") + @NotEmpty(message = "点位名称不能为空") @TableField("WELL_NAME") private String wellName; /** @@ -63,14 +65,14 @@ * 地区 */ @ExcelProperty("区") - @NotEmpty(message = "区不能为空") + @NotBlank(message = "区不能为空") @TableField(exist = false) private String qu; /** * 区域 */ @ExcelProperty("街道") - @NotEmpty(message = "街道不能为空") + @NotBlank(message = "街道不能为空") @TableField("AREA") private String area; /** @@ -113,14 +115,14 @@ * 位置 */ @ExcelProperty("详细地址") - @NotEmpty(message = "详细地址不能为空") + @NotBlank(message = "详细地址不能为空") @TableField("POSITION") private String position; /** * 部门编号 */ @ExcelProperty("权属单位代码") - @NotEmpty(message = "权属单位代码不能为空") + @NotNull(message = "权属单位代码不能为空") @TableField("DEPTID") private Long deptid; /** @@ -136,8 +138,8 @@ /** * 井类型 */ - @ExcelProperty("井类型") - @NotEmpty(message = "闸井类型不能为空") + @ExcelProperty("点位类型") + @NotBlank(message = "点位类型不能为空") @TableField("WELL_TYPE") private String wellType; @@ -180,8 +182,8 @@ /** * 维护单位/小组id */ - @ExcelProperty("井维护单位代码") - @NotEmpty(message = "闸井维护单位代码不能为空") + @ExcelProperty("点位维护单位代码") + @NotNull(message = "点位维护单位代码不能为空") @TableField("RESPONSIBLE_DEPT") private Long responsibleDept; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java index 479eeb3..88ab771 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java @@ -100,7 +100,7 @@ @ExcelProperty("设备类型") @TableField(exist = false) private String deviceTypeName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") @TableField(exist = false) private String wellCode; @ExcelProperty("数据集中器编号") diff --git a/casic-web/src/main/resources/config/export/configTemp.xlsx b/casic-web/src/main/resources/config/export/configTemp.xlsx index 151c5a4..ad46157 100644 --- a/casic-web/src/main/resources/config/export/configTemp.xlsx +++ b/casic-web/src/main/resources/config/export/configTemp.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/export/configTempEmp.xlsx b/casic-web/src/main/resources/config/export/configTempEmp.xlsx index ddf907e..cdffc56 100644 --- a/casic-web/src/main/resources/config/export/configTempEmp.xlsx +++ b/casic-web/src/main/resources/config/export/configTempEmp.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/export/device.xlsx b/casic-web/src/main/resources/config/export/device.xlsx index a2aa957..79eedd9 100644 --- a/casic-web/src/main/resources/config/export/device.xlsx +++ b/casic-web/src/main/resources/config/export/device.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/export/harmfulData.xlsx b/casic-web/src/main/resources/config/export/harmfulData.xlsx index c44d528..111226a 100644 --- a/casic-web/src/main/resources/config/export/harmfulData.xlsx +++ b/casic-web/src/main/resources/config/export/harmfulData.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/export/sluicewell.xlsx b/casic-web/src/main/resources/config/export/sluicewell.xlsx index f3b267d..4a480f2 100644 --- a/casic-web/src/main/resources/config/export/sluicewell.xlsx +++ b/casic-web/src/main/resources/config/export/sluicewell.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/export/wellCoverData.xlsx b/casic-web/src/main/resources/config/export/wellCoverData.xlsx index 624dde8..46c7474 100644 --- a/casic-web/src/main/resources/config/export/wellCoverData.xlsx +++ b/casic-web/src/main/resources/config/export/wellCoverData.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/export/wellLocData.xlsx b/casic-web/src/main/resources/config/export/wellLocData.xlsx index c4cacef..846d199 100644 --- a/casic-web/src/main/resources/config/export/wellLocData.xlsx +++ b/casic-web/src/main/resources/config/export/wellLocData.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx index 401b722..205b270 100644 --- a/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx +++ b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/sluicewell_template.xlsx b/casic-web/src/main/resources/config/temp/sluicewell_template.xlsx index adfdd00..13720e4 100644 --- a/casic-web/src/main/resources/config/temp/sluicewell_template.xlsx +++ b/casic-web/src/main/resources/config/temp/sluicewell_template.xlsx Binary files differ