haozq
/
ah_jjzhgd_service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
haozq 2024-04-19 14:06:47 +08:00
parent cfdd2ee1b7 26b19ad413
commit 32aa795b31
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/DeviceBdDetailVo.java
View File

@ -31,12 +31,10 @@ public class DeviceBdDetailVo {
@ApiModelProperty("最大阈值")
@Length(max = 50, message = "最大阈值字符长度不能超过50", groups = {Query.class})
@Pattern(regexp = "(([0-9]+\\.[0-9]*[1-9][0-9]*)|([0-9]*[1-9][0-9]*\\.[0-9]+)|([0-9]*[1-9][0-9]*))",message = "最大阈值为大于0的数字",groups = {Query.class})
private String maxValueData;
@ApiModelProperty("最小阈值")
@Length(max = 50, message = "最小阈值长字符度不能超过50", groups = {Query.class})
@Pattern(regexp = "(([0-9]+\\.[0-9]*[1-9][0-9]*)|([0-9]*[1-9][0-9]*\\.[0-9]+)|([0-9]*[1-9][0-9]*))",message = "最小阈值为大于0的数字",groups = {Query.class})
private String minValueData;
@ApiModelProperty("采集值类型")
@ -48,7 +46,6 @@ public class DeviceBdDetailVo {
private String deviceCode;
@ApiModelProperty("采集数据单位")
@NotBlank(message = "采集数据单位不能为空", groups = {Query.class})
@Length(max = 255, message = "采集数据单位字符长度不能超过50", groups = {Query.class})
private String unit;

2
securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/DeviceOfBdServiceImpl.java
View File

@ -218,7 +218,7 @@ public class DeviceOfBdServiceImpl implements IDeviceOfBdService {
}
int result = mapper.isBdDeviceDetailExist(vo);
if (result > 0) {
return AjaxResult.error("检测不能重复");
return AjaxResult.error("检测名称不能重复");
}
if (StringUtils.isEmpty(vo.getId())) {
String id = IdUtils.getuid();

8
securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml
View File

@ -169,11 +169,7 @@
</trim>
</if>
<if test="type == 2">
UPDATE tb_device_value
<set>
<if test="unit != null and unit != ''">unit = #{unit},</if>
</set>
WHERE attribute_id = #{id}
UPDATE tb_device_value SET unit = #{unit} WHERE attribute_id = #{id}
</if>
</insert>
<!--删除边带设备-->
@ -222,6 +218,7 @@
)
</if>
</where>
ORDER BY tpb.bind_time DESC,tpb.create_time DESC
</select>
<!--边带编码是否重复-->
<select id="isBdCodeExist" resultType="java.lang.Integer">
@ -274,6 +271,7 @@
)
</if>
</where>
ORDER BY tbd.create_time DESC
</select>
<!--边带设备编码是否重复-->
<select id="isDeviceCodeExist" resultType="java.lang.Integer">