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

国网上送接口调整

Browse Source
This commit is contained in:
cdf
2024-05-29 14:16:36 +08:00
parent 8726fdee27
commit 8bbeafe50b
11 changed files with 683 additions and 420 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/gwPush/MonitorSendController.java
View File

@@ -48,7 +48,7 @@ public class MonitorSendController extends BaseController {
@PostMapping("/exportSend")
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@ApiOperation(value ="国网上送台账", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
@ApiOperation(value ="国网上送台账导出", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
public HttpResult<Boolean> tractionStationSend(HttpServletResponse response) throws IOException {
String methodDescribe = getMethodDescribe("tractionStationSend");
response.setHeader("Content-disposition", "attachment;filename=" + URLEncoder.encode("国网上送台账", "UTF-8") + ".xlsx");

50
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/DeptMonitorController.java
View File

@@ -1,50 +0,0 @@
//package com.njcn.device.pms.controller.ledgerManger;
//
//import com.njcn.common.pojo.enums.response.CommonResponseEnum;
//import com.njcn.common.pojo.response.HttpResult;
//import com.njcn.common.utils.HttpResultUtil;
//import com.njcn.device.biz.pojo.dto.DeptGetChildrenDTO;
//import com.njcn.device.biz.pojo.param.DeptGetLineParam;
//import com.njcn.device.pms.service.majornetwork.IMonitorService;
//import com.njcn.web.controller.BaseController;
//import io.swagger.annotations.Api;
//import io.swagger.annotations.ApiImplicitParam;
//import lombok.RequiredArgsConstructor;
//import lombok.extern.slf4j.Slf4j;
//import org.springframework.validation.annotation.Validated;
//import org.springframework.web.bind.annotation.PostMapping;
//import org.springframework.web.bind.annotation.RequestBody;
//import org.springframework.web.bind.annotation.RequestMapping;
//import org.springframework.web.bind.annotation.RestController;
//
//import java.util.List;
//
///**
// * @author wr
// * @description
// * @date 2023/4/26 10:00
// */
//@RestController
//@RequestMapping("/commTerminal")
//@RequiredArgsConstructor
//@Slf4j
//@Api(tags = "通用台账-所有子孙部门以及监测点")
//public class DeptMonitorController extends BaseController {
//
// private final IMonitorService monitorService;
//
// /**
// * 通过部门获取所有子集部门所拥有的监测点
// *
// * @author wr
// * @date 2023/4/26
// */
// @PostMapping("/deptGetLineIds")
// @ApiImplicitParam(name = "param", value = "请求参数", required = true)
// public HttpResult<List<DeptGetChildrenDTO>> deptGetLineList(@RequestBody @Validated DeptGetLineParam param) {
// String methodDescribe = getMethodDescribe("deptGetLineList");
// List<DeptGetChildrenDTO> monitor = monitorService.deptMonitor(param);
// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitor, methodDescribe);
// }
//
//}

2
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java
View File

@@ -1,6 +1,5 @@
package com.njcn.device.pms.service.ledgerManger.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjUtil;
@@ -31,7 +30,6 @@ import com.njcn.device.pq.pojo.po.LineBak;
import com.njcn.system.api.DicDataFeignClient;
import com.njcn.system.enums.DicDataEnum;
import com.njcn.system.enums.DicDataTypeEnum;
import com.njcn.system.pojo.po.Dic;
import com.njcn.system.pojo.po.DictData;
import com.njcn.user.api.DeptFeignClient;
import com.njcn.user.pojo.dto.DeptDTO;