Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

辽宁功能提交

Browse Source
This commit is contained in:
chendaofei
2025-03-25 14:08:29 +08:00
parent 72b2283165
commit de2a2e2fea
27 changed files with 598 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/UserLedgerFeignClient.java
View File

@@ -1,14 +1,18 @@
package com.njcn.supervision.api;
import com.njcn.common.pojo.constant.ServerInfo;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.supervision.api.fallback.TempLineRunTestFeignClientFallbackFactory;
import com.njcn.supervision.api.fallback.UserLedgerFeignClientFallbackFactory;
import com.njcn.supervision.pojo.param.user.UserReportParam;
import com.njcn.supervision.pojo.po.user.UserReportPO;
import com.njcn.supervision.pojo.vo.user.UserLedgerVO;
import com.njcn.supervision.pojo.vo.user.UserReportVO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
@@ -22,6 +26,11 @@ public interface UserLedgerFeignClient {
@PostMapping("/selectUserList")
List<UserReportPO> selectUserList(@RequestBody UserReportParam userReportParam);
HttpResult<List<UserLedgerVO>> selectUserList(@RequestBody UserReportParam userReportParam);
@GetMapping("/selectUserInfo")
HttpResult<UserLedgerVO> selectUserInfo(@RequestParam("id") String id);
@PostMapping(value = "/bindUserStation")
HttpResult<List<UserLedgerVO>> bindUserStation(@RequestParam("userId")String userId,@RequestParam("stationId")String stationId);
}

17
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/UserLedgerFeignClientFallbackFactory.java
View File

@@ -2,10 +2,13 @@ package com.njcn.supervision.api.fallback;
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.supervision.api.TempLineRunTestFeignClient;
import com.njcn.supervision.api.UserLedgerFeignClient;
import com.njcn.supervision.pojo.param.user.UserReportParam;
import com.njcn.supervision.pojo.po.user.UserReportPO;
import com.njcn.supervision.pojo.vo.user.UserLedgerVO;
import com.njcn.supervision.pojo.vo.user.UserReportVO;
import com.njcn.supervision.utils.SupervisionEnumUtil;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
@@ -29,10 +32,22 @@ public class UserLedgerFeignClientFallbackFactory implements FallbackFactory<Use
return new UserLedgerFeignClient() {
@Override
public List<UserReportPO> selectUserList(UserReportParam userReportParam) {
public HttpResult<List<UserLedgerVO>> selectUserList(UserReportParam userReportParam) {
log.error("{}异常，降级处理，异常为：{}", "查询用户台账", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<UserLedgerVO> selectUserInfo(String id) {
log.error("{}异常，降级处理，异常为：{}", "查询用户台账详情", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<List<UserLedgerVO>> bindUserStation(String userId, String stationId) {
log.error("{}异常，降级处理，异常为：{}", "用户电站信息绑定", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
};
}
}

7
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/UserReportParam.java
View File

@@ -14,6 +14,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import javax.validation.constraints.Pattern;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.List;
import java.util.Map;
@@ -115,6 +116,12 @@ public class UserReportParam {
@ApiModelProperty(value = "预测评估单位")
private String evaluationDept;
@ApiModelProperty(value = "经度")
private BigDecimal longitude;
@ApiModelProperty(value = "纬度")
private BigDecimal latitude;
/**
* 预测评估结论
*/

15
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportPO.java
View File

@@ -5,11 +5,13 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.db.bo.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import java.math.BigDecimal;
import java.time.LocalDate;
/**
@@ -131,6 +133,19 @@ public class UserReportPO extends BaseEntity {
*/
private String stationId;
/**
* 经度
*/
private BigDecimal longitude;
/**
* 纬度
*/
private BigDecimal latitude;
/**
* 终端id
*/

24
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/user/UserLedgerVO.java Normal file
View File

@@ -0,0 +1,24 @@
package com.njcn.supervision.pojo.vo.user;
import lombok.Data;
import java.io.Serializable;
/**
* @Author: cdf
* @CreateTime: 2025-03-24
* @Description: 用户台账
*/
@Data
public class UserLedgerVO implements Serializable {
private static final long serialVersionUID = 1L;
private String id;
private String projectName;
private String stationId;
private String city;
}

9
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/user/UserReportVO.java
View File

@@ -14,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
@@ -95,6 +96,14 @@ public class UserReportVO {
@ApiModelProperty(value = "变电站")
private String substation;
private String stationId;
@ApiModelProperty(value = "经度")
private BigDecimal longitude;
@ApiModelProperty(value = "纬度")
private BigDecimal latitude;
/**
* 电压等级
*/