Merge branch '0617' of http://114.135.61.188:53000/ZONIOT/water-iot into 0617

smart-city-platform/src/main/java/com/bz/smart_city/dao/DeviceTypeMapper.java

@@ -41,7 +41,7 @@ public interface DeviceTypeMapper {
 
     List<DeviceTypeDto> findByIds(@Param("deviceTypeIds") List<Integer> deviceTypeIds);
 
-    DeviceTypeDto getByName(@Param("deviceTypeName") String deviceTypeName);
+    DeviceTypeDto getByName(@Param("deviceTypeName") String deviceTypeName, @Param("deviceTypeModel") String deviceTypeModel);
 
     DeviceTypeDto getById(@Param("id") Integer id);
 }

smart-city-platform/src/main/java/com/bz/smart_city/service/DeviceTypeService.java

@@ -37,5 +37,5 @@ public interface DeviceTypeService {
     
     boolean isWaterChannel(Integer channelId);
 
-    DeviceTypeDto getByName(String deviceTypeName);
+    DeviceTypeDto getByName(String deviceTypeName,String deviceTypeModel);
 }

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/DeviceTypeServiceImpl.java

@@ -233,8 +233,8 @@ public class DeviceTypeServiceImpl implements DeviceTypeService {
     }
 
     @Override
-    @Cacheable(value = "deviceTypeName", key = "#deviceTypeName")
-    public DeviceTypeDto getByName(String deviceTypeName) {
-        return deviceTypeMapper.getByName(deviceTypeName);
+    @Cacheable(value = "deviceTypeName", key = "#deviceTypeName + #deviceTypeModel")
+    public DeviceTypeDto getByName(String deviceTypeName,String deviceTypeModel) {
+        return deviceTypeMapper.getByName(deviceTypeName,deviceTypeModel);
     }
 }

smart-city-platform/src/main/java/com/bz/smart_city/service/importfile/AsyncTaskImportService.java

@@ -212,11 +212,14 @@ public class AsyncTaskImportService {
                             dto.setDoorNo(doorNo);
                             dto.setLocation(doorNo);
 
-                            String deviceTypeName = c_deviceType.getStringCellValue();
-                            if(StringUtils.isBlank(deviceTypeName)) {
+                            String deviceTypeNameTemp = c_deviceType.getStringCellValue();
+                            if(StringUtils.isBlank(deviceTypeNameTemp)) {
                                 continue;
                             }
-                            DeviceTypeDto dt = deviceTypeService.getByName(deviceTypeName);
+                            String[] temp = deviceTypeNameTemp.split("/");
+                            String deviceTypeName = temp[1];
+                            String deviceTypeModel = temp[2];
+                            DeviceTypeDto dt = deviceTypeService.getByName(deviceTypeName,deviceTypeModel);
                             if(dt == null) {
                                 //throw new ServiceException(ResultStatus.DEVICE_TYPE_NOT_EXISTED);
                                 failTime++ ;

smart-city-platform/src/main/resources/mapper/DeviceTypeMapper.xml

@@ -304,7 +304,7 @@
     </select>
     <select id="getByName" resultType="com.bz.smart_city.dto.DeviceTypeDto">
         select id,equipment_type,model,manufacturer_id,device_type from sc_device_type where status = 1
-        and equipment_type = #{deviceTypeName} limit 1
+        and equipment_type = #{deviceTypeName} and model =#{deviceTypeModel} limit 1
     </select>
 
     <select id="getById" resultType="com.bz.smart_city.dto.DeviceTypeDto">