From 0cd9ca6da46e47f7bb32cd61b32a5b4bc1e72f73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=B0=8F=E6=9E=97?= <320730042@qq.com> Date: Thu, 5 Sep 2024 11:12:27 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=95=85=E9=9A=9C=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DeviceStaticController.java | 7 + .../bellmann/controller/FaultController.java | 2 +- .../controller/ServiceController.java | 8 +- .../bellmann/mapper/DeviceStaticMapper.java | 5 +- .../java/com/bellmann/model/form/AlgForm.java | 9 +- .../model/query/EquipmentAdvanceQuery.java | 53 ++++++ .../com/bellmann/model/query/FaultQuery.java | 5 +- .../bellmann/service/DeviceStaticService.java | 2 + .../com/bellmann/service/ServiceService.java | 4 + .../service/impl/AuthServiceImpl.java | 3 +- .../service/impl/DeviceStaticServiceImpl.java | 12 +- .../service/impl/FaultServiceImpl.java | 2 +- .../impl/RemoteOperateTaskServiceImpl.java | 6 +- .../service/impl/ServiceServiceImpl.java | 12 ++ .../resources/mapper/DeviceStaticMapper.xml | 175 +++++++++++++----- 15 files changed, 244 insertions(+), 61 deletions(-) create mode 100644 src/main/java/com/bellmann/model/query/EquipmentAdvanceQuery.java diff --git a/src/main/java/com/bellmann/controller/DeviceStaticController.java b/src/main/java/com/bellmann/controller/DeviceStaticController.java index 191ef20..4b90fdd 100644 --- a/src/main/java/com/bellmann/controller/DeviceStaticController.java +++ b/src/main/java/com/bellmann/controller/DeviceStaticController.java @@ -11,6 +11,7 @@ import com.bellmann.common.result.Result; import com.bellmann.common.result.ResultCode; import com.bellmann.model.form.*; import com.bellmann.model.query.DevOuiSnoQuery; +import com.bellmann.model.query.EquipmentAdvanceQuery; import com.bellmann.model.query.SelectQuery; import com.bellmann.model.vo.*; import com.bellmann.plugin.dupsubmit.annotation.PreventDuplicateSubmit; @@ -53,6 +54,12 @@ public class DeviceStaticController { Page page = deviceStaticService.resourcePage(query); return PageResult.success(page); } + @PostMapping("advance-query-page") + @Operation(summary = "资源管理-设备管理高级查询接口") + public PageResult advanceQueryPage(@RequestBody EquipmentAdvanceQuery query) { + Page page = deviceStaticService.advanceQueryPage(query); + return PageResult.success(page); + } @GetMapping("resource-detail/{devId}") @Operation(summary = "资源管理-设备管理详细信息接口") diff --git a/src/main/java/com/bellmann/controller/FaultController.java b/src/main/java/com/bellmann/controller/FaultController.java index df42f17..a919dbb 100644 --- a/src/main/java/com/bellmann/controller/FaultController.java +++ b/src/main/java/com/bellmann/controller/FaultController.java @@ -44,7 +44,7 @@ public class FaultController { @Operation(summary = "基本信息查询") @PostMapping("/basic_info") - public Result basicInfoQuery(@RequestBody FaultQuery query){ + public Result basicInfoQuery(@RequestBody @Valid FaultQuery query){ FaultBasicInfoVO faultBasicInfoVO = faultService.basicInfoQuery(query); return Result.success(faultBasicInfoVO); } diff --git a/src/main/java/com/bellmann/controller/ServiceController.java b/src/main/java/com/bellmann/controller/ServiceController.java index 2b94cb4..4082b5b 100644 --- a/src/main/java/com/bellmann/controller/ServiceController.java +++ b/src/main/java/com/bellmann/controller/ServiceController.java @@ -2,6 +2,7 @@ package com.bellmann.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bellmann.common.base.BasePageQuery; +import com.bellmann.common.model.Option; import com.bellmann.common.result.PageResult; import com.bellmann.common.result.Result; import com.bellmann.model.form.BusinessForm; @@ -108,5 +109,10 @@ public class ServiceController { List list = serviceService.tabs(devId); return Result.success(list); } - + @GetMapping("/options") + @Operation(summary = "已开通的业务选择框") + public Result>> options(){ + List> list = serviceService.optionTab(); + return Result.success(list); + } } diff --git a/src/main/java/com/bellmann/mapper/DeviceStaticMapper.java b/src/main/java/com/bellmann/mapper/DeviceStaticMapper.java index 6311e73..104d709 100644 --- a/src/main/java/com/bellmann/mapper/DeviceStaticMapper.java +++ b/src/main/java/com/bellmann/mapper/DeviceStaticMapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bellmann.model.bo.*; import com.bellmann.model.dto.DeviceDetail; import com.bellmann.model.entity.DeviceStatic; +import com.bellmann.model.query.EquipmentAdvanceQuery; import com.bellmann.model.query.SoftMergeReportQuery; import com.bellmann.model.vo.*; import org.apache.ibatis.annotations.Mapper; @@ -44,5 +45,7 @@ public interface DeviceStaticMapper extends BaseMapper { List faultQueryList(@Param("column") String column, @Param("value") String value ); - FaultBasicInfoVO faultBasicInfoQuery(@Param("column") String column, @Param("value") String value); + FaultBasicInfoVO faultBasicInfoQuery(@Param("column") String column, @Param("value") Long value); + + Page advanceQueryPage(Page page, @Param("form") EquipmentAdvanceQuery query); } diff --git a/src/main/java/com/bellmann/model/form/AlgForm.java b/src/main/java/com/bellmann/model/form/AlgForm.java index b75bd9b..92013f2 100644 --- a/src/main/java/com/bellmann/model/form/AlgForm.java +++ b/src/main/java/com/bellmann/model/form/AlgForm.java @@ -1,26 +1,25 @@ package com.bellmann.model.form; import lombok.Data; -import lombok.ToString; import javax.validation.constraints.NotBlank; @Data -@ToString public class AlgForm { @NotBlank(message = "必填参数不能为空") private String h323Enable; @NotBlank(message = "必填参数不能为空") - private String sIPEnable; + private String sipEnable; @NotBlank(message = "必填参数不能为空") - private String rTSPEnable; + private String rtspEnable; @NotBlank(message = "必填参数不能为空") private String l2TPEnable; @NotBlank(message = "必填参数不能为空") - private String iPSECEnable; + private String ipsecEnable; + } diff --git a/src/main/java/com/bellmann/model/query/EquipmentAdvanceQuery.java b/src/main/java/com/bellmann/model/query/EquipmentAdvanceQuery.java new file mode 100644 index 0000000..f8e7c0e --- /dev/null +++ b/src/main/java/com/bellmann/model/query/EquipmentAdvanceQuery.java @@ -0,0 +1,53 @@ +package com.bellmann.model.query; + +import com.bellmann.common.base.BasePageQuery; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@EqualsAndHashCode(callSuper = true) +@Data +public class EquipmentAdvanceQuery extends BasePageQuery { + + private String devSno; + + private String devMac; + + private String devAdNo; + + private String devPppoe; + + private String logicId; + + private String startTime; + + private String endTime; + + private Long regionAreaId; + + private String devVendorName; + + private String devTypeName; + + private String devHardVer; + + private String softVer; + + private String devAccessType; + + private String devType; + + private String devOnline; + + private String devStatus; + + private String devIp; + + private Long service; + + private String voipPhone; + + private String sortColumn; + + private String sortRules; + +} diff --git a/src/main/java/com/bellmann/model/query/FaultQuery.java b/src/main/java/com/bellmann/model/query/FaultQuery.java index bd26cc8..245da5a 100644 --- a/src/main/java/com/bellmann/model/query/FaultQuery.java +++ b/src/main/java/com/bellmann/model/query/FaultQuery.java @@ -2,9 +2,12 @@ package com.bellmann.model.query; import lombok.Data; +import javax.validation.constraints.NotNull; + @Data public class FaultQuery { - private String value; + @NotNull(message = "参数不能为空") + private String value; private String label; diff --git a/src/main/java/com/bellmann/service/DeviceStaticService.java b/src/main/java/com/bellmann/service/DeviceStaticService.java index d8b0ffe..c1a949a 100644 --- a/src/main/java/com/bellmann/service/DeviceStaticService.java +++ b/src/main/java/com/bellmann/service/DeviceStaticService.java @@ -6,6 +6,7 @@ import com.bellmann.common.result.PageResult; import com.bellmann.common.result.Result; import com.bellmann.model.form.*; import com.bellmann.model.query.DevOuiSnoQuery; +import com.bellmann.model.query.EquipmentAdvanceQuery; import com.bellmann.model.query.SelectQuery; import com.bellmann.model.vo.EquipmentVO; import com.bellmann.model.vo.RemoteDevInfoVO; @@ -83,4 +84,5 @@ public interface DeviceStaticService { boolean deleteInstanceNode(Long devId, String nodePath); boolean taskIsSuccess(Long taskId); + Page advanceQueryPage(EquipmentAdvanceQuery query); } diff --git a/src/main/java/com/bellmann/service/ServiceService.java b/src/main/java/com/bellmann/service/ServiceService.java index 8e2d186..fdf317d 100644 --- a/src/main/java/com/bellmann/service/ServiceService.java +++ b/src/main/java/com/bellmann/service/ServiceService.java @@ -2,6 +2,7 @@ package com.bellmann.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bellmann.common.base.BasePageQuery; +import com.bellmann.common.model.Option; import com.bellmann.common.result.Result; import com.bellmann.model.form.BusinessForm; import com.bellmann.model.form.FileRecordForm; @@ -39,4 +40,7 @@ public interface ServiceService { Result deleteBusinessFile(Long fileId, Long servId); List tabs(Long devId); + + List> optionTab(); + } diff --git a/src/main/java/com/bellmann/service/impl/AuthServiceImpl.java b/src/main/java/com/bellmann/service/impl/AuthServiceImpl.java index c574b6e..f5a96ea 100644 --- a/src/main/java/com/bellmann/service/impl/AuthServiceImpl.java +++ b/src/main/java/com/bellmann/service/impl/AuthServiceImpl.java @@ -86,7 +86,6 @@ public class AuthServiceImpl implements AuthService { @Override public LoginResult login(String code) { - //HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); //String code4A = request.getParameter("code"); log.info("start login ... {}", code); @@ -103,7 +102,7 @@ public class AuthServiceImpl implements AuthService { String res = HttpUtil.doPost(config4A.getHttpTokenAuthUrl(), map); BsOrCsResponeResult bsOrCsResponeResult = null; bsOrCsResponeResult = JSONObject.parseObject(res, BsOrCsResponeResult.class); - + log.info("res:{}",res); String token = bsOrCsResponeResult.getAccess_token(); try { token = RSAUtils.decryptByPrivateKeyStr(token, config4A.getSecurity()); diff --git a/src/main/java/com/bellmann/service/impl/DeviceStaticServiceImpl.java b/src/main/java/com/bellmann/service/impl/DeviceStaticServiceImpl.java index 672cbde..7ca724d 100644 --- a/src/main/java/com/bellmann/service/impl/DeviceStaticServiceImpl.java +++ b/src/main/java/com/bellmann/service/impl/DeviceStaticServiceImpl.java @@ -27,6 +27,7 @@ import com.bellmann.model.dto.OperationTask; import com.bellmann.model.entity.*; import com.bellmann.model.form.*; import com.bellmann.model.query.DevOuiSnoQuery; +import com.bellmann.model.query.EquipmentAdvanceQuery; import com.bellmann.model.query.SelectQuery; import com.bellmann.model.vo.*; import com.bellmann.runner.UIService; @@ -118,6 +119,15 @@ public class DeviceStaticServiceImpl implements DeviceStaticService { return deviceStaticConverter.resourceBOPage2VOPage(boPage); } + @Override + public Page advanceQueryPage(EquipmentAdvanceQuery query) { + int pageNum = query.getPageNum(); + int pageSize = query.getPageSize(); + Page page = new Page<>(pageNum, pageSize); + Page boPage = deviceStaticMapper.advanceQueryPage(page,query); + return deviceStaticConverter.resourceBOPage2VOPage(boPage); + } + @Override public Map resourceDeviceDetail(Long devId) { EquipmentDetailVO detailVO = deviceStaticMapper.detailInfo(devId); @@ -1487,7 +1497,7 @@ public class DeviceStaticServiceImpl implements DeviceStaticService { @Override public boolean taskIsSuccess(Long taskId) { int attempt = 0; - while (attempt < 10) { + while (attempt < 15) { OperateResult2 operateResult2 = operateResult2Mapper.selectOne( new QueryWrapper() .eq("oper_task_id", taskId) diff --git a/src/main/java/com/bellmann/service/impl/FaultServiceImpl.java b/src/main/java/com/bellmann/service/impl/FaultServiceImpl.java index fee1dbf..155f722 100644 --- a/src/main/java/com/bellmann/service/impl/FaultServiceImpl.java +++ b/src/main/java/com/bellmann/service/impl/FaultServiceImpl.java @@ -60,7 +60,7 @@ public class FaultServiceImpl implements FaultService { @Override public FaultBasicInfoVO basicInfoQuery(FaultQuery query) { - FaultBasicInfoVO faultBasicInfoQuery = deviceStaticMapper.faultBasicInfoQuery(query.getLabel(), query.getValue()); + FaultBasicInfoVO faultBasicInfoQuery = deviceStaticMapper.faultBasicInfoQuery(query.getLabel(), Long.parseLong(query.getValue())); Long customId = faultBasicInfoQuery.getCustId(); if (customId != null) { Customer customer = customerManager.findByCustomId(customId); diff --git a/src/main/java/com/bellmann/service/impl/RemoteOperateTaskServiceImpl.java b/src/main/java/com/bellmann/service/impl/RemoteOperateTaskServiceImpl.java index a9df9ca..343f220 100644 --- a/src/main/java/com/bellmann/service/impl/RemoteOperateTaskServiceImpl.java +++ b/src/main/java/com/bellmann/service/impl/RemoteOperateTaskServiceImpl.java @@ -235,12 +235,12 @@ public class RemoteOperateTaskServiceImpl implements RemoteOperateTaskService { argsStructs[1] = new DOperTaskArgsStruct(); argsStructs[1].argsName = "InternetGatewayDevice.DeviceInfo.X_CT-COM_ALGAbility.SIPEnable"; - argsStructs[1].argsValue = algForm.getSIPEnable(); //SIP开关 + argsStructs[1].argsValue = algForm.getSipEnable(); //SIP开关 argsStructs[1].operTaskId = Utils.LONG_NULL; argsStructs[2] = new DOperTaskArgsStruct(); argsStructs[2].argsName = "InternetGatewayDevice.DeviceInfo.X_CT-COM_ALGAbility.RTSPEnable"; - argsStructs[2].argsValue = algForm.getRTSPEnable(); //RTSP开关 + argsStructs[2].argsValue = algForm.getRtspEnable(); //RTSP开关 argsStructs[2].operTaskId = Utils.LONG_NULL; argsStructs[3] = new DOperTaskArgsStruct(); @@ -250,7 +250,7 @@ public class RemoteOperateTaskServiceImpl implements RemoteOperateTaskService { argsStructs[4] = new DOperTaskArgsStruct(); argsStructs[4].argsName = "InternetGatewayDevice.DeviceInfo.X_CT-COM_ALGAbility.IPSECEnable"; - argsStructs[4].argsValue = algForm.getIPSECEnable(); //IPSEV开关 + argsStructs[4].argsValue = algForm.getIpsecEnable(); //IPSEV开关 argsStructs[4].operTaskId = Utils.LONG_NULL; detailStruct.operTaskArgsList = argsStructs; diff --git a/src/main/java/com/bellmann/service/impl/ServiceServiceImpl.java b/src/main/java/com/bellmann/service/impl/ServiceServiceImpl.java index 38898da..1601d4d 100644 --- a/src/main/java/com/bellmann/service/impl/ServiceServiceImpl.java +++ b/src/main/java/com/bellmann/service/impl/ServiceServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bellmann.common.base.BasePageQuery; import com.bellmann.common.base.IBaseEnum; import com.bellmann.common.enums.ServiceMapStatusEnum; +import com.bellmann.common.model.Option; import com.bellmann.common.result.Result; import com.bellmann.common.result.ResultCode; import com.bellmann.converter.FileRecordConverter; @@ -198,6 +199,17 @@ public class ServiceServiceImpl implements ServiceService { }); } return tabs; + } + + @Override + public List> optionTab() { + List list = serviceMapper.selectList(new LambdaQueryWrapper<>()); + return list.stream().map(obj->{ + Option option = new Option<>(); + option.setLabel(obj.getServName()+"("+obj.getServVerName()+")"); + option.setValue(obj.getServId()); + return option; + }).collect(Collectors.toList()); } } diff --git a/src/main/resources/mapper/DeviceStaticMapper.xml b/src/main/resources/mapper/DeviceStaticMapper.xml index e877b40..44b67ea 100644 --- a/src/main/resources/mapper/DeviceStaticMapper.xml +++ b/src/main/resources/mapper/DeviceStaticMapper.xml @@ -44,41 +44,119 @@ + @@ -491,8 +576,8 @@ LEFT JOIN ITMS_DEVICE_DYNAMIC dd ON aa.DEV_ID = dd.DEV_ID LEFT JOIN itms_device_static_detail ff ON aa.dev_id = ff.dev_id WHERE - - aa.dev_sno = #{value}; + + aa.dev_id = #{value};