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

Merge branch 'master' of http://192.168.1.13:3000/root/pqs

Browse Source 
# Conflicts:
#	pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsSimpleDTO.java
#	pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/SubstationExpendController.java
#	pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/MonitorMapper.xml
#	pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/SubstationExpendServiceImpl.java
#	pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/CommunicateParam.java
#	pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/DeviceInfoParam.java
#	pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/CommunicateVO.java
#	pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
#	pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/ISubstationExpendService.java
#	pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/SubstationExpendServiceImpl.java
#	pqs-event/event-api/src/main/java/com/njcn/event/pojo/param/WaveTypeParam.java
This commit is contained in:
huangzj
2023-05-16 09:44:57 +08:00
parent 1ff7080bc9 412cbc4124
commit ffdec2152a
31 changed files with 562 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/api/CsEdDataFeignClient.java Normal file
View File

@@ -0,0 +1,28 @@
package com.njcn.algorithm.api;
import com.njcn.algorithm.api.fallback.CsEdDataFeignClientFallbackFactory;
import com.njcn.algorithm.pojo.po.CsEdDataPO;
import com.njcn.algorithm.pojo.vo.CsEdDataVO;
import com.njcn.common.pojo.constant.ServerInfo;
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
/**
* @author xy
*/
@FeignClient(value = ServerInfo.ALGORITHM_BOOT, path = "/edData", fallbackFactory = CsEdDataFeignClientFallbackFactory.class,contextId = "edData")
public interface CsEdDataFeignClient {
@PostMapping("/findByDevTypeId")
HttpResult<CsEdDataVO> findByDevTypeId(@RequestParam("devType") String devType);
@PostMapping("/getAll")
HttpResult<List<CsEdDataPO>> getAll(@RequestParam("devType") String devType);
}

44
pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/api/fallback/CsEdDataFeignClientFallbackFactory.java Normal file
View File

@@ -0,0 +1,44 @@
package com.njcn.algorithm.api.fallback;
import com.njcn.algorithm.api.CsEdDataFeignClient;
import com.njcn.algorithm.pojo.po.CsEdDataPO;
import com.njcn.algorithm.pojo.vo.CsEdDataVO;
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.common.pojo.response.HttpResult;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* @author xy
*/
@Slf4j
@Component
public class CsEdDataFeignClientFallbackFactory implements FallbackFactory<CsEdDataFeignClient> {
@Override
public CsEdDataFeignClient create(Throwable cause) {
//判断抛出异常是否为解码器抛出的业务异常
Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
if (cause.getCause() instanceof BusinessException) {
BusinessException businessException = (BusinessException) cause.getCause();
}
Enum<?> finalExceptionEnum = exceptionEnum;
return new CsEdDataFeignClient() {
@Override
public HttpResult<CsEdDataVO> findByDevTypeId(String devType) {
log.error("{}异常，降级处理，异常为：{}","根据装置型号获取装置类型",cause.toString());
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<List<CsEdDataPO>> getAll(String devType) {
log.error("{}异常，降级处理，异常为：{}","根据装置型号获取装置类型",cause.toString());
throw new BusinessException(finalExceptionEnum);
}
};
}
}

9
pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsEdDataPO.java
View File

@@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.db.bo.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
/**
@@ -24,6 +26,7 @@ import java.util.Date;
*/
@Data
@TableName(value = "cs_ed_data")
@EqualsAndHashCode(callSuper = true)
public class CsEdDataPO extends BaseEntity {
/**
* id
@@ -83,4 +86,10 @@ public class CsEdDataPO extends BaseEntity {
@TableField(value = "file_path")
private String filePath;
/**
* 装置类型
*/
@TableField(value = "type")
private String type;
}

3
pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsEdDataVO.java
View File

@@ -77,4 +77,7 @@ public class CsEdDataVO extends BaseEntity {
@ApiModelProperty(value = ".bin文件")
private String filePath;
@ApiModelProperty(value = "type")
private String type;
}