From 376aab019da8a4683d3f00270e6947e775811ffb Mon Sep 17 00:00:00 2001 From: zhangbaojian <1065122561@qq.com> Date: Thu, 25 May 2023 16:33:12 +0800 Subject: [PATCH] =?UTF-8?q?zbj//1.=E8=B5=84=E6=BA=90=E7=AE=A1=E7=90=86(?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=95=B0=E6=8D=AE)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pq/controller/ResourceController.java | 15 ++++----- .../njcn/device/pq/mapper/ResourceMapper.java | 1 - .../pq/mapper/mapping/ResourceMapper.xml | 5 --- .../device/pq/service/ResourceService.java | 4 +-- .../pq/service/impl/ResourceServiceImpl.java | 31 +++---------------- 5 files changed, 14 insertions(+), 42 deletions(-) diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/ResourceController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/ResourceController.java index cf333ba3e..9aa86f6e8 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/ResourceController.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/ResourceController.java @@ -6,6 +6,7 @@ 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.pq.pojo.param.LargeScreenParam; +import com.njcn.device.pq.pojo.po.ResourceData; import com.njcn.device.pq.pojo.vo.MonitoringPointScaleVO; import com.njcn.device.pq.service.LargeScreenService; import com.njcn.device.pq.service.ResourceService; @@ -53,21 +54,21 @@ public class ResourceController extends BaseController { Boolean flag = iResourceAdministrationService.uploadFile(multipartFile, picture, name, type); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe); } - /* - *//** + + /** * 查询数据 - *//* + * @return List + */ @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/queryData") @ApiOperation("查询数据") - @ApiImplicitParam(name = "resinformation", value = "查询数据", required = true) - public HttpResult> queryData(@RequestBody Resinformation resinformation) { + public HttpResult> queryData() { String methodDescribe = getMethodDescribe("queryData"); - List result = iResourceAdministrationService.queryData(resinformation); + List result = iResourceAdministrationService.queryData(); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } - *//** + /** * 修改资源 *//* @OperateInfo(info = LogEnum.BUSINESS_COMMON) diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/ResourceMapper.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/ResourceMapper.java index df486de7b..8b27721dd 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/ResourceMapper.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/ResourceMapper.java @@ -12,5 +12,4 @@ import java.util.List; * @date: 2023/05/25 */ public interface ResourceMapper extends BaseMapper { - List listAll(); } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/ResourceMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/ResourceMapper.xml index 1c02aabbc..6c55f37a0 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/ResourceMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/ResourceMapper.xml @@ -1,9 +1,4 @@ - diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/ResourceService.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/ResourceService.java index 5b1984987..daa28757b 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/ResourceService.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/ResourceService.java @@ -21,8 +21,8 @@ public interface ResourceService extends IService { Boolean uploadFile(MultipartFile multipartFile, MultipartFile picture, String name, Integer type); - /* List queryData(Resinformation resinformation); - + List queryData(); + /* Boolean updateFile(MultipartFile multipartFile, String id, String name, String type, String description, String systemType); Boolean deleteFile(String id); diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/ResourceServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/ResourceServiceImpl.java index 2fe018b28..88a4f9629 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/ResourceServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/ResourceServiceImpl.java @@ -72,36 +72,13 @@ public class ResourceServiceImpl extends ServiceImpl queryData(Resinformation resinformation) { - - if (StringUtils.isNotBlank(resinformation.getType()) && StringUtils.isNotBlank(resinformation.getSystemType())) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - //type - wrapper.eq(Resinformation::getType, resinformation.getType()); - //sysType - wrapper.eq(Resinformation::getSystemType, resinformation.getSystemType()); - return resourceAdministrationMapper.selectList(wrapper); - - } else if (StringUtils.isBlank(resinformation.getType()) && StringUtils.isBlank(resinformation.getSystemType())) { - - return this.list(); - - } else if (StringUtils.isNotBlank(resinformation.getType()) && StringUtils.isBlank(resinformation.getSystemType())) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - //type - wrapper.eq(Resinformation::getType, resinformation.getType()); - return resourceAdministrationMapper.selectList(wrapper); - } else { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - //sysType - wrapper.eq(Resinformation::getSystemType, resinformation.getSystemType()); - return resourceAdministrationMapper.selectList(wrapper); - } + public List queryData() { + return this.list(); } - +/* @Override public Boolean updateFile(MultipartFile multipartFile, String id, String name, String type, String description, String systemType) { Resinformation resinformation = resourceAdministrationMapper.selectById(id);