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

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/BaseBuildController.java

@@ -80,7 +80,7 @@ public class BaseBuildController {
     }
 
     /**
-     * 建筑设施绑定解绑
+     * 建筑设施绑定
      * @param statusVO
      * @return
      */

service-iot/service-iot-biz/src/main/java/com/usky/iot/domain/BaseGgpFacility.java

@@ -48,7 +48,7 @@ public class BaseGgpFacility implements Serializable {
     private String address;
 
     /**
-     * 设施类型(1、天然水源 2、五万方综合体 3、三到五万方综合体 4、拟列区级重大火灾隐患单位 5、拟列市级重大火灾隐患单位 6、一般重大火灾隐患单位 7、扣分5以下九小场所 8、扣分6-14九小场所 9、扣分15-24九小场所 10、钢瓶九小场所 11、电瓶车九小场所 12、三合一九小场所 13、重点单位微站 14、一般单位微站 15、居委会微站 16、村委会微站)
+     * 设施类型
      */
     private String facilityType;
 

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

@@ -100,7 +100,7 @@ public class BaseBuildServiceImpl extends AbstractCrudService<BaseBuildMapper, B
         if(CollectionUtils.isNotEmpty(list)){
             for(int i=0;i<list.size();i++){
                 LambdaQueryWrapper<BaseBuildFacilityRelate> queryWrapper1 = Wrappers.lambdaQuery();
-                queryWrapper1.eq(BaseBuildFacilityRelate::getBuildId,list.get(i).getBuildNum());
+                queryWrapper1.eq(BaseBuildFacilityRelate::getBuildId,list.get(i).getId());
                 Integer count = baseBuildFacilityRelateService.count(queryWrapper1);
                 list.get(i).setBuildFacilityCount(count);
             }
@@ -122,13 +122,16 @@ public class BaseBuildServiceImpl extends AbstractCrudService<BaseBuildMapper, B
             for(int i=0;i<page.getRecords().size();i++){
                 BuildFacilityRelateResponeVO responeVO = new BuildFacilityRelateResponeVO();
                 responeVO.setBuildId(requestVO.getBuildId());
+                responeVO.setFacilityId(page.getRecords().get(i).getId());
                 responeVO.setFacilityNum(page.getRecords().get(i).getFacilityNum());
                 responeVO.setFacilityName(page.getRecords().get(i).getFacilityName());
 
                 LambdaQueryWrapper<BaseFacilityType> queryWrapper1 = Wrappers.lambdaQuery();
                 queryWrapper1.eq(BaseFacilityType::getTypeCode,page.getRecords().get(i).getFacilityType());
                 BaseFacilityType one = baseFacilityTypeService.getOne(queryWrapper1);
-                responeVO.setFacilityType(one.getTypeName());
+                if(one != null){
+                    responeVO.setFacilityType(one.getTypeName());
+                }
 
                 responeVO.setAddress(page.getRecords().get(i).getAddress());
 
@@ -146,27 +149,29 @@ public class BaseBuildServiceImpl extends AbstractCrudService<BaseBuildMapper, B
     @Override
     public void setBuildFacilityStatus(BuildFacilityStatusVO statusVO){
         BaseBuild baseBuild = new BaseBuild();
+        LambdaQueryWrapper<BaseBuild> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(BaseBuild::getDeleteFlag,0)
+                .eq(BaseBuild::getId,statusVO.getBuildId())
+                .eq(BaseBuild::getTenantId,SecurityUtils.getTenantId());
+        BaseBuild one = this.getOne(queryWrapper);
 
         if(statusVO.getStatus() == 1){
-            LambdaQueryWrapper<BaseBuild> queryWrapper = Wrappers.lambdaQuery();
-            queryWrapper.eq(BaseBuild::getDeleteFlag,0)
-                    .eq(BaseBuild::getId,statusVO.getBuildId())
-                    .eq(BaseBuild::getTenantId,SecurityUtils.getTenantId());
-            BaseBuild one = this.getOne(queryWrapper);
 
-            if(one.getFacilityId() != null && (""+one.getFacilityId()).length() > 0){
+            if(one.getFacilityId() != null && (""+one.getFacilityId()).length() > 1){
                 throw new BusinessException("绑定失败，该建筑已绑定设施");
             }
-            LambdaQueryWrapper<BaseGgpFacility> queryWrapper1 = Wrappers.lambdaQuery();
-            queryWrapper1.like(BaseGgpFacility::getFacilityNum,statusVO.getFacilityNum())
-                    .eq(BaseGgpFacility::getTenantId,SecurityUtils.getTenantId());
-            BaseGgpFacility one1 = baseGgpFacilityService.getOne(queryWrapper1);
 
             baseBuild.setId(statusVO.getBuildId());
-            baseBuild.setFacilityId(one1.getId());
+            baseBuild.setFacilityId(statusVO.getFacilityId());
         }else{
+            if(one == null){
+                throw new BusinessException("该建筑信息不存在");
+            }
+
             baseBuild.setId(statusVO.getBuildId());
-            baseBuild.setFacilityId(null);
+            baseBuild.setFacilityId(0);
+            baseBuild.setUpdateBy(SecurityUtils.getUsername());
+            baseBuild.setUpdateTime(LocalDateTime.now());
         }
         this.updateById(baseBuild);
 

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/vo/BuildFacilityRelateRequestVO.java

@@ -29,7 +29,7 @@ public class BuildFacilityRelateRequestVO {
     private String facilityNum;
 
     /**
-     * 设施类型
+     * 设施类型编码
      */
-    private Integer facilityType;
+    private String facilityType;
 }

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/vo/BuildFacilityRelateResponeVO.java

@@ -10,6 +10,11 @@ public class BuildFacilityRelateResponeVO {
      */
     private Integer buildId;
 
+    /**
+     * 设施Id
+     */
+    private Integer facilityId;
+
     /**
      * 设施编号
      */
@@ -21,7 +26,7 @@ public class BuildFacilityRelateResponeVO {
     private String facilityName;
 
     /**
-     * 设施类型
+     * 设施类型名称
      */
     private String facilityType;
 

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/vo/BuildFacilityStatusVO.java

@@ -10,9 +10,9 @@ public class BuildFacilityStatusVO {
     private Integer buildId;
 
     /**
-     * 设施编号
+     * 设施Id
      */
-    private String facilityNum;
+    private Integer facilityId;
 
     /**
      * 绑定状态（0 解绑，1 绑定）