Merge remote-tracking branch 'origin/master'

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

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

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

@@ -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();

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

@@ -169,11 +169,7 @@
             </trim>
         </if>
         <if test="type == 2">
-            UPDATE tb_device_value
+            UPDATE tb_device_value SET unit = #{unit} WHERE attribute_id = #{id}
-            <set>
-                <if test="unit != null and unit != ''">unit = #{unit},</if>
-            </set>
-            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">