Merge branch 'han' of uskycloud/usky-modules into server-165

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/BaseGgpFacilityServiceImpl.java

@@ -480,6 +480,13 @@ public class BaseGgpFacilityServiceImpl extends AbstractCrudService<BaseGgpFacil
                 if (isBlank(baseGgpFacility.getFacilityType()) || isBlank(baseGgpFacility.getFacilityName()) || isBlank(baseGgpFacility.getAddress()) || isBlank(baseGgpFacility.getLatitude()) || isBlank(baseGgpFacility.getLongitude())) {
                     throw new BusinessException(String.format(ROW_IMPORT_FAILED, i + 1));
                 }
+                Calendar cal1 = Calendar.getInstance();
+                Date date = cal1.getTime();
+                List<BaseFacilityType> typeList = baseFacilityTypeMapper.typeList(baseGgpFacility.getFacilityType());
+                baseGgpFacility.setFacilityNum(typeList.get(0).getTypeAbbrevia()+'-'+new SimpleDateFormat("yyyyMMddHHmmssSSS").format(date));
+                baseGgpFacility.setCreator(SecurityUtils.getUsername());
+                baseGgpFacility.setCreateTime(LocalDateTime.now());
+                baseGgpFacility.setTenantId(SecurityUtils.getTenantId());
                 facilityList.add(baseGgpFacility);
             }
             try {