Merge remote-tracking branch 'origin/developer' into developer

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-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentSpecificAlarmLog.java

@@ -196,6 +196,9 @@ public class EquipmentSpecificAlarmLog extends BaseEntity {
     @TableField(exist = false)
     private String jcsConfirmUserName;
 
+    @ApiModelProperty(value = "画布中建筑ID", notes = "告警详情 配置点位里用")
+    @TableField(exist = false)
+    private String sourceId;
     /**
      * 颜色
      */

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

@@ -3,6 +3,9 @@ package com.yeejoin.equipmanage.common.vo;
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import com.alibaba.excel.metadata.BaseRowModel;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -18,6 +21,9 @@ import java.util.List;
  * @date 2021-07-16
  */
 @Data
+@HeadRowHeight(30)
+@ContentRowHeight(23)
+@ColumnWidth(24)
 @ApiModel(value = "MaintenanceResourceDataVo", description = "维保设施资源数据Vo")
 public class MaintenanceResourceDataVo  extends BaseRowModel {
 

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

 package com.yeejoin.equipmanage.controller;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import com.yeejoin.equipmanage.common.entity.vo.EquiplistSpecificBySystemVO;
@@ -226,6 +223,22 @@ public class EquipmentSpecificController extends AbstractBaseController {
     }
 
     /**
+     * 获取instanceId和orgCode
+     *
+     * @param sourceId
+     * @return
+     */
+    @RequestMapping(value = "/getInstanceIdAndOrgCode", method = RequestMethod.GET)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "获取instanceId和orgCode", notes = "获取instanceId和orgCode")
+    public ResponseModel getInstanceIdAndOrgCode(@RequestParam Long sourceId) {
+        if (Objects.isNull(sourceId)) {
+            return CommonResponseUtil.success(null);
+        }
+        return CommonResponseUtil.success(equipmentSpecificSerivce.getInstanceIdAndOrgCode(sourceId));
+    }
+
+    /**
      * @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 sourceId
+     * @return
+     */
+    FireEquipmentVO getInstanceIdAndOrgCode(Long sourceId);
+
     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,12 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
     @Lazy
     IEquipmentSpecificAlarmService equipmentSpecificAlarmService;
 
+    @Autowired
+    WarehouseStructureMapper warehouseStructureMapper;
+
+    @Autowired
+    FormInstanceMapper formInstanceMapper;
+
     @Value("${systemctl.sync.switch}")
     private Boolean syncSwitch;
     
@@ -1484,6 +1491,35 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
     }
 
     @Override
+    public FireEquipmentVO getInstanceIdAndOrgCode(Long sourceId) {
+        FireEquipmentVO finalVo = new FireEquipmentVO();
+        WarehouseStructure warehouseStructure = warehouseStructureMapper.selectById(sourceId);
+        if (0 == warehouseStructure.getParentId()) {
+            finalVo.setInstanceId(String.valueOf(warehouseStructure.getSourceId()));
+            finalVo.setBizOrgCode(warehouseStructure.getBizOrgCode());
+        } else {
+            warehouseStructure = getWarehouseStructure(warehouseStructureMapper.selectById(warehouseStructure.getParentId()));
+            finalVo.setInstanceId(String.valueOf(warehouseStructure.getSourceId()));
+            finalVo.setBizOrgCode(warehouseStructure.getBizOrgCode());
+        }
+        QueryWrapper<FormInstance> qw = new QueryWrapper<>();
+        qw.lambda().eq(FormInstance::getInstanceId, sourceId)
+                .eq(FormInstance::getFieldName, "bizOrgCode");
+        FormInstance formInstance = formInstanceMapper.selectOne(qw);
+        finalVo.setBizOrgCode(formInstance.getFieldValue());
+        return finalVo;
+    }
+
+    public WarehouseStructure getWarehouseStructure(WarehouseStructure warehouseStructure) {
+        if (0 == warehouseStructure.getParentId()) {
+            return warehouseStructure;
+        } else {
+           warehouseStructure = warehouseStructureMapper.selectById(warehouseStructure.getParentId());
+           return getWarehouseStructure(warehouseStructure);
+        }
+    }
+
+    @Override
     public String getEquipSpeTypeByQrcode(String qrCode) {
         List<EquipmentCategory> list = this.baseMapper.getEquipSpeTypeByQrcode(qrCode);
         if (list != null && list.size() > 0) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/PlanTaskController.java

 package com.yeejoin.amos.maintenance.business.controller;
 
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.maintenance.business.feign.JCSFeignClient;
 import com.yeejoin.amos.maintenance.business.param.PlanTaskPageParam;
 import com.yeejoin.amos.maintenance.business.service.intfc.IPlanTaskService;
 import com.yeejoin.amos.maintenance.business.service.intfc.IPointService;
@@ -15,6 +16,7 @@ import com.yeejoin.amos.maintenance.common.enums.PlanTaskOrderByEnum;
 import com.yeejoin.amos.maintenance.core.common.request.CommonPageable;
 import com.yeejoin.amos.maintenance.core.common.request.CommonRequest;
 import com.yeejoin.amos.maintenance.core.framework.PersonIdentify;
+import com.yeejoin.amos.maintenance.core.util.StringUtil;
 import com.yeejoin.amos.maintenance.exception.YeeException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -51,6 +53,9 @@ public class PlanTaskController extends AbstractBaseController {
     @Autowired
     IPointService pointService;
 
+    @Autowired
+    JCSFeignClient jcsFeignClient;
+
     /**
      * 计划执行查询
      *
@@ -203,6 +208,12 @@ public class PlanTaskController extends AbstractBaseController {
         params.put("companyId", companyId);
         params.put("orgCode", loginOrgCode);
         params.put("userId", userId);
+        if (StringUtil.isNotEmpty(userId)) {
+            ResponseModel<String> idByAmosOrgId = jcsFeignClient.getIdByAmosOrgId(String.valueOf(userId));
+            if (StringUtil.isNotEmpty(idByAmosOrgId.getResult())) {
+                params.put("userId", idByAmosOrgId.getResult());
+            }
+        }
         params.put("startTime", startTime);
         params.put("endTime", endTime);
         params.put("finishStatus", finishStatus);

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

@@ -14,6 +14,16 @@
 		    and EXISTS (SELECT distinct fi.instance_id from wl_form_instance fi where fi.instance_id = sou.source_id)
 			limit 1
 			) AS sceneId,
+			(
+			SELECT
+			sou.source_id
+			FROM
+			wl_source_scene sou
+			WHERE
+			find_in_set(ala.equipment_specific_id,sou.point_in_scene)>0
+			and EXISTS (SELECT distinct fi.instance_id from wl_form_instance fi where fi.instance_id = sou.source_id)
+			limit 1
+			) AS sourceId,
 			ala.equipment_specific_id,
 			spe.code AS equipmentSpecificCode,
 			ala.equipment_specific_index_name,

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