haozq
/
lj-zhgd-ht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

设备属性添加

This commit is contained in:
jjLv 2024-08-08 11:25:18 +08:00
parent 1c3f87ad7a
commit c3f2b8464e
6 changed files with 136 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/AttributeVo.java Normal file
View File

@ -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;
}

17
bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/BraceletController.java
View File

@ -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

19
bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/BraceletMapper.java
View File

@ -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

12
bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/IBraceletService.java
View File

@ -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

29
bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/BraceletServiceImpl.java
View File

@ -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

24
bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/BraceletMapper.xml
View File

@ -130,6 +130,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where tb.sh_code = #{shCode} and del_flag = 0
</select>
<!--判断新增时级联编码是否存在-->
<select id="isDataCodeExist" resultType="com.bonus.common.entity.bracelet.vo.AttributeVo">
select dev_id as devId,data_name as dataName,data_val as dataVal,data_unit as dataUnit,data_code as dataCode
from tb_dev_details
where dev_id = #{shId} and data_code = #{dataCode}
</select>
<!--判断修改时手环箱编号是否存在-->
<select id="isBoxCodeExist" resultType="com.bonus.common.entity.bracelet.vo.ShboxVo">
select id as shboxId
@ -174,6 +181,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
)
</insert>
<!--新增设备属性信息-->
<insert id="addAttribute" parameterType="com.bonus.common.entity.bracelet.vo.AttributeVo" useGeneratedKeys="true" keyProperty="id">
insert into tb_dev_details(
<if test="shId != null">dev_id,</if>
<if test="dataName != null and dataName != ''">data_name,</if>
<if test="dataVal != null and dataVal != ''">data_val,</if>
<if test="dataUnit != null and dataUnit != ''">data_unit,</if>
<if test="dataCode != null and dataCode != ''">data_code</if>
)values(
<if test="shId != null">#{shId},</if>
<if test="dataName != null and dataName != ''">#{dataName},</if>
<if test="dataVal != null and dataVal != ''">#{dataVal},</if>
<if test="dataUnit != null and dataUnit != ''">#{dataUnit},</if>
<if test="dataCode != null and dataCode != ''">#{dataCode}</if>
)
</insert>
<!--新增手环箱子信息-->
<insert id="addBox" parameterType="com.bonus.common.entity.bracelet.vo.ShboxVo" >
insert into tb_sh_box(