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

技术监督管理调整

Browse Source
This commit is contained in:
雨木c
2023-06-29 14:14:34 +08:00
parent bd45a1cae5
commit 86abd2458e
9 changed files with 53 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/StatationStatClient.java
View File

@@ -4,9 +4,11 @@ import com.njcn.common.pojo.constant.ServerInfo;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.device.pms.api.fallback.StatationStatClientFallbackFactory;
import com.njcn.device.pms.pojo.dto.PmsStatationStatInfoDTO;
import com.njcn.device.pms.pojo.param.PmsBaseParam;
import com.njcn.device.pms.pojo.param.PmsStatationStatInfoParam;
import com.njcn.device.pms.pojo.po.StatationStat;
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.RequestBody;
@@ -43,4 +45,8 @@ public interface StatationStatClient {
HttpResult<List<StatationStat>> getPowerInfo(@RequestBody PmsStatationStatInfoParam param);
@PostMapping("/getstatationStatList")
HttpResult<List<StatationStat>> getstatationStatList(@RequestBody PmsBaseParam pmsBaseParam);
}

7
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/StatationStatClientFallbackFactory.java
View File

@@ -5,6 +5,7 @@ import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.device.pms.api.StatationStatClient;
import com.njcn.device.pms.pojo.dto.PmsStatationStatInfoDTO;
import com.njcn.device.pms.pojo.param.PmsBaseParam;
import com.njcn.device.pms.pojo.param.PmsStatationStatInfoParam;
import com.njcn.device.pms.pojo.po.StatationStat;
import com.njcn.device.pms.utils.PmsDeviceEnumUtil;
@@ -44,6 +45,12 @@ public class StatationStatClientFallbackFactory implements FallbackFactory<Stata
log.error("{}异常，降级处理，异常为：{}", "获取变电站信息", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<List<StatationStat>> getstatationStatList(PmsBaseParam pmsBaseParam) {
log.error("{}异常，降级处理，异常为：{}", "获取变电站信息", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
};
}
}

2
pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/SupvReportM.java
View File

@@ -203,5 +203,7 @@ public class SupvReportM {
*/
private Integer powerTotalConductedNum;
private Integer isuploadhead;
}

2
pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/SupvPlanVO.java
View File

@@ -88,7 +88,7 @@ public class SupvPlanVO {
* 关联电站
*/
@ApiModelProperty(value = "关联电站")
private String objRelationStation;
private String substationName;
@ApiModelProperty(value = "关联电站电压等级")
private String substationVoltageLevel;

14
pqs-process/process-boot/src/main/java/com/njcn/process/controller/SupvPushGwController.java
View File

@@ -100,4 +100,18 @@ public class SupvPushGwController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}
/**
* 删除电能质量技术监督工作计划接口
* @author cdf
* @date 2023/6/28
*/
@PostMapping("delPushPlan")
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@ApiOperation("取消电能质量技术监督工作计划接口")
@ApiImplicitParam(name = "planIds",value = "请求体",required = true)
public HttpResult<Object> delPushPlan(@RequestBody List<String> planIds){
String methodDescribe = getMethodDescribe("delPushPlan");
supvPushGwService.deletePlan(planIds);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}
}

3
pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPlanServiceImpl.java
View File

@@ -169,6 +169,9 @@ public class SupvPlanServiceImpl extends ServiceImpl<SupvPlanMapper, SupvPlan> i
if(map.containsKey(item.getCreateBy())) {
item.setCreateBy(map.get(item.getCreateBy()).getName());
}
});
Page<SupvPlanVO> pageVo = new Page<>();
pageVo.setTotal(page.getTotal());

1
pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvProblemServiceImpl.java
View File

@@ -48,6 +48,7 @@ public class SupvProblemServiceImpl extends ServiceImpl<SupvProblemMapper, SupvP
BeanUtil.copyProperties(supvProblemParam,supvProblem);
supvProblem.setPlanRectificationTime(PubUtils.localDateFormat(supvProblemParam.getPlanRectificationTime()));
supvProblem.setRectificationTime(PubUtils.localDateFormat(supvProblemParam.getRectificationTime()));
supvProblem.setIsUploadHead(0);
this.save(supvProblem);
return true;
}

19
pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPushGwServiceImpl.java
View File

@@ -252,11 +252,28 @@ public class SupvPushGwServiceImpl implements SupvPushGwService {
throw new BusinessException("一次最多上送100条数据");
}
//TODO 调用上送接口
return true;
}
@Override
public boolean deletePlan(List<String> planIds) {
return false;
List<SupvPlan> supvPlanList = new ArrayList<>();
for(String id : planIds) {
SupvPlan supvPlan = new SupvPlan();
supvPlan.setPlanId(id);
supvPlanList.add(supvPlan);
}
//TODO
for(SupvPlan supvPlan : supvPlanList) {
supvPlan.setIsUploadHead(2);
supvPlanMapper.updateById(supvPlan);
}
return true;
}
}

1
pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvReportMServiceImpl.java
View File

@@ -249,6 +249,7 @@ public class SupvReportMServiceImpl extends MppServiceImpl<SupvReportMMapper, Su
supvReportM.setStatisticsLevel("5");
}
supvReportM.setSupvNum(all);
supvReportM.setIsuploadhead(0);
supvReportMBatch.add(supvReportM);
}