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

service-iot/service-iot-biz/src/main/java/com/usky/iot/mapper/BaseFacilityTypeMapper.java

@@ -22,4 +22,5 @@ public interface BaseFacilityTypeMapper extends CrudMapper<BaseFacilityType> {
     List<BaseGgpFacilityTypeNumVO> typeNormalNumList(@Param("tenantId") Integer tenantId);
     List<BaseGgpFacilityTypeNumVO> typeUpkeepNumList(@Param("tenantId") Integer tenantId);
     List<BaseGgpFacilityTypeNumVO> typeCloseNumList(@Param("tenantId") Integer tenantId);
+    List<BaseFacilityType> typeList(@Param("typeId") Integer typeId);
 }

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

@@ -52,7 +52,8 @@ public class BaseGgpFacilityServiceImpl extends AbstractCrudService<BaseGgpFacil
 
     @Override
     public boolean add(BaseGgpFacility baseGgpFacility) {
-        baseGgpFacility.setFacilityNum(UUIDUtils.uuid());
+        List<BaseFacilityType> typeList = baseFacilityTypeMapper.typeList(baseGgpFacility.getFacilityType());
+        baseGgpFacility.setFacilityNum(typeList.get(0).getTypeAbbrevia()+System.currentTimeMillis());
         baseGgpFacility.setCreator(SecurityUtils.getUsername());
         baseGgpFacility.setCreateTime(LocalDateTime.now());
         return this.save(baseGgpFacility);

service-iot/service-iot-biz/src/main/resources/mapper/iot/BaseFacilityTypeMapper.xml

@@ -70,4 +70,13 @@
         </where>
         GROUP BY d.id
     </select>
+    <select id="typeList" resultType="com.usky.iot.domain.BaseFacilityType">
+        SELECT id,type_name as typeName,type_abbrevia as typeAbbrevia
+        FROM base_facility_type
+        <where>
+            <if test="typeId != null and typeId != ''">
+                and id = #{typeId}
+            </if>
+        </where>
+    </select>
 </mapper>