改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/datasync/vo/FireEquipmentVO.java

+package com.yeejoin.equipmanage.common.datasync.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+@Data
+@ApiModel(value = "详情返回数据", description = "设备数据")
+public class FireEquipmentVO implements Serializable {
+
+    @ApiModelProperty(value = "所在建筑ID")
+    @TableField("buildid")
+    private String buildId;
+
+    private String parentId;
+
+    private String instanceId;
+
+    private String bizOrgCode;
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/MaintenanceCompanyServiceImpl.java

@@ -354,6 +354,7 @@ public class MaintenanceCompanyServiceImpl
         LambdaQueryWrapper<MaintenanceCompany> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(MaintenanceCompany::getType, code);
         queryWrapper.eq(MaintenanceCompany::getAmosId, userId);
+        queryWrapper.eq(MaintenanceCompany::getIsDelete, false);
         return this.baseMapper.selectList(queryWrapper);
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentSpecificController.java

@@ -226,6 +226,19 @@ public class EquipmentSpecificController extends AbstractBaseController {
     }
 
     /**
+     * 获取instanceId和orgCode
+     *
+     * @param equipmentSpecific
+     * @return
+     */
+    @RequestMapping(value = "/getEquipSpecificDetail1", method = RequestMethod.POST)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "获取instanceId和orgCode", notes = "获取instanceId和orgCode")
+    public ResponseModel getEquipSpecificDetail1(@RequestBody EquipmentSpecific equipmentSpecific) {
+        return CommonResponseUtil.success(equipmentSpecificSerivce.getEquipSpecificDetail1(equipmentSpecific));
+    }
+
+    /**
      * @param like    设备名称或编码code
      * @param notLike wl_equipment_category，code不包含（右%），多个用英文逗号隔开
      * @param status  wl_stock_detail.status

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EquipmentSpecificMapper.java

@@ -5,6 +5,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.yeejoin.equipmanage.common.datasync.vo.FireEquipmentVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -121,6 +122,8 @@ public interface EquipmentSpecificMapper extends BaseMapper<EquipmentSpecific> {
 
     FireEquipment getEquipSpecificDetail(Long id);
 
+    FireEquipmentVO getEquipSpecificDetail2(Long id);
+
     List<EquipmentCategory> getEquipSpeTypeByQrcode(@Param("qrCode") String qrCode);
 
     List<FireEquipment> getEquipSpecificDetailsByEquipmentId(Long equipmentId);

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IEquipmentSpecificSerivce.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.equipmanage.common.datasync.entity.FireEquipment;
+import com.yeejoin.equipmanage.common.datasync.vo.FireEquipmentVO;
 import com.yeejoin.equipmanage.common.dto.EquipmentSpecificDto;
 import com.yeejoin.equipmanage.common.dto.UserDto;
 import com.yeejoin.equipmanage.common.entity.EquipmentSpecific;
@@ -115,6 +116,14 @@ public interface IEquipmentSpecificSerivce extends IService<EquipmentSpecific> {
      */
     FireEquipment getEquipSpecificDetail(EquipmentSpecific equipmentSpecific);
 
+    /**
+     * 获取instanceId和orgCode
+     *
+     * @param equipmentSpecific
+     * @return
+     */
+    FireEquipmentVO getEquipSpecificDetail1(EquipmentSpecific equipmentSpecific);
+
     void equipSpecificDataSync(Long equipmentId);
 
     List<FireEquipment> getEquipSpecificDetailsByEquipmentId(Long equipmentId);

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java

@@ -14,6 +14,7 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.equipmanage.common.datasync.entity.FireEquipment;
+import com.yeejoin.equipmanage.common.datasync.vo.FireEquipmentVO;
 import com.yeejoin.equipmanage.common.dto.EquipmentSpecificDto;
 import com.yeejoin.equipmanage.common.dto.UserDto;
 import com.yeejoin.equipmanage.common.entity.*;
@@ -150,6 +151,9 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
     @Lazy
     IEquipmentSpecificAlarmService equipmentSpecificAlarmService;
 
+    @Autowired
+    WarehouseStructureMapper warehouseStructureMapper;
+
     @Value("${systemctl.sync.switch}")
     private Boolean syncSwitch;
     
@@ -1484,6 +1488,22 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
     }
 
     @Override
+    public FireEquipmentVO getEquipSpecificDetail1(EquipmentSpecific equipmentSpecific) {
+        FireEquipmentVO finalVo = equipmentSpecificMapper.getEquipSpecificDetail2(equipmentSpecific.getId());
+        if ("0".equals(finalVo.getParentId())) {
+            finalVo.setInstanceId(finalVo.getBuildId());
+        } else {
+            WarehouseStructure warehouseStructure = warehouseStructureMapper.selectById(finalVo.getParentId());
+            if (0 == warehouseStructure.getParentId()) {
+                finalVo.setInstanceId(finalVo.getParentId());
+            } else {
+                finalVo.setInstanceId(String.valueOf(warehouseStructure.getParentId()));
+            }
+        }
+        return finalVo;
+    }
+
+    @Override
     public String getEquipSpeTypeByQrcode(String qrCode) {
         List<EquipmentCategory> list = this.baseMapper.getEquipSpeTypeByQrcode(qrCode);
         if (list != null && list.size() > 0) {

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificMapper.xml

@@ -777,6 +777,21 @@
         WHERE
             es.id = #{id}
     </select>
+
+    <select id="getEquipSpecificDetail2"
+            resultType="com.yeejoin.equipmanage.common.datasync.vo.FireEquipmentVO">
+        SELECT
+            ws.source_id AS buildid,
+            ws.parent_id AS parentId,
+            ws.biz_org_code AS bizOrgCode
+        FROM
+            wl_equipment_specific es
+            LEFT JOIN wl_stock_detail sd ON sd.equipment_specific_id = es.id
+            LEFT JOIN wl_warehouse_structure ws ON ws.id = sd.warehouse_structure_id
+        WHERE
+            es.id = #{id}
+    </select>
+
     <select id="getEquipSpecificDetailsByEquipmentId"
             resultType="com.yeejoin.equipmanage.common.datasync.entity.FireEquipment">
         SELECT