From c3f2b8464ecbd4557a30bd21d89f97f041e8ca0f Mon Sep 17 00:00:00 2001 From: jjLv <1981429112@qq.com> Date: Thu, 8 Aug 2024 11:25:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=B1=9E=E6=80=A7=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/bracelet/vo/AttributeVo.java | 51 +++++++++++++++++++ .../controller/BraceletController.java | 17 +++++-- .../bonus/bracelet/mapper/BraceletMapper.java | 19 +++++-- .../bracelet/service/IBraceletService.java | 12 +++-- .../service/impl/BraceletServiceImpl.java | 29 +++++++++-- .../mapper/bracelet/BraceletMapper.xml | 24 +++++++++ 6 files changed, 136 insertions(+), 16 deletions(-) create mode 100644 bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/AttributeVo.java diff --git a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/AttributeVo.java b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/AttributeVo.java new file mode 100644 index 0000000..49aedb9 --- /dev/null +++ b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/AttributeVo.java @@ -0,0 +1,51 @@ +package com.bonus.common.entity.bracelet.vo; + +import com.bonus.common.core.annotation.Excel; +import com.bonus.common.core.annotation.Excel.ColumnType; +import io.swagger.annotations.Api; +import lombok.Data; + +/** + * 设备属性 + */ +@Api("AttributeVo") +@Data +public class AttributeVo +{ + + /** + * 序号 + */ + private String serialNumber; + /** 主键id */ + + private Long id; + + /** 手环id */ + @Excel(name = "手环id", cellType = ColumnType.NUMERIC) + private Integer shId; + + /** 设备id */ + @Excel(name = "设备id", cellType = ColumnType.NUMERIC) + private Integer devId; + + /** 级联编码 */ + @Excel(name = "级联编码") + private String dataCode; + + + /** 设备属性名称 */ + @Excel(name = "设备属性名称") + private String dataName; + + /** 设备采集值 */ + @Excel(name = "设备采集值") + private String dataVal; + + + /** 设备值单位 */ + @Excel(name = "设备值单位") + private String dataUnit; + + +} diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/BraceletController.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/BraceletController.java index 1b75ce7..8e98a90 100644 --- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/BraceletController.java +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/BraceletController.java @@ -4,10 +4,7 @@ import com.bonus.bracelet.service.IBraceletService; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.web.page.TableDataInfo; -import com.bonus.common.entity.bracelet.vo.BraceletVo; -import com.bonus.common.entity.bracelet.vo.DeviceVo; -import com.bonus.common.entity.bracelet.vo.ShboxVo; -import com.bonus.common.entity.bracelet.vo.SidebandDeviceVo; +import com.bonus.common.entity.bracelet.vo.*; import com.bonus.common.log.annotation.SysLog; import com.bonus.common.log.enums.OperaType; import com.bonus.common.security.annotation.RequiresPermissions; @@ -140,6 +137,18 @@ public class BraceletController extends BaseController { return braceletservice.addSh(vo); } + /** + * 新增设备属性信息 + * @param vo + * @return + */ + @PostMapping("addAttribute") + @SysLog(title = "手环管理", businessType = OperaType.INSERT, module = "基础管理->手环管理", details = "新增设备属性") + public AjaxResult addAttribute(@Validated @RequestBody AttributeVo vo) { + return braceletservice.addAttribute(vo); + } + + /** * 新增手环箱信息 * @param vo diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/BraceletMapper.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/BraceletMapper.java index a9bc579..f1df462 100644 --- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/BraceletMapper.java +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/BraceletMapper.java @@ -1,9 +1,6 @@ package com.bonus.bracelet.mapper; -import com.bonus.common.entity.bracelet.vo.BraceletVo; -import com.bonus.common.entity.bracelet.vo.DeviceVo; -import com.bonus.common.entity.bracelet.vo.ShboxVo; -import com.bonus.common.entity.bracelet.vo.SidebandDeviceVo; +import com.bonus.common.entity.bracelet.vo.*; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -103,6 +100,13 @@ public interface BraceletMapper { */ BraceletVo isCodeExist(ShboxVo vo); + /** + * 新增时级联编码是否重复 + * @param vo + * @return + */ + AttributeVo isDataCodeExist(AttributeVo vo); + /** * 新增时手环箱编号是否重复 * @param vo @@ -154,6 +158,13 @@ public interface BraceletMapper { */ int addSh(ShboxVo vo); + /** + * 新增设备属性信息 + * @param vo + * @return + */ + int addAttribute(AttributeVo vo); + /** * 新增手环箱信息 * @param vo diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/IBraceletService.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/IBraceletService.java index e5feaaa..1a634db 100644 --- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/IBraceletService.java +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/IBraceletService.java @@ -1,10 +1,7 @@ package com.bonus.bracelet.service; import com.bonus.common.core.web.domain.AjaxResult; -import com.bonus.common.entity.bracelet.vo.BraceletVo; -import com.bonus.common.entity.bracelet.vo.DeviceVo; -import com.bonus.common.entity.bracelet.vo.ShboxVo; -import com.bonus.common.entity.bracelet.vo.SidebandDeviceVo; +import com.bonus.common.entity.bracelet.vo.*; import java.util.List; @@ -75,6 +72,13 @@ public interface IBraceletService { */ AjaxResult addSh(ShboxVo vo); + /** + * 新增设备属性信息 + * @param vo + * @return + */ + AjaxResult addAttribute(AttributeVo vo); + /** * 新增手环箱信息 * @param vo diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/BraceletServiceImpl.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/BraceletServiceImpl.java index 7e5881c..85719da 100644 --- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/BraceletServiceImpl.java +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/BraceletServiceImpl.java @@ -7,10 +7,7 @@ import com.bonus.bracelet.service.IBraceletService; import com.bonus.bracelet.service.IDeviceService; import com.bonus.common.core.constant.SecurityConstants; import com.bonus.common.core.web.domain.AjaxResult; -import com.bonus.common.entity.bracelet.vo.BraceletVo; -import com.bonus.common.entity.bracelet.vo.DeviceVo; -import com.bonus.common.entity.bracelet.vo.ShboxVo; -import com.bonus.common.entity.bracelet.vo.SidebandDeviceVo; +import com.bonus.common.entity.bracelet.vo.*; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -180,6 +177,30 @@ public class BraceletServiceImpl implements IBraceletService { } } + /** + * 新增设备属性信息 + * @param vo + * @return + */ + @Override + @Transactional(rollbackFor = Exception.class) + public AjaxResult addAttribute(AttributeVo vo) { + try { + AttributeVo result = braceletMapper.isDataCodeExist(vo); + if (result != null) { + return AjaxResult.error("该手环的级联编号已存在，请重新输入"); + } + int num = braceletMapper.addAttribute(vo); + if(num==1){ + return AjaxResult.success(); + } + return AjaxResult.error("该手环设备属性信息新增失败"); + } catch (Exception e) { + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); + return AjaxResult.error(); + } + } + /** * 新增手环箱子信息 * @param vo diff --git a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/BraceletMapper.xml b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/BraceletMapper.xml index f0a1dd8..7e33b4b 100644 --- a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/BraceletMapper.xml +++ b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/BraceletMapper.xml @@ -130,6 +130,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where tb.sh_code = #{shCode} and del_flag = 0 + + +