diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/NewStationQueryParam.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/NewStationQueryParam.java index a617a9973..75ee8d4cc 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/NewStationQueryParam.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/NewStationQueryParam.java @@ -1,7 +1,6 @@ package com.njcn.device.pq.pojo.param; import com.njcn.web.pojo.param.BaseParam; -import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -15,56 +14,55 @@ import javax.validation.constraints.NotBlank; * @since 2024-08-14 */ @Data -@ApiModel public class NewStationQueryParam extends BaseParam { - @ApiModelProperty(name = "id") + @ApiModelProperty("id") private String id; - @ApiModelProperty(name = "新能源场站名称") + @ApiModelProperty("新能源场站名称") private String name; - @ApiModelProperty(name = "新能源场站类型") + @ApiModelProperty("新能源场站类型") private String stationType; - @ApiModelProperty(name = "电压等级Guid") + @ApiModelProperty("电压等级Guid") private String scale; - @ApiModelProperty(name = "额定有功功率") + @ApiModelProperty("额定有功功率") private String ratedPower; - @ApiModelProperty(name = "经度") + @ApiModelProperty("经度") private String longitude; - @ApiModelProperty(name = "维度") + @ApiModelProperty("维度") private String latitude; @Data public static class NewStationEdit{ - @ApiModelProperty(name = "id") + @ApiModelProperty("id") private String id; @NotBlank(message = "新能源场站名称不能为空") - @ApiModelProperty(name = "新能源场站名称") + @ApiModelProperty("新能源场站名称(*)") private String name; @NotBlank(message = "新能源场站类型不能为空") - @ApiModelProperty(name = "新能源场站类型") + @ApiModelProperty("新能源场站类型(*)") private String stationType; - @ApiModelProperty(name = "电压等级Guid") + @ApiModelProperty("电压等级Guid") private String scale; @NotBlank(message = "额定有功功率不能为空") - @ApiModelProperty(name = "额定有功功率") + @ApiModelProperty("额定有功功率(*)") private String ratedPower; @NotBlank(message = "经度不能为空") - @ApiModelProperty(name = "经度") + @ApiModelProperty("经度(*)") private String longitude; @NotBlank(message = "维度不能为空") - @ApiModelProperty(name = "维度") + @ApiModelProperty("维度(*)") private String latitude; } } diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/NewStation.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/NewStation.java index f4e3de098..d48991c30 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/NewStation.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/NewStation.java @@ -31,12 +31,12 @@ public class NewStation extends BaseEntity { private String name; /** - * (关联sys_dict_type字典表)新能源场站类型(风电场、光伏电站) + * (关联new_station_type字典表)新能源场站类型(风电场、光伏电站) */ private String stationType; /** - * (关联sys_dict_type字典表)电压等级Guid + * (关联Dev_Voltage_Stand字典表)电压等级Guid */ private String scale; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/NewStationController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/NewStationController.java index fd26fed9d..59a8f0303 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/NewStationController.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/NewStationController.java @@ -18,6 +18,8 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import com.njcn.web.controller.BaseController; +import java.util.List; +import java.util.Map; /** *
@@ -65,5 +67,14 @@ public class NewStationController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}
+ @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.QUERY)
+ @DeleteMapping("/selectDown")
+ @ApiOperation("获取新能源场站高低电压穿越信息下拉框(用于监测点维护界面)")
+ public HttpResult
@@ -19,4 +21,6 @@ public interface NewStationMapper extends BaseMapper> selectDown(@RequestParam(name = "name",required = false) String name) {
+ String methodDescribe = getMethodDescribe("selectDown");
+ LogUtil.njcnDebug(log, "{},远程搜索值为:{}", methodDescribe, name);
+ return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, iNewStationService.selectDown(name), methodDescribe);
+ }
+
}
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/NewStationMapper.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/NewStationMapper.java
index c93ef8777..8cfceb25a 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/NewStationMapper.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/NewStationMapper.java
@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.device.pq.pojo.param.NewStationQueryParam;
import com.njcn.device.pq.pojo.po.NewStation;
import org.apache.ibatis.annotations.Param;
+import java.util.List;
+import java.util.Map;
/**
*