添加标注

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/JpCollectorDto.java

@@ -24,74 +24,75 @@ public class JpCollectorDto  extends BaseDto {
    private static final long serialVersionUID = 1L;
 
 
-    @ApiModelProperty(value = "sn编码")
+    @ApiModelProperty(value = "sn编码", example = "6T2289013652")
     private String snCode;
 
-    @ApiModelProperty(value = "状态")
+    @ApiModelProperty(value = "状态", example = "在线")
     private String state;
 
-    @ApiModelProperty(value = "类型")
+    @ApiModelProperty(value = "类型", example = "家庭户用")
     private String type;
 
-    @ApiModelProperty(value = "sim卡号")
+    @ApiModelProperty(value = "sim卡号", example = "6384762146")
     private String simCode;
 
-    @ApiModelProperty(value = "数据来源")
+    @ApiModelProperty(value = "数据来源", example = "锦浪云")
     private String dataSource;
 
-    @ApiModelProperty(value = "更新时间")
+    @ApiModelProperty(value = "更新时间", example = "2024-09-18 16:15:53")
     private Date updateTime;
 
-    @ApiModelProperty(value = "采集器版本")
+    @ApiModelProperty(value = "采集器版本", example = "Ver10.3.2.0")
     private String version;
 
-    @ApiModelProperty(value = "出场日期")
+    @ApiModelProperty(value = "出场日期", example = "1970-01-21")
     private Date dischargeDate;
 
-    @ApiModelProperty(value = "生产日期")
+    @ApiModelProperty(value = "生产日期", example = "1970-01-21")
     private Date productDate;
 
-    @ApiModelProperty(value = "数据上传间隔")
+    @ApiModelProperty(value = "数据上传间隔", example = "300.00")
     private Double dataPeriod;
 
-    @ApiModelProperty(value = "本次上电工作时间")
+    @ApiModelProperty(value = "本次上电工作时间", example = "1970-01-01 08:00:35")
     private Date thisWorkTime;
 
-    @ApiModelProperty(value = "累计工作时间")
+    @ApiModelProperty(value = "累计工作时间", example = "1970-01-01 08:53:30")
     private Date totalWorkTime;
 
-    @ApiModelProperty(value = "第三方电站id")
+    @ApiModelProperty(value = "第三方电站id", example = "1299184320439241717")
     private String thirdStationId;
 
-    @ApiModelProperty(value = "第三方厂商标识")
+    @ApiModelProperty(value = "第三方厂商标识", example = "JLY")
     private String thirdCode;
 
-    @ApiModelProperty(value = "所属电站")
+    @ApiModelProperty(value = "所属电站", example = "灵山县-杨芝美")
     private String stationName;
 
-    @ApiModelProperty(value = "电站地址")
+    @ApiModelProperty(value = "电站地址", example = "荔香大道靠近山水荔城")
     private String addr;
 
     @ApiModelProperty(value = "采集器列表")
     private List<JpInverter> jpInverters;
 
+    @ApiModelProperty(value = "场站ID", example = "[\"530740893628768256\",\"535020418541821952\"]")
     private List<String> stationIds;
 
-     @ApiModelProperty(value = "采集器名称")
+     @ApiModelProperty(value = "采集器名称", example = "通信模块1")
      private String name;
 
 
- @ApiModelProperty(value = "类型")
+ @ApiModelProperty(value = "类型", example = "通信模块")
  private String collectorType;
 
- @ApiModelProperty(value = "信号强度")
+ @ApiModelProperty(value = "信号强度", example = "5")
  private String signalStrength;
 
 
- @ApiModelProperty(value = "所属项目公司")
+ @ApiModelProperty(value = "所属项目公司", example = "余干县赣德新能源科技有限公司")
  private String companyName;
 
- @ApiModelProperty(value = "流量到期时间")
+ @ApiModelProperty(value = "流量到期时间", example = "2036-12-31 23:59:59")
  private String contractTimeStr;
 
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/JpInverter.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.hygf.api.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -26,153 +27,179 @@ public class JpInverter extends BaseEntity {
     /**
      * sn编码
      */
+    @ApiModelProperty(value = "sn编码", example = "6T2289013652")
 	@TableField("sn_code")
     private String snCode;
 
     /**
      * 状态
      */
+    @ApiModelProperty(value = "状态", example = "在线")
 	@TableField("state")
     private String state;
 
     /**
      * 额定功率
      */
+    @ApiModelProperty(value = "额定功率", example = "313.8")
 	@TableField("rated_power")
     private Double ratedPower;
 
     /**
      * 采集器id
      */
+    @ApiModelProperty(value = "采集器id", example = "603232016263290880")
 	@TableField("collector_id")
     private String collectorId;
 
     /**
      * 采集器sn编码
      */
+    @ApiModelProperty(value = "采集器sn编码", example = "E48423709253")
 	@TableField("collector_sn_code")
     private String collectorSnCode;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(value = "更新时间", example = "2024-11-18 16:18:11")
 	@TableField("update_time")
     private Date updateTime;
 
     /**
      * 实时功率
      */
+    @ApiModelProperty(value = "实时功率", example = "8.0")
 	@TableField("current_power")
     private Double currentPower;
 
     /**
      * 日发电量
      */
+    @ApiModelProperty(value = "日发电量", example = "131.8300")
 	@TableField("day_power_generation")
     private Double dayPowerGeneration;
 
     /**
      * 月发电量
      */
+    @ApiModelProperty(value = "月发电量", example = "1072.1600")
 	@TableField("month_power_generation")
     private Double monthPowerGeneration;
 
     /**
      * 年发电量
      */
+    @ApiModelProperty(value = "年发电量", example = "8424.6900")
 	@TableField("year_power_generation")
     private Double yearPowerGeneration;
 
     /**
      * 品牌
      */
+    @ApiModelProperty(value = "品牌", example = "阳光电源股份有限公司")
 	@TableField("brand")
     private String brand;
 
     /**
      * 型号
      */
+    @ApiModelProperty(value = "型号", example = "SG20T-CN")
 	@TableField("model")
     private String model;
 
     /**
      * 国标
      */
+    @ApiModelProperty(value = "国标", example = "25")
 	@TableField("national_standard")
     private String nationalStandard;
 
     /**
      * 版本号
      */
+    @ApiModelProperty(value = "版本号", example = "81003A")
 	@TableField("version")
     private String version;
 
     /**
      * 满发小时数
      */
+    @ApiModelProperty(value = "满发小时数", example = "0.16")
 	@TableField("generation_hours")
     private String generationHours;
 
     /**
      * 质保期
      */
+    @ApiModelProperty(value = "质保期", example = "2028-06-24")
 	@TableField("warranty_period")
     private String warrantyPeriod;
 
     /**
      * IGBT温度
      */
+    @ApiModelProperty(value = "IGBT温度", example = "8.8")
 	@TableField("IGBT_temperature")
     private String igbtTemperature;
 
     /**
      * AFCI方案
      */
+    @ApiModelProperty(value = "AFCI方案", example = "AFCI0")
 	@TableField("AFCI_programme")
     private String afciProgramme;
 
     /**
      * AFCI版本
      */
+    @ApiModelProperty(value = "AFCI版本", example = "0")
 	@TableField("AFCI_version")
     private String afciVersion;
 
     /**
      * ID
      */
+    @ApiModelProperty(value = "ID", example = "1299184088035566542")
 	@TableField("ID")
     private String id;
 
     /**
      * 第三方电站id
      */
+    @ApiModelProperty(value = "第三方电站id", example = "1299184320438804977")
 	@TableField("third_station_id")
     private String thirdStationId;
 
     /**
      * 装机容量
      */
+    @ApiModelProperty(value = "装机容量", example = "20.0000")
 	@TableField("capacity")
     private Double capacity;
 
     /**
      * 累计发电量
      */
+    @ApiModelProperty(value = "累计发电量", example = "33238.0000")
 	@TableField("total_power_generation")
     private Double totalPowerGeneration;
 
     /**
      * 所属电站
      */
+    @ApiModelProperty(value = "所属电站", example = "灵山县-郑立全")
     @TableField("station_name")
     private String stationName;
 
     /**
      * 电站地址
      */
+    @ApiModelProperty(value = "电站地址", example = "黑龙江省哈尔滨市松北区乐业镇苇子村马矬子屯")
     @TableField("addr")
     private String addr;
 
+    @ApiModelProperty(value = "逆变器名称", example = "逆变器2")
     @TableField("sn_name")
     private String snName;
 
@@ -180,6 +207,7 @@ public class JpInverter extends BaseEntity {
     /**
      * 投运时间
      */
+    @ApiModelProperty(value = "投运时间", example = "2024-08-16 11:23:11")
     @TableField("fis_time_str")
     private String fisTimeStr;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/JpCollectorController.java

@@ -11,6 +11,7 @@ import com.yeejoin.amos.boot.module.hygf.biz.service.impl.JpCollectorServiceImpl
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.JpInverterServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -67,7 +68,7 @@ public class JpCollectorController extends BaseController {
 	@PutMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新户用光伏监盘采集器表", notes = "根据sequenceNbr更新户用光伏监盘采集器表")
 	public ResponseModel<JpCollectorDto> updateBySequenceNbrJpCollector(@RequestBody JpCollectorDto model,
-			@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+																		@ApiParam(value = "主键",example = "1805040753609568257") @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
 		model.setSequenceNbr(sequenceNbr);
 		return ResponseHelper.buildResponse(jpCollectorServiceImpl.updateWithModel(model));
 	}
@@ -82,7 +83,8 @@ public class JpCollectorController extends BaseController {
 	@DeleteMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除户用光伏监盘采集器表", notes = "根据sequenceNbr删除户用光伏监盘采集器表")
 	public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request,
-			@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+													  @ApiParam(value = "主键",example = "1805040753609568257")	@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+
 		return ResponseHelper.buildResponse(jpCollectorServiceImpl.removeById(sequenceNbr));
 	}
 
@@ -95,7 +97,7 @@ public class JpCollectorController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个户用光伏监盘采集器表",  notes = "根据sequenceNbr查询单个户用光伏监盘采集器表")
-	public ResponseModel<JpCollectorDto> selectOne(@PathVariable Long sequenceNbr) {
+	public ResponseModel<JpCollectorDto> selectOne(@ApiParam(value = "主键",example = "1805040753609568257") @PathVariable Long sequenceNbr) {
 		JpCollectorDto jpCollectorDto = jpCollectorServiceImpl.queryBySeq(sequenceNbr);
 
 		LambdaQueryWrapper<JpInverter> queryWrapper = new LambdaQueryWrapper<>();
@@ -127,8 +129,8 @@ public class JpCollectorController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET", value = "户用光伏监盘采集器表分页查询", notes = "户用光伏监盘采集器表分页查询")
-	public ResponseModel<Page<JpCollectorDto>> queryForPage(@RequestParam(value = "current") int current,
-			@RequestParam(value = "size") int size, JpCollectorDto jpCollectorDto) {
+	public ResponseModel<Page<JpCollectorDto>> queryForPage(@ApiParam(value = "当前页码",example = "1") @RequestParam(value = "current") int current,
+															@ApiParam(value = "分数条数",example = "20") @RequestParam(value = "size") int size, JpCollectorDto jpCollectorDto) {
 
         List<JpPersonStation> pPersonStation=null;
         if(jpCollectorDto.getName()!=null&&!"".equals(jpCollectorDto.getName())){
@@ -172,8 +174,8 @@ public class JpCollectorController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/queryForDataPage")
 	@ApiOperation(httpMethod = "GET", value = "户用光伏监盘采集器表分页查询", notes = "户用光伏监盘采集器表分页查询")
-	public ResponseModel<Page<JpCollectorDto>> queryForDataPage(@RequestParam(value = "current") int current,
-															@RequestParam(value = "size") int size, JpCollectorDto jpCollectorDto) {
+	public ResponseModel<Page<JpCollectorDto>> queryForDataPage(@ApiParam(value = "当前页码",example = "1")  @RequestParam(value = "current") int current,
+																@ApiParam(value = "分数条数",example = "20") @RequestParam(value = "size") int size, JpCollectorDto jpCollectorDto) {
 			Page<JpCollectorDto> page = new Page<JpCollectorDto>();
 			page.setCurrent(current);
 			page.setSize(size);