From 33a52beaad04d260cd4b8e44928121085c09bd6d Mon Sep 17 00:00:00 2001 From: zhangbaojian <1065122561@qq.com> Date: Wed, 24 May 2023 14:17:15 +0800 Subject: [PATCH] =?UTF-8?q?zbj//=201.=E7=A8=8B=E5=BA=8F=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=A2=9E=E5=8A=A0=E6=90=9C=E7=B4=A2=E6=A1=86?= =?UTF-8?q?=E5=85=A5=E5=8F=82,=E4=BD=BF=E7=94=A8=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E6=8E=A5=E6=94=B6=E5=8F=82=E6=95=B0=20=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E8=B0=83=E6=95=B4=202.=E7=BB=88=E7=AB=AF=E8=BF=90=E7=BB=B4?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=BB=88=E7=AB=AF=E6=B5=81=E9=87=8F=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3=20cld=5Fdev=5Ffuc?= =?UTF-8?q?tion=E8=A1=A8=E6=96=B0=E5=A2=9E=E6=95=B0=E6=8D=AE(test=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=B1=BB=E5=88=A0=E9=99=A4)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/pq/pojo/param/ProgramParam.java | 20 +++++++++++++++++++ .../njcn/device/pq/pojo/po/DevFuction.java | 6 ++++++ .../controller/ProgramVersionController.java | 7 +++++-- .../device/pq/mapper/DevFuctionMapper.java | 5 ++++- .../pq/mapper/ProgramVersionMapper.java | 3 ++- .../pq/mapper/mapping/DevFuctionMapper.xml | 12 +++++++++++ .../mapper/mapping/ProgramVersionMapper.xml | 3 +++ .../device/pq/service/DevFuctionService.java | 15 ++++++++++++++ .../pq/service/ProgramVersionService.java | 3 ++- .../service/impl/DevFuctionServiceImpl.java | 18 +++++++++++++++++ .../impl/ProgramVersionServiceImpl.java | 15 +++++++------- 11 files changed, 95 insertions(+), 12 deletions(-) create mode 100644 pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/ProgramParam.java create mode 100644 pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/DevFuctionService.java create mode 100644 pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DevFuctionServiceImpl.java diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/ProgramParam.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/ProgramParam.java new file mode 100644 index 000000000..d3ef8e4fc --- /dev/null +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/ProgramParam.java @@ -0,0 +1,20 @@ +package com.njcn.device.pq.pojo.param; + +import com.njcn.web.pojo.param.BaseParam; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import java.io.Serializable; + + +/** + * @version 1.0.0 + * @author: zbj + * @date: 2023/05/23 + */ +@Data +public class ProgramParam extends BaseParam implements Serializable { + + @ApiModelProperty(name = "devType", value = "装置系列,字典表", required = false) + private String devType; + +} \ No newline at end of file diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/DevFuction.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/DevFuction.java index c31654a13..9c462b341 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/DevFuction.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/DevFuction.java @@ -1,7 +1,10 @@ package com.njcn.device.pq.pojo.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import org.influxdb.annotation.Column; /** *

@@ -20,16 +23,19 @@ public class DevFuction { /** * 装置功能Id */ + @TableId("Id") private String id; /** * 装置序号 */ + @TableField("Line_Id") private String lineId; /** * 功能码,字典表 */ + @TableField("Fuc_Name") private String fucName; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/ProgramVersionController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/ProgramVersionController.java index 632bbc3ad..6fceb4fb7 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/ProgramVersionController.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/ProgramVersionController.java @@ -7,6 +7,8 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; 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.param.ProgramParam; import com.njcn.device.pq.pojo.vo.VersionVO; import com.njcn.device.pq.service.ProgramVersionService; import com.njcn.web.controller.BaseController; @@ -41,9 +43,10 @@ public class ProgramVersionController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/getProgramVersion") @ApiOperation("程序版本查询") - public HttpResult> getProgramVersion(@RequestParam(value = "devType",required = false) String devType,@RequestParam("pageSize") Integer pageSize,@RequestParam("pageNum") Integer pageNum) { + @ApiImplicitParam(name = "programParam", value = "程序版本查询", required = true) + public HttpResult> getProgramVersion(@RequestBody @Validated ProgramParam programParam) { String methodDescribe = getMethodDescribe("getProgramVersion"); - Page list = programService.getProgramVersion(devType, pageSize, pageNum); + Page list = programService.getProgramVersion(programParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DevFuctionMapper.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DevFuctionMapper.java index e93a4c7bc..9325acf7f 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DevFuctionMapper.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DevFuctionMapper.java @@ -9,7 +9,7 @@ import java.util.List; /** *

- * Mapper 接口 + * Mapper 接口 *

* * @author cdf @@ -19,4 +19,7 @@ public interface DevFuctionMapper extends BaseMapper { int addBatch(@Param("list") List list); + //查询pq_line表等级为5的装置去device表查装置id与装置功能存入cld_dev_fuction表 + List selectLineTable(); + List selectDictTable(); } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/ProgramVersionMapper.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/ProgramVersionMapper.java index 5cd92cd18..b8715056a 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/ProgramVersionMapper.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/ProgramVersionMapper.java @@ -1,5 +1,6 @@ package com.njcn.device.pq.mapper; +import com.njcn.device.pq.pojo.param.ProgramParam; import com.njcn.device.pq.pojo.vo.ShowVersionVO; import com.njcn.device.pq.pojo.vo.VersionVO; import org.apache.ibatis.annotations.Param; @@ -16,7 +17,7 @@ public interface ProgramVersionMapper { /** * 获取终端版本信息，根据装置型号查询 */ - List getVersion(String devType); + List getVersion(ProgramParam programParam); /** * 根据id获取终端版本信息 */ diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DevFuctionMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DevFuctionMapper.xml index 61665a78e..2cb640828 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DevFuctionMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DevFuctionMapper.xml @@ -8,4 +8,16 @@ (#{item.id},#{item.lineId},#{item.fucName}) + + + + diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/ProgramVersionMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/ProgramVersionMapper.xml index cbdcf8bf1..e1e2c6fe6 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/ProgramVersionMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/ProgramVersionMapper.xml @@ -26,6 +26,9 @@ AND A.Dev_Type = #{devType} + + AND (A.`Name` like concat('%',#{searchValue},'%') or A.`Protocol` like concat('%',#{searchValue},'%') or A.`Remark` like concat('%',#{searchValue},'%')) +