From 1b0936cd08d9221a33470ee0b2cce3cc046560c5 Mon Sep 17 00:00:00 2001 From: mashuai Date: Fri, 20 Sep 2024 13:09:05 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/controller/TbUserPostController.java | 10 --- .../bonus/base/mapper/TbUserPostMapper.java | 48 ---------- .../bonus/base/service/TbUserPostService.java | 15 ---- .../service/impl/TbUserPostServiceImpl.java | 21 ----- .../com/bonus/base/vo/TbDevAttributeVo.java | 57 +++++++++++- .../mapper/base/TbUserPostMapper.xml | 90 ++----------------- 6 files changed, 60 insertions(+), 181 deletions(-) diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbUserPostController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbUserPostController.java index 057dc65..4d4f317 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbUserPostController.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbUserPostController.java @@ -42,16 +42,6 @@ public class TbUserPostController extends BaseController { return AjaxResult.success(getDataTable(list)); } - /** - * 通过主键查询单条数据 - * - * @param id 主键 - * @return 单条数据 - */ - @GetMapping("/{id}") - public AjaxResult queryById(@PathVariable("id") Long id) { - return AjaxResult.success(tbUserPostService.queryById(id)); - } /** * 新增数据 diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/TbUserPostMapper.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/TbUserPostMapper.java index a8c8e1b..73e7a9d 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/TbUserPostMapper.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/TbUserPostMapper.java @@ -13,30 +13,6 @@ import java.util.List; */ public interface TbUserPostMapper { - /** - * 通过ID查询单条数据 - * - * @param id 主键 - * @return 实例对象 - */ - TbUserPost queryById(Long id); - - /** - * 查询指定行数据 - * - * @param tbUserPost 查询条件 - * @param pageable 分页对象 - * @return 对象列表 - */ - List queryAllByLimit(TbUserPost tbUserPost, @Param("pageable") Pageable pageable); - - /** - * 统计总行数 - * - * @param tbUserPost 查询条件 - * @return 总行数 - */ - long count(TbUserPost tbUserPost); /** * 新增数据 @@ -46,30 +22,6 @@ public interface TbUserPostMapper { */ int insert(TbUserPost tbUserPost); - /** - * 批量新增数据（MyBatis原生foreach方法） - * - * @param entities List 实例对象列表 - * @return 影响行数 - */ - int insertBatch(@Param("entities") List entities); - - /** - * 批量新增或按主键更新数据（MyBatis原生foreach方法） - * - * @param entities List 实例对象列表 - * @return 影响行数 - * @throws org.springframework.jdbc.BadSqlGrammarException 入参是空List的时候会抛SQL语句错误的异常，请自行校验入参 - */ - int insertOrUpdateBatch(@Param("entities") List entities); - - /** - * 修改数据 - * - * @param tbUserPost 实例对象 - * @return 影响行数 - */ - int update(TbUserPost tbUserPost); /** * 分页查询 diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/TbUserPostService.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/TbUserPostService.java index 8f161de..83ea0dd 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/TbUserPostService.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/TbUserPostService.java @@ -13,14 +13,6 @@ import java.util.List; */ public interface TbUserPostService { - /** - * 通过ID查询单条数据 - * - * @param id 主键 - * @return 实例对象 - */ - TbUserPost queryById(Long id); - /** * 分页查询 * @@ -37,12 +29,5 @@ public interface TbUserPostService { */ AjaxResult insert(TbUserPost tbUserPost); - /** - * 修改数据 - * - * @param tbUserPost 实例对象 - * @return 实例对象 - */ - TbUserPost update(TbUserPost tbUserPost); } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbUserPostServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbUserPostServiceImpl.java index cd97ca3..e5f2ad9 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbUserPostServiceImpl.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbUserPostServiceImpl.java @@ -21,16 +21,6 @@ public class TbUserPostServiceImpl implements TbUserPostService { @Resource private TbUserPostMapper tbUserPostDao; - /** - * 通过ID查询单条数据 - * - * @param id 主键 - * @return 实例对象 - */ - @Override - public TbUserPost queryById(Long id) { - return tbUserPostDao.queryById(id); - } /** * 分页查询 @@ -59,16 +49,5 @@ public class TbUserPostServiceImpl implements TbUserPostService { } } - /** - * 修改数据 - * - * @param tbUserPost 实例对象 - * @return 实例对象 - */ - @Override - public TbUserPost update(TbUserPost tbUserPost) { - this.tbUserPostDao.update(tbUserPost); - return this.queryById(tbUserPost.getId()); - } } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/vo/TbDevAttributeVo.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/vo/TbDevAttributeVo.java index 02b8e0c..2933b69 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/vo/TbDevAttributeVo.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/vo/TbDevAttributeVo.java @@ -1,18 +1,28 @@ package com.bonus.base.vo; -import com.bonus.base.domain.TbDevAttribute; import com.bonus.common.core.annotation.Excel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.Size; /** * @Author ma_sh * @create 2024/9/19 19:52 */ @Data -public class TbDevAttributeVo extends TbDevAttribute { +public class TbDevAttributeVo { + + /** + * 主键 + */ + @ApiModelProperty(value="主键") + private Long id; + + /** + * 设备id + */ + @ApiModelProperty(value="设备id") + private Long devId; /** * 设备类型(码表) @@ -41,6 +51,47 @@ public class TbDevAttributeVo extends TbDevAttribute { @Excel(name = "预警设备编号") private String devCode; + /** + * 检测名称 + */ + @ApiModelProperty(value="检测名称") + private String jcName; + + /** + * 检测值 + */ + @ApiModelProperty(value="检测值") + private String jcValue; + + /** + * 单位 + */ + @ApiModelProperty(value="单位") + private String jcUnit; + + /** + * 图标 + */ + @ApiModelProperty(value="图标") + private String logoUrl; + + /** + * 删除状态 + */ + @ApiModelProperty(value="删除状态") + private Integer delFlag; + + /** + * 级联编码(唯一) + */ + @ApiModelProperty(value="级联编码(唯一)") + private String relCode; + + /** + * 是否告警 0 正常 1 告警 + */ + @ApiModelProperty(value="是否告警 0 正常 1 告警") + private Integer isWarn; /** * 是否告警 0 正常 1 告警 */ diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbUserPostMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbUserPostMapper.xml index 8f975d6..b132fb6 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbUserPostMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbUserPostMapper.xml @@ -2,106 +2,28 @@ - - + select + id as id, post_name as postName, rel_name as relName, rel_phone as relPhone, create_time as createTime, pro_id as proId from tb_user_post - - and id = #{id} - - - and post_name = #{postName} - - - and rel_name = #{relName} - - - and rel_phone = #{relPhone} - and create_time = #{createTime} - - and pro_id = #{proId} - - - - - - - insert into tb_user_post(post_name, rel_name, rel_phone, create_time, pro_id) - values (#{postName}, #{relName}, #{relPhone}, NOW(), #{proId}) + values (#{postName}, #{relName}, #{relPhone}, #{createTime}, #{proId}) - - insert into tb_user_post(post_name, rel_name, rel_phone, create_time, pro_id) - values - - (#{entity.postName}, #{entity.relName}, #{entity.relPhone}, #{entity.createTime}, #{entity.proId}) - - - - - insert into tb_user_post(post_name, rel_name, rel_phone, create_time, pro_id) - values - - (#{entity.postName}, #{entity.relName}, #{entity.relPhone}, #{entity.createTime}, #{entity.proId}) - - on duplicate key update - post_name = values(post_name), - rel_name = values(rel_name), - rel_phone = values(rel_phone), - create_time = values(create_time), - pro_id = values(pro_id) - - - - - update tb_user_post - - - post_name = #{postName}, - - - rel_name = #{relName}, - - - rel_phone = #{relPhone}, - - - create_time = #{createTime}, - - - pro_id = #{proId}, - - - where id = #{id} - -