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

微调

Browse Source
This commit is contained in:
hongawen
2024-05-13 18:09:19 +08:00
parent 31d6121e52
commit f39b45a438
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalTreeController.java
View File

@@ -6,6 +6,7 @@ import com.njcn.common.pojo.enums.common.LogEnum;
import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil; import com.njcn.common.utils.HttpResultUtil;
import com.njcn.device.biz.pojo.vo.TerminalSelectTreeVO;
import com.njcn.device.pq.pojo.param.DeviceInfoParam; import com.njcn.device.pq.pojo.param.DeviceInfoParam;
import com.njcn.device.pq.pojo.vo.DeptLineTreeVO; import com.njcn.device.pq.pojo.vo.DeptLineTreeVO;
import com.njcn.device.pq.pojo.vo.TerminalTree; import com.njcn.device.pq.pojo.vo.TerminalTree;
@@ -59,9 +60,9 @@ public class TerminalTreeController extends BaseController {
@ApiOperation("获取终端树") @ApiOperation("获取终端树")
@OperateInfo(info = LogEnum.BUSINESS_MEDIUM) @OperateInfo(info = LogEnum.BUSINESS_MEDIUM)
@GetMapping("getTerminalSelectTree") @GetMapping("getTerminalSelectTree")
public HttpResult<List<TerminalTree>> getTerminalSelectTree(Integer level){ public HttpResult<List<TerminalSelectTreeVO>> getTerminalSelectTree(Integer level){
String methodDescribe = getMethodDescribe("getTerminalSelectTree"); String methodDescribe = getMethodDescribe("getTerminalSelectTree");
List<TerminalTree> tree = terminalTreeService.getTerminalSelectTree(level); List<TerminalSelectTreeVO> tree = terminalTreeService.getTerminalSelectTree(level);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, tree, methodDescribe); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, tree, methodDescribe);
} }

3
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalTreeService.java
View File

@@ -1,6 +1,7 @@
package com.njcn.device.pq.service; package com.njcn.device.pq.service;
import com.njcn.device.biz.pojo.vo.TerminalSelectTreeVO;
import com.njcn.device.pq.pojo.param.DeviceInfoParam; import com.njcn.device.pq.pojo.param.DeviceInfoParam;
import com.njcn.device.pq.pojo.vo.DeptLineTreeVO; import com.njcn.device.pq.pojo.vo.DeptLineTreeVO;
import com.njcn.device.pq.pojo.vo.TerminalTree; import com.njcn.device.pq.pojo.vo.TerminalTree;
@@ -41,5 +42,5 @@ public interface TerminalTreeService {
*/ */
List<DeptLineTreeVO> getDeptBindDeptLineTree(String deptId, Integer deptType, String id, Integer type); List<DeptLineTreeVO> getDeptBindDeptLineTree(String deptId, Integer deptType, String id, Integer type);
List<TerminalTree> getTerminalSelectTree(Integer level); List<TerminalSelectTreeVO> getTerminalSelectTree(Integer level);
} }

3
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalTreeServiceImpl.java
View File

@@ -2,6 +2,7 @@ package com.njcn.device.pq.service.impl;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.pojo.response.HttpResult;
import com.njcn.device.biz.pojo.vo.TerminalSelectTreeVO;
import com.njcn.device.pq.enums.LineBaseEnum; import com.njcn.device.pq.enums.LineBaseEnum;
import com.njcn.device.pq.mapper.DeptLineMapper; import com.njcn.device.pq.mapper.DeptLineMapper;
import com.njcn.device.pq.mapper.LineMapper; import com.njcn.device.pq.mapper.LineMapper;
@@ -220,7 +221,7 @@ public class TerminalTreeServiceImpl implements TerminalTreeService {
* 返回的是 2-3-(5+6) * 返回的是 2-3-(5+6)
*/ */
@Override @Override
public List<TerminalTree> getTerminalSelectTree(Integer level) { public List<TerminalSelectTreeVO> getTerminalSelectTree(Integer level) {
return null; return null;
} }