Jelajahi Sumber

modify Fullname->FullName

15928045575 2 tahun lalu
induk
melakukan
a2d82c7de4

+ 1 - 1
slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/model/dos/mysql/KwsDevice.java

@@ -37,7 +37,7 @@ public class KwsDevice implements Serializable {
      */
     private String snCode;
 
-    private String snCodeFullname;
+    private String snCodeFullName;
 
     /**
      * 设备型号id

+ 1 - 1
slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/model/param/DeviceAdd.java

@@ -52,7 +52,7 @@ public class DeviceAdd {
      * SN码
      */
     @NotBlank(message = "SN码不能为空")
-    private String snCodeFullname;
+    private String snCodeFullName;
 
     /**
      * 产品类型

+ 1 - 1
slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/service/DeviceService.java

@@ -208,7 +208,7 @@ public class DeviceService {
         LocalDateTime now = LocalDateTime.now();
         long id = new IdWorker(NumberConstant.ONE).nextId();
         device.setId(id);
-        String newStr = deviceAdd.getSnCodeFullname().replace("-", "").toLowerCase();
+        String newStr = deviceAdd.getSnCodeFullName().replace("-", "").toLowerCase();
         device.setSnCode(newStr);
         device.setCreateBy(Long.parseLong(headerData.getCreateBy()));
         device.setCreateTime(now);

+ 0 - 1
slope-modules/slope-detection/src/main/resources/mapper/mysql/KwsDeviceMapper.xml

@@ -60,7 +60,6 @@
 
       <if test="deviceQuery.mountainId != null and deviceQuery.mountainId != ''">
           and d.mountain_id = #{deviceQuery.mountainId,jdbcType=BIGINT}
-          , '%')
       </if>
           <if test="deviceQuery.deviceName != null and deviceQuery.deviceName != ''">
               and d.name like concat('%', #{deviceQuery.deviceName}