Merge branch 'develop_ccs' of http://172.16.10.76/moa/amos-boot-biz into develop_ccs

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/dto/EquipmentSpecificDto.java

@@ -30,4 +30,7 @@ public class EquipmentSpecificDto extends BaseDTO<EquipmentSpecificDto> {
     private Long teamId;
     private Long agencyId;
 
+    private String team;
+    private String carId;
+
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/StringUtil.java

@@ -6,6 +6,7 @@ import java.util.regex.Pattern;
 
 import org.springframework.util.Assert;
 
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.yeejoin.equipmanage.common.vo.QRCodeRequest;
 
 /**
@@ -149,4 +150,12 @@ public class StringUtil {
 		}
 		return code;
 	}
+	
+	  public static String toString(Object s){
+	    	if(ObjectUtils.isEmpty(s)){
+	    		return "";
+	    	}
+			return String.valueOf(s);
+	    }
+	    
 }

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

@@ -241,12 +241,12 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
                 } catch (ParseException e) {
                     e.printStackTrace();
                 }
-                dataVO.setFireEquipmentSpecificIndexName(String.valueOf(x.get("fireEquipmentSpecificIndexName")));
-                dataVO.setFireEquipmentName(String.valueOf(x.get("fireEquipmentName")));
-                dataVO.setWarehouseStructureName(String.valueOf(x.get("warehouseStructureName")));
-                dataVO.setEquipmentName(null == x.get("equipmentName") ? null : String.valueOf(x.get("equipmentName")));
-                dataVO.setHandleStatus(String.valueOf(x.get("handleStatus")));
-                dataVO.setStatus(String.valueOf(x.get("status")));
+                dataVO.setFireEquipmentSpecificIndexName(StringUtil.toString(x.get("fireEquipmentSpecificIndexName")));
+                dataVO.setFireEquipmentName(StringUtil.toString(x.get("fireEquipmentName")));
+                dataVO.setWarehouseStructureName(StringUtil.toString(x.get("warehouseStructureName")));
+                dataVO.setEquipmentName(StringUtil.toString(x.get("equipmentName")));
+                dataVO.setHandleStatus(StringUtil.toString(x.get("handleStatus")));
+                dataVO.setStatus(StringUtil.toString(x.get("status")));
                 Object type = x.get("type");
                 if (AlarmTypeEnum.HZGJ.getCode().equals(type) || AlarmTypeEnum.GZGJ.getCode().equals(type)
                         || AlarmTypeEnum.PB.getCode().equals(type)) {

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

@@ -1023,6 +1023,12 @@
             <if test="vo.like != null and vo.like !=''">
                 ed.`name` LIKE CONCAT('%', #{vo.like}, '%')
             </if>
+            <if test="vo.team != null  and vo.carId !=null">
+              and  es.team_id = (select team_id from  wl_car where id =#{vo.carId})
+            </if>
+
+
+
             <if test="vo.categories != null and vo.categories != ''">
               AND  ec.`code`  LIKE '1%' and ec.industry_code='2'
                <!--  AND cast(ec.`code` AS SIGNED INTEGER) BETWEEN 10000000 AND 12999900