From 8e263ad50a2ba2a3416268ce17b4c09d3992586d Mon Sep 17 00:00:00 2001 From: huangzj <826100833@qq.com> Date: Mon, 17 Apr 2023 14:14:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/param/CsDevModelQueryListParm.java | 24 +++++++++---------- .../algorithm/pojo/vo/CsDevModelPageVO.java | 7 +++--- .../Equipment/DevModelController.java | 12 ++++------ .../algorithm/mapper/CsDevModelMapper.java | 4 +--- .../mapper/mapping/CsDevModelMapper.xml | 14 +++++------ .../algorithm/service/CsDevModelService.java | 11 +++++---- .../service/impl/CsDevModelServiceImpl.java | 14 ++++++----- 7 files changed, 42 insertions(+), 44 deletions(-) diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsDevModelQueryListParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsDevModelQueryListParm.java index d97819dd4..64d0c377d 100644 --- a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsDevModelQueryListParm.java +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsDevModelQueryListParm.java @@ -33,18 +33,18 @@ public class CsDevModelQueryListParm { @ApiModelProperty(value = "版本号") private String versionNo; - /** - * 版本日期 - */ - @ApiModelProperty(value = "版本日期") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - private String versionStartDate; - - @ApiModelProperty(value = "版本日期") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - private String versionEndDate; +// /** +// * 版本日期 +// */ +// @ApiModelProperty(value = "版本日期") +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") +// @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") +// private String versionStartDate; +// +// @ApiModelProperty(value = "版本日期") +// @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") +// private String versionEndDate; @ApiModelProperty(value = "版本准确日期") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsDevModelPageVO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsDevModelPageVO.java index 8b71e07cb..97f7c5b72 100644 --- a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsDevModelPageVO.java +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsDevModelPageVO.java @@ -1,6 +1,5 @@ package com.njcn.algorithm.pojo.vo; -import com.baomidou.mybatisplus.annotation.TableField; import com.njcn.db.bo.BaseEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -33,7 +32,7 @@ public class CsDevModelPageVO extends BaseEntity { private String devType; @ApiModelProperty(value = "设备模板型号id名称") private String devName; - @TableField(value = "模板名称") + @ApiModelProperty(value = "模板名称") private String name; /** @@ -52,13 +51,13 @@ public class CsDevModelPageVO extends BaseEntity { /** * 装置模板文件路径 */ - @TableField(value = "file_path") + @ApiModelProperty(value = "file_path") private String filePath; /** * 状态(0：删除 1：正常) */ - @TableField(value = "status") + @ApiModelProperty(value = "status") private String status; } \ No newline at end of file diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/Equipment/DevModelController.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/Equipment/DevModelController.java index 7546bd1b2..231454acb 100644 --- a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/Equipment/DevModelController.java +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/Equipment/DevModelController.java @@ -24,8 +24,6 @@ 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; - /** * Description: * 接口文档访问地址：http://serverIP:port/swagger-ui.html @@ -80,14 +78,14 @@ public class DevModelController extends BaseController { } @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @PostMapping("/queryEquipmentByProject") + @PostMapping("/queryDevModelOne") @ApiOperation("设备模板列表查询") @ApiImplicitParam(name = "csDevModelQueryListParm", value = "信息", required = true) - public HttpResult> queryEquipmentByProject(@RequestBody CsDevModelQueryListParm csDevModelQueryListParm){ - String methodDescribe = getMethodDescribe("queryEquipmentByProject"); + public HttpResult queryDevModelOne(@RequestBody CsDevModelQueryListParm csDevModelQueryListParm){ + String methodDescribe = getMethodDescribe("queryDevModelOne"); - List list = csDevModelService.queryList(csDevModelQueryListParm); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); + CsDevModelPageVO csDevModelPageVO = csDevModelService.queryDevModelOne(csDevModelQueryListParm); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, csDevModelPageVO, methodDescribe); } diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/CsDevModelMapper.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/CsDevModelMapper.java index 72782f51e..54350e376 100644 --- a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/CsDevModelMapper.java +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/CsDevModelMapper.java @@ -8,8 +8,6 @@ import com.njcn.algorithm.pojo.po.CsDevModelPO; import com.njcn.algorithm.pojo.vo.CsDevModelPageVO; import org.apache.ibatis.annotations.Param; -import java.util.List; - /** * * Description: @@ -22,5 +20,5 @@ import java.util.List; public interface CsDevModelMapper extends BaseMapper { Page getPage(Page returnpage,@Param("csDevModelQueryParm") CsDevModelQueryParm csDevModelQueryParm); - List queryList(@Param("csDevModelQueryListParm")CsDevModelQueryListParm csDevModelQueryListParm); + CsDevModelPageVO queryOne(@Param("csDevModelQueryListParm")CsDevModelQueryListParm csDevModelQueryListParm); } \ No newline at end of file diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsDevModelMapper.xml b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsDevModelMapper.xml index f74fef4ec..32c28537e 100644 --- a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsDevModelMapper.xml +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsDevModelMapper.xml @@ -42,19 +42,19 @@ AND a.name = #{csDevModelQueryParm.name} -